X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fprimarynav.php;h=f765938903e6b9d5c622d848f3a4c6aef4091bb5;hb=586fb5a5175d7a10f5f78dd026434e48202e5451;hp=01517d942908baedd30049ebaca0c9d4b5847093;hpb=903053caec99da4443fa10f045f83239634b1a58;p=quix0rs-gnu-social.git

diff --git a/lib/primarynav.php b/lib/primarynav.php
index 01517d9429..f765938903 100644
--- a/lib/primarynav.php
+++ b/lib/primarynav.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2011, StatusNet, Inc.
  *
  * Primary nav, show on all pages
- * 
+ *
  * PHP version 5
  *
  * This program is free software: you can redistribute it and/or modify
@@ -50,67 +50,45 @@ class PrimaryNav extends Menu
     function show()
     {
         $user = common_current_user();
-        $this->action->elementStart('ul', array('class' => 'nav',
-                                        'id' => 'site_nav_global_primary'));
+        $this->action->elementStart('ul', array('class' => 'nav'));
         if (Event::handle('StartPrimaryNav', array($this->action))) {
             if (!empty($user)) {
-                $this->action->menuItem(common_local_url('all', 
-                                                 array('nickname' => $user->nickname)),
-                                _m('Home'),
-                                _m('Friends timeline'),
-                                false,
-                                'nav_home');
-                $this->action->menuItem(common_local_url('showstream', 
-                                                 array('nickname' => $user->nickname)),
-                                _m('Profile'),
-                                _m('Your profile'),
-                                false,
-                                'nav_profile');
-                $this->action->menuItem(common_local_url('public'),
-                                _m('Public'),
-                                _m('Everyone on this site'),
-                                false,
-                                'nav_public');
                 $this->action->menuItem(common_local_url('profilesettings'),
-                                _m('Settings'),
-                                _m('Change your personal settings'),
+                                // TRANS: Menu item in primary navigation panel.
+                                _m('MENU','Settings'),
+                                // TRANS: Menu item title in primary navigation panel.
+                                _('Change your personal settings.'),
                                 false,
                                 'nav_account');
                 if ($user->hasRight(Right::CONFIGURESITE)) {
                     $this->action->menuItem(common_local_url('siteadminpanel'),
-                                    _m('Admin'), 
-                                    _m('Site configuration'),
+                                    // TRANS: Menu item in primary navigation panel.
+                                    _m('MENU','Admin'),
+                                    // TRANS: Menu item title in primary navigation panel.
+                                    _('Site configuration.'),
                                     false,
                                     'nav_admin');
                 }
                 $this->action->menuItem(common_local_url('logout'),
-                                _m('Logout'), 
-                                _m('Logout from the site'),
+                                // TRANS: Menu item in primary navigation panel.
+                                _m('MENU','Logout'),
+                                // TRANS: Menu item title in primary navigation panel.
+                                _('Logout from the site.'),
                                 false,
                                 'nav_logout');
             } else {
-                $this->action->menuItem(common_local_url('public'),
-                                _m('Public'),
-                                _m('Everyone on this site'),
-                                false,
-                                'nav_public');
                 $this->action->menuItem(common_local_url('login'),
-                                _m('Login'), 
-                                _m('Login to the site'),
+                                // TRANS: Menu item in primary navigation panel.
+                                _m('MENU','Login'),
+                                // TRANS: Menu item title in primary navigation panel.
+                                _('Login to the site.'),
                                 false,
                                 'nav_login');
             }
 
-            if (!empty($user) || !common_config('site', 'private')) {
-                $this->action->menuItem(common_local_url('noticesearch'),
-                                _m('Search'),
-                                _m('Search the site'),
-                                false,
-                                'nav_search');
-            }
-
             Event::handle('EndPrimaryNav', array($this->action));
         }
+
         $this->action->elementEnd('ul');
     }
 }