diff options
| author | Evan Prodromou <evan@status.net> | 2010-01-27 22:05:32 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-01-27 22:05:32 -0500 |
| commit | 5e1a9ad04d4e10ee44881a26ea72c9a80f748188 (patch) | |
| tree | 78b7f4287d00a2ff32cf6adf82c6289a5d3b6b95 /lib/adminpanelaction.php | |
| parent | 817f01c3b18ec626701de2a1402562eeb87eee6d (diff) | |
| parent | ee4ea3f3e1eb64df2dd3ba677f5201f8787482a8 (diff) | |
Merge branch 'testing'
Conflicts:
theme/base/css/display.css
Diffstat (limited to 'lib/adminpanelaction.php')
| -rw-r--r-- | lib/adminpanelaction.php | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/adminpanelaction.php b/lib/adminpanelaction.php index a6981ac61..f62bfa458 100644 --- a/lib/adminpanelaction.php +++ b/lib/adminpanelaction.php @@ -319,12 +319,17 @@ class AdminPanelNav extends Widget if ($this->canAdmin('user')) { $this->out->menuItem(common_local_url('useradminpanel'), _('User'), - _('Paths configuration'), $action_name == 'useradminpanel', 'nav_design_admin_panel'); + _('User configuration'), $action_name == 'useradminpanel', 'nav_design_admin_panel'); } - if ($this->canAdmin('paths')) { - $this->out->menuItem(common_local_url('pathsadminpanel'), _('Paths'), - _('Paths configuration'), $action_name == 'pathsadminpanel', 'nav_design_admin_panel'); + if ($this->canAdmin('access')) { + $this->out->menuItem(common_local_url('accessadminpanel'), _('Access'), + _('Access configuration'), $action_name == 'accessadminpanel', 'nav_design_admin_panel'); + } + + if ($this->canAdmin('paths')) { + $this->out->menuItem(common_local_url('pathsadminpanel'), _('Paths'), + _('Paths configuration'), $action_name == 'pathsadminpanel', 'nav_design_admin_panel'); } Event::handle('EndAdminPanelNav', array($this)); |