(Bug 4014) Add some maintainer links in useful places

dunvi · Jul 23, 2012 · d3ee5b5 · d3ee5b5
1 parent dad0486
commit d3ee5b5
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 7 deletions.
diff --git a/cgi-bin/LJ/Community.pm b/cgi-bin/LJ/Community.pm
@@ -572,9 +572,12 @@ sub maintainer_linkbar {
         $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 --git a/htdocs/community/manage.bml.text b/htdocs/community/manage.bml.text
@@ -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 --git a/htdocs/community/settings.bml b/htdocs/community/settings.bml
@@ -186,7 +186,7 @@ body<=
             # 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 @@ body<=
     } 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 --git a/htdocs/customize/index.bml b/htdocs/customize/index.bml
@@ -69,6 +69,13 @@ body<=
     $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 --git a/htdocs/manage/profile/index.bml b/htdocs/manage/profile/index.bml
@@ -99,6 +99,13 @@ body<=
         $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 --git a/htdocs/manage/settings/index.bml b/htdocs/manage/settings/index.bml
@@ -392,8 +392,16 @@ body<=
         $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'>";