Merge branch 'master' of gitorious.org:social/mainline

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

diff --git a/lib/adminpanelnav.php b/lib/adminpanelnav.php
index b64a2a6a963d2afe13c018c8179db2e74846cd61..93a4d36ebbe6c673953ed73e45b5676af54a7f9e 100644 (file)
--- a/lib/adminpanelnav.php
+++ b/lib/adminpanelnav.php
@@ -61,6 +61,7 @@ class AdminPanelNav extends Menu
 
         // Stub section w/ home link
         $this->action->elementStart('ul');
+        $this->action->elementStart('li');
         // TRANS: Header in administrator navigation panel.
         $this->action->element('h3', null, _m('HEADER','Home'));
         $this->action->elementStart('ul', 'nav');
@@ -74,9 +75,11 @@ class AdminPanelNav extends Menu
                              $this->action == 'all', 'nav_timeline_personal');
 
         $this->action->elementEnd('ul');
+        $this->action->elementEnd('li');
         $this->action->elementEnd('ul');
 
         $this->action->elementStart('ul');
+        $this->action->elementStart('li');
         // TRANS: Header in administrator navigation panel.
         $this->action->element('h3', null, _m('HEADER','Admin'));
         $this->action->elementStart('ul', array('class' => 'nav'));
@@ -91,14 +94,6 @@ class AdminPanelNav extends Menu
                                      $menu_title, $action_name == 'siteadminpanel', 'nav_site_admin_panel');
             }
 
-            if (AdminPanelAction::canAdmin('design')) {
-                // TRANS: Menu item title in administrator navigation panel.
-                $menu_title = _('Design configuration');
-                // TRANS: Menu item in administrator navigation panel.
-                $this->out->menuItem(common_local_url('designadminpanel'), _m('MENU', 'Design'),
-                                     $menu_title, $action_name == 'designadminpanel', 'nav_design_admin_panel');
-            }
-
             if (AdminPanelAction::canAdmin('user')) {
                 // TRANS: Menu item title in administrator navigation panel.
                 $menu_title = _('User configuration');
@@ -139,14 +134,6 @@ class AdminPanelNav extends Menu
                                      $menu_title, $action_name == 'sitenoticeadminpanel', 'nav_sitenotice_admin_panel');
             }
 
-            if (AdminPanelAction::canAdmin('snapshot')) {
-                // TRANS: Menu item title in administrator navigation panel.
-                $menu_title = _('Snapshots configuration');
-                // TRANS: Menu item in administrator navigation panel.
-                $this->out->menuItem(common_local_url('snapshotadminpanel'), _m('MENU','Snapshots'),
-                                     $menu_title, $action_name == 'snapshotadminpanel', 'nav_snapshot_admin_panel');
-            }
-
             if (AdminPanelAction::canAdmin('license')) {
                 // TRANS: Menu item title in administrator navigation panel.
                 $menu_title = _('Set site license');
@@ -160,12 +147,13 @@ class AdminPanelNav extends Menu
                 $menu_title = _('Plugins configuration');
                 // TRANS: Menu item in administrator navigation panel.
                 $this->out->menuItem(common_local_url('pluginsadminpanel'), _m('MENU','Plugins'),
-                                     $menu_title, $action_name == 'pluginsadminpanel', 'nav_design_admin_panel');
+                                     $menu_title, $action_name == 'pluginsadminpanel', 'nav_plugin_admin_panel');
             }
 
             Event::handle('EndAdminPanelNav', array($this));
         }
         $this->action->elementEnd('ul');
+        $this->action->elementEnd('li');
         $this->action->elementEnd('ul');
     }
 }