Stub 'home' subsection at top of settings & admin nav panels, so folks always know...

(If we drop the section titles, these'll look a little cleaner since it'll only show 'Home' once :D)

diff --git a/lib/adminpanelnav.php b/lib/adminpanelnav.php
index ceedf6ceac93aeb3f8738901794127130464ab80..2c9d83ceba474cb9ec9765f88883e8f2f9687163 100644 (file)
--- a/lib/adminpanelnav.php
+++ b/lib/adminpanelnav.php
@@ -56,7 +56,25 @@ class AdminPanelNav extends Menu
     function show()
     {
         $action_name = $this->action->trimmed('action');
+        $user = common_current_user();
+        $nickname = $user->nickname;
+        $name = $user->getProfile()->getBestName();
+
+        // Stub section w/ home link
+        $this->action->elementStart('ul');
+        $this->action->element('h3', null, _('Home'));
+        $this->action->elementStart('ul', 'nav');
+        $this->out->menuItem(common_local_url('all', array('nickname' =>
+                                                           $nickname)),
+                             _('Home'),
+                             sprintf(_('%s and friends'), $name),
+                             $this->action == 'all', 'nav_timeline_personal');
 
+        $this->action->elementEnd('ul');
+        $this->action->elementEnd('ul');
+
+        $this->action->elementStart('ul');
+        $this->action->element('h3', null, _('Admin'));
         $this->action->elementStart('ul', array('class' => 'nav'));
 
         if (Event::handle('StartAdminPanelNav', array($this))) {
@@ -144,5 +162,6 @@ class AdminPanelNav extends Menu
             Event::handle('EndAdminPanelNav', array($this));
         }
         $this->action->elementEnd('ul');
+        $this->action->elementEnd('ul');
     }
 }

diff --git a/lib/settingsnav.php b/lib/settingsnav.php
index 697e7ee46bc6a985e6e0fbc45b1ecbbb13ca917b..2987e36ea947d63564c9373b7aa4f792ef175a0a 100644 (file)
--- a/lib/settingsnav.php
+++ b/lib/settingsnav.php
@@ -57,6 +57,25 @@ class SettingsNav extends Menu
     function show()
     {
         $actionName = $this->action->trimmed('action');
+        $user = common_current_user();
+        $nickname = $user->nickname;
+        $name = $user->getProfile()->getBestName();
+
+        // Stub section w/ home link
+        $this->action->elementStart('ul');
+        $this->action->element('h3', null, _('Home'));
+        $this->action->elementStart('ul', 'nav');
+        $this->out->menuItem(common_local_url('all', array('nickname' =>
+                                                           $nickname)),
+                             _('Home'),
+                             sprintf(_('%s and friends'), $name),
+                             $this->action == 'all', 'nav_timeline_personal');
+
+        $this->action->elementEnd('ul');
+        $this->action->elementEnd('ul');
+
+        $this->action->elementStart('ul');
+        $this->action->element('h3', null, _('Settings'));
         $this->action->elementStart('ul', array('class' => 'nav'));
 
         if (Event::handle('StartAccountSettingsNav', array(&$this->action))) {
@@ -115,5 +134,6 @@ class SettingsNav extends Menu
         }
 
         $this->action->elementEnd('ul');
+        $this->action->elementEnd('ul');
     }
 }