[dw-free] link manage/settings/?authas=foo on community/settings?authas=foo
[commit: http://hg.dwscoalition.org/dw-free/rev/5a460225ef6e]
http://bugs.dwscoalition.org/show_bug.cgi?id=4014
Add some maintainer links in useful places
Patch by
denise.
Files modified:
http://bugs.dwscoalition.org/show_bug.cgi?id=4014
Add some maintainer links in useful places
Patch by
Files modified:
- cgi-bin/LJ/Community.pm
- htdocs/community/manage.bml.text
- htdocs/community/settings.bml
- htdocs/customize/index.bml
- htdocs/manage/profile/index.bml
- htdocs/manage/settings/index.bml
--------------------------------------------------------------------------------
diff -r 24624c866529 -r 5a460225ef6e cgi-bin/LJ/Community.pm
--- a/cgi-bin/LJ/Community.pm Fri Jul 20 19:01:41 2012 -0700
+++ b/cgi-bin/LJ/Community.pm Fri Jul 20 19:11:02 2012 -0700
@@ -572,9 +572,12 @@
$page eq "customize" ?
"<strong>" . LJ::Lang::ml('/community/manage.bml.commlist.customize2') . "</strong>" :
"<a href='$LJ::SITEROOT/customize/?authas=$username'>" . LJ::Lang::ml('/community/manage.bml.commlist.customize2') . "</a>",
- $page eq "settings" ?
- "<strong>" . LJ::Lang::ml('/community/manage.bml.commlist.actsettings2') . "</strong>" :
- "<a href='$LJ::SITEROOT/community/settings?authas=$username'>" . LJ::Lang::ml('/community/manage.bml.commlist.actsettings2') . "</a>",
+ $page eq "settingspost" ?
+ "<strong>" . LJ::Lang::ml('/community/manage.bml.commlist.actsettingspost') . "</strong>" :
+ "<a href='$LJ::SITEROOT/community/settings?authas=$username'>" . LJ::Lang::ml('/community/manage.bml.commlist.actsettingspost') . "</a>",
+ $page eq "settingsaccount" ?
+ "<strong>" . LJ::Lang::ml('/community/manage.bml.commlist.actsettingsaccount') . "</strong>" :
+ "<a href='$LJ::SITEROOT/manage/settings?authas=$username'>" . LJ::Lang::ml('/community/manage.bml.commlist.actsettingsaccount') . "</a>",
$page eq "invites" ?
"<strong>" . LJ::Lang::ml('/community/manage.bml.commlist.actinvites') . "</strong>" :
"<a href='$LJ::SITEROOT/community/sentinvites?authas=$username'>" . LJ::Lang::ml('/community/manage.bml.commlist.actinvites') . "</a>",
diff -r 24624c866529 -r 5a460225ef6e htdocs/community/manage.bml.text
--- a/htdocs/community/manage.bml.text Fri Jul 20 19:01:41 2012 -0700
+++ b/htdocs/community/manage.bml.text Fri Jul 20 19:11:02 2012 -0700
@@ -12,7 +12,9 @@
.commlist.actpending|notes=This is appended to /community/manage.bml.commlist.actmembers2 when there are pending people.
.commlist.actpending=, <a [[aopts]]>[[num]] pending</a>
-.commlist.actsettings2=Settings
+.commlist.actsettingsaccount=Account Settings
+
+.commlist.actsettingspost=Posting Settings
.commlist.customize=Customize
diff -r 24624c866529 -r 5a460225ef6e htdocs/community/settings.bml
--- a/htdocs/community/settings.bml Fri Jul 20 19:01:41 2012 -0700
+++ b/htdocs/community/settings.bml Fri Jul 20 19:11:02 2012 -0700
@@ -186,7 +186,7 @@
# since journaltype changed
$cu->invalidate_directory_record;
- $ret .= $cu->maintainer_linkbar( "settings" );
+ $ret .= $cu->maintainer_linkbar( "settingspost" );
$ret .= "<?h1 $ML{'.success'} h1?>";
if ($mode eq 'create') {
$ret .= "<?p $ML{'.label.commcreated'} p?>";
@@ -276,7 +276,7 @@
} else {
LJ::set_active_crumb('commsettings');
$ret .= LJ::html_hidden('cuser', $cname);
- $ret .= $c->maintainer_linkbar( "settings" );
+ $ret .= $c->maintainer_linkbar( "settingspost" );
}
$ret .= "<div id='left-column' class='community-settings'>";
diff -r 24624c866529 -r 5a460225ef6e htdocs/customize/index.bml
--- a/htdocs/customize/index.bml Fri Jul 20 19:01:41 2012 -0700
+++ b/htdocs/customize/index.bml Fri Jul 20 19:11:02 2012 -0700
@@ -69,6 +69,13 @@
$ret .= LJ::make_authas_select($remote, { authas => $GET{authas} });
$ret .= "</form>";
+ # if they're working as a community, reproduce the community management linkbar:
+ if ( $u && $u->is_community ) {
+ my $linkbar;
+ $linkbar = $u->maintainer_linkbar( "customize" );
+ $ret .= "<p class='intro'>" . $linkbar . "</p>";
+ }
+
# would you like to set the site skin instead?
$ret .= "<p>" . BML::ml( '.setsiteskin.desc', { aopts => "href='$LJ::SITEROOT/manage/settings/?cat=display#skin'" } ) . "</p>";
diff -r 24624c866529 -r 5a460225ef6e htdocs/manage/profile/index.bml
--- a/htdocs/manage/profile/index.bml Fri Jul 20 19:01:41 2012 -0700
+++ b/htdocs/manage/profile/index.bml Fri Jul 20 19:11:02 2012 -0700
@@ -99,6 +99,13 @@
$ret .= LJ::make_authas_select($remote, { 'authas' => $GET{'authas'} });
$ret .= "</form>\n\n";
+ # if they're working as a community, reproduce the community management linkbar:
+ if ( $u && $u->is_community ) {
+ my $linkbar;
+ $linkbar = $u->maintainer_linkbar( "profile" );
+ $ret .= "<p class='intro'>" . $linkbar . "</p>";
+ }
+
$ret .= "<div style='margin: 1em 0;'> ";
$ret .= BML::ml( ".intro1", { aopts1 => "href='$LJ::SITEROOT/manage/settings/$getextra${getsep}cat=privacy'",
aopts2 => "href='$LJ::SITEROOT/manage/settings/$getextra${getsep}cat=display'" } );
diff -r 24624c866529 -r 5a460225ef6e htdocs/manage/settings/index.bml
--- a/htdocs/manage/settings/index.bml Fri Jul 20 19:01:41 2012 -0700
+++ b/htdocs/manage/settings/index.bml Fri Jul 20 19:11:02 2012 -0700
@@ -392,8 +392,16 @@
$ret .= "</div>";
}
- $ret .= "<p id='intro'>" . BML::ml('.intro3', { aopts1 => "href='$LJ::SITEROOT/manage/profile/$getextra'", aopts2 => "href='$LJ::SITEROOT/customize/$getextra'" }) . "</p>"
+ # if they're working as a community, reproduce the community management linkbar:
+ if ( $u && $u->is_community ) {
+ my $linkbar;
+ $linkbar = $u->maintainer_linkbar( "settingsaccount" );
+ $ret .= "<p class='intro'>" . $linkbar . "</p>";
+ }
+
+ $ret .= "<p class='intro'>" . BML::ml('.intro3', { aopts1 => "href='$LJ::SITEROOT/manage/profile/$getextra'", aopts2 => "href='$LJ::SITEROOT/customize/$getextra'" }) . "</p>"
if $u;
+
$ret .= $submit_msg;
$ret .= "<div id='settings_left'>";
--------------------------------------------------------------------------------
