Fixed group representation in Directory plugin, also some ->raw calls

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

diff --git a/lib/settingsnav.php b/lib/settingsnav.php
index 697e7ee46bc6a985e6e0fbc45b1ecbbb13ca917b..504b66fc6f4d75316313664029f4fd42f888412a 100644 (file)
--- a/lib/settingsnav.php
+++ b/lib/settingsnav.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2010,2011, StatusNet, Inc.
  *
  * Settings menu
- * 
+ *
  * PHP version 5
  *
  * This program is free software: you can redistribute it and/or modify
@@ -45,7 +45,6 @@ if (!defined('STATUSNET')) {
  *
  * @see      HTMLOutputter
  */
-
 class SettingsNav extends Menu
 {
     /**
@@ -53,67 +52,103 @@ class SettingsNav extends Menu
      *
      * @return void
      */
-
     function show()
     {
         $actionName = $this->action->trimmed('action');
+        $user = common_current_user();
+        $nickname = $user->nickname;
+        $name = $user->getProfile()->getBestName();
+
+        $stub = new HomeStubNav($this->action);
+        $this->submenu(_m('MENU','Home'), $stub);
+        
+        $this->action->elementStart('ul');
+        $this->action->elementStart('li');
+        // TRANS: Header in settings navigation panel.
+        $this->action->element('h3', null, _m('HEADER','Settings'));
         $this->action->elementStart('ul', array('class' => 'nav'));
 
         if (Event::handle('StartAccountSettingsNav', array(&$this->action))) {
             $this->action->menuItem(common_local_url('profilesettings'),
-                                    _('Profile'),
+                                    // TRANS: Menu item in settings navigation panel.
+                                    _m('MENU','Profile'),
+                                    // TRANS: Menu item title in settings navigation panel.
                                     _('Change your profile settings'),
                                     $actionName == 'profilesettings');
 
             $this->action->menuItem(common_local_url('avatarsettings'),
-                                    _('Avatar'),
+                                    // TRANS: Menu item in settings navigation panel.
+                                    _m('MENU','Avatar'),
+                                    // TRANS: Menu item title in settings navigation panel.
                                     _('Upload an avatar'),
                                     $actionName == 'avatarsettings');
 
             $this->action->menuItem(common_local_url('passwordsettings'),
-                                    _('Password'),
+                                    // TRANS: Menu item in settings navigation panel.
+                                    _m('MENU','Password'),
+                                    // TRANS: Menu item title in settings navigation panel.
                                     _('Change your password'),
                                     $actionName == 'passwordsettings');
 
             $this->action->menuItem(common_local_url('emailsettings'),
-                                    _('Email'),
+                                    // TRANS: Menu item in settings navigation panel.
+                                    _m('MENU','Email'),
+                                    // TRANS: Menu item title in settings navigation panel.
                                     _('Change email handling'),
                                     $actionName == 'emailsettings');
 
-            $this->action->menuItem(common_local_url('userdesignsettings'),
-                                    _('Design'),
-                                    _('Design your profile'),
-                                    $actionName == 'userdesignsettings');
-
             $this->action->menuItem(common_local_url('urlsettings'),
-                                    _('URL'),
+                                    // TRANS: Menu item in settings navigation panel.
+                                    _m('MENU','URL'),
+                                    // TRANS: Menu item title in settings navigation panel.
                                     _('URL shorteners'),
                                     $actionName == 'urlsettings');
 
             Event::handle('EndAccountSettingsNav', array(&$this->action));
-        
-            if (common_config('xmpp', 'enabled')) {
+
+            $haveImPlugin = false;
+
+            Event::handle('HaveImPlugin', array(&$haveImPlugin));
+
+            if ($haveImPlugin) {
                 $this->action->menuItem(common_local_url('imsettings'),
-                                        _m('IM'),
+                                        // TRANS: Menu item in settings navigation panel.
+                                        _m('MENU','IM'),
+                                        // TRANS: Menu item title in settings navigation panel.
                                         _('Updates by instant messenger (IM)'),
                                         $actionName == 'imsettings');
             }
 
             if (common_config('sms', 'enabled')) {
                 $this->action->menuItem(common_local_url('smssettings'),
-                                        _m('SMS'),
+                                        // TRANS: Menu item in settings navigation panel.
+                                        _m('MENU','SMS'),
+                                        // TRANS: Menu item title in settings navigation panel.
                                         _('Updates by SMS'),
                                         $actionName == 'smssettings');
             }
 
             $this->action->menuItem(common_local_url('oauthconnectionssettings'),
-                                    _('Connections'),
+                                    // TRANS: Menu item in settings navigation panel.
+                                    _m('MENU','Connections'),
+                                    // TRANS: Menu item title in settings navigation panel.
                                     _('Authorized connected applications'),
                                     $actionName == 'oauthconnectionsettings');
 
+            if (common_config('oldschool', 'enabled')) {
+                $this->action->menuItem(common_local_url('oldschoolsettings'),
+                                        // TRANS: Menu item in settings navigation panel.
+                                        _m('MENU','Old school'),
+                                        // TRANS: Menu item title in settings navigation panel.
+                                        _('UI tweaks for old-school users'),
+                                        $actionName == 'oldschoolsettings');
+            }
+
             Event::handle('EndConnectSettingsNav', array(&$this->action));
         }
 
         $this->action->elementEnd('ul');
+        $this->action->elementEnd('li');
+        $this->action->elementEnd('ul');
     }
 }