diff options
| author | Zach Copley <zach@status.net> | 2009-11-19 15:17:59 -0800 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2009-11-19 15:17:59 -0800 |
| commit | 69ac99ff949ab0118ff25a62471980ad0ec7a52b (patch) | |
| tree | d1bbf0360dff14e876835f4d6800111931a626e2 /lib | |
| parent | 951e1c62044d620cf9aceb04b9f7955ca24d8d6d (diff) | |
| parent | 288d875b79684f84d0fb1da5291de94ddf099a74 (diff) | |
Merge branch 'admin-sections/4' into 0.9.x
* admin-sections/4:
Added validation to fields in user admin panel
Added a user admin panel
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/adminpanelaction.php | 3 | ||||
| -rw-r--r-- | lib/router.php | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/adminpanelaction.php b/lib/adminpanelaction.php index 89a129db1..7997eb2b1 100644 --- a/lib/adminpanelaction.php +++ b/lib/adminpanelaction.php @@ -302,6 +302,9 @@ class AdminPanelNav extends Widget $this->out->menuItem(common_local_url('designadminpanel'), _('Design'), _('Design configuration'), $action_name == 'designadminpanel', 'nav_design_admin_panel'); + $this->out->menuItem(common_local_url('useradminpanel'), _('User'), + _('Paths configuration'), $action_name == 'useradminpanel', 'nav_design_admin_panel'); + $this->out->menuItem(common_local_url('pathsadminpanel'), _('Paths'), _('Paths configuration'), $action_name == 'pathsadminpanel', 'nav_design_admin_panel'); diff --git a/lib/router.php b/lib/router.php index afe36f712..b22185126 100644 --- a/lib/router.php +++ b/lib/router.php @@ -590,9 +590,9 @@ class Router $m->connect('admin/site', array('action' => 'siteadminpanel')); $m->connect('admin/design', array('action' => 'designadminpanel')); + $m->connect('admin/user', array('action' => 'useradminpanel')); $m->connect('admin/paths', array('action' => 'pathsadminpanel')); - $m->connect('getfile/:filename', array('action' => 'getfile'), array('filename' => '[A-Za-z0-9._-]+')); |