From aad42427ccd4d3824efcbce43d8e9dba6d5b475d Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Tue, 26 Jan 2010 15:56:19 -0800
Subject: New access admin panel for site registration settings

---
 lib/adminpanelaction.php | 13 +++++++++----
 lib/default.php          |  2 +-
 lib/router.php           |  1 +
 3 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'lib')

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));
diff --git a/lib/default.php b/lib/default.php
index d2dd8ab33..37fb65b53 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -260,7 +260,7 @@ $default =
                                  'OpenID' => null),
               ),
         'admin' =>
-        array('panels' => array('design', 'site', 'user', 'paths')),
+        array('panels' => array('design', 'site', 'user', 'paths', 'access')),
         'singleuser' =>
         array('enabled' => false,
               'nickname' => null),
diff --git a/lib/router.php b/lib/router.php
index c0ddc8db3..03765b39d 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -637,6 +637,7 @@ 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/access', array('action' => 'accessadminpanel'));
             $m->connect('admin/paths', array('action' => 'pathsadminpanel'));
 
             $m->connect('getfile/:filename',
-- 
cgit v1.2.3-54-g00ecf