people tag UI elements

[quix0rs-gnu-social.git] / lib / personalgroupnav.php

diff --git a/lib/personalgroupnav.php b/lib/personalgroupnav.php
index 1f543b897441195e83df0bcf0b6a6cd3a7d0bbe3..ccd4ab506fcc4b992dd7af31ab749e410180896b 100644 (file)
--- a/lib/personalgroupnav.php
+++ b/lib/personalgroupnav.php
@@ -52,7 +52,6 @@ require_once INSTALLDIR.'/lib/widget.php';
  *
  * @see      HTMLOutputter
  */
-
 class PersonalGroupNav extends Widget
 {
     var $action = null;
@@ -62,7 +61,6 @@ class PersonalGroupNav extends Widget
      *
      * @param Action $action current action, used for output
      */
-
     function __construct($action=null)
     {
         parent::__construct($action);
@@ -74,12 +72,11 @@ class PersonalGroupNav extends Widget
      *
      * @return void
      */
-
     function show()
     {
         $user = null;
 
-       // FIXME: we should probably pass this in
+        // FIXME: we should probably pass this in
 
         $action = $this->action->trimmed('action');
         $nickname = $this->action->trimmed('nickname');
@@ -98,25 +95,26 @@ class PersonalGroupNav extends Widget
 
         if (Event::handle('StartPersonalGroupNav', array($this))) {
             $this->out->menuItem(common_local_url('all', array('nickname' =>
-                                                           $nickname)),
-                             _('Personal'),
-                             sprintf(_('%s and friends'), $name),
-                             $action == 'all', 'nav_timeline_personal');
+                                                               $nickname)),
+                                 _('Home'),
+                                 sprintf(_('%s and friends'), $name),
+                                 $action == 'all', 'nav_timeline_personal');
             $this->out->menuItem(common_local_url('replies', array('nickname' =>
-                                                                  $nickname)),
-                             _('Replies'),
-                             sprintf(_('Replies to %s'), $name),
-                             $action == 'replies', 'nav_timeline_replies');
-            $this->out->menuItem(common_local_url('showstream', array('nickname' =>
-                                                                  $nickname)),
-                             _('Profile'),
-                             $name,
-                             $action == 'showstream', 'nav_profile');
+                                                                   $nickname)),
+                                 _('Replies'),
+                                 sprintf(_('Replies to %s'), $name),
+                                 $action == 'replies', 'nav_timeline_replies');
             $this->out->menuItem(common_local_url('showfavorites', array('nickname' =>
+                                                                         $nickname)),
+                                 _('Favorites'),
+                                 sprintf(_('%s\'s favorite notices'), ($user_profile) ? $name : _('User')),
+                                 $action == 'showfavorites', 'nav_timeline_favorites');
+            $this->out->menuItem(common_local_url('peopletagsbyuser', array('nickname' =>
                                                                   $nickname)),
-                             _('Favorites'),
-                             sprintf(_('%s\'s favorite notices'), ($user_profile) ? $name : _('User')),
-                             $action == 'showfavorites', 'nav_timeline_favorites');
+                             _('People tags'),
+                             sprintf(_('People tags by %s'), ($user_profile) ? $user_profile->getBestName() : _('User')),
+                             in_array($action, array('peopletagsbyuser', 'peopletagsforuser')),
+                             'nav_timeline_peopletags');
 
             $cur = common_current_user();
 
@@ -124,15 +122,15 @@ class PersonalGroupNav extends Widget
                 !common_config('singleuser', 'enabled')) {
 
                 $this->out->menuItem(common_local_url('inbox', array('nickname' =>
-                                                                         $nickname)),
-                                 _('Inbox'),
-                                 _('Your incoming messages'),
-                                 $action == 'inbox');
+                                                                     $nickname)),
+                                     _('Inbox'),
+                                     _('Your incoming messages'),
+                                     $action == 'inbox');
                 $this->out->menuItem(common_local_url('outbox', array('nickname' =>
-                                                                         $nickname)),
-                                 _('Outbox'),
-                                 _('Your sent messages'),
-                                 $action == 'outbox');
+                                                                      $nickname)),
+                                     _('Outbox'),
+                                     _('Your sent messages'),
+                                     $action == 'outbox');
             }
             Event::handle('EndPersonalGroupNav', array($this));
         }