From d0584ab70df1231c46c66072c7aea1a72cbdf9d4 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Sat, 22 Jul 2006 00:59:56 +0000 Subject: [PATCH] r912: Finishing navigation off for the "Users" tab --- admin/global.php | 10 +--- admin/permission.php | 4 ++ admin/user.php | 19 +++++++- admin/usergroup.php | 20 +++++++- includes/class_admin_navigation.php | 76 +++++++++++++++++++++++++++++ 5 files changed, 117 insertions(+), 12 deletions(-) diff --git a/admin/global.php b/admin/global.php index bb04d69..10d854b 100755 --- a/admin/global.php +++ b/admin/global.php @@ -34,18 +34,10 @@ $navigator->add_top_link($lang->string('Logout'), '../login.php?do=cplogout'); $navigator->add_component('tab', 'options', null, $lang->string('Options'), 'index.php'); $navigator->add_component('tab', 'products', null, $lang->string('Products'), 'product.php'); $navigator->add_component('tab', 'fields', null, $lang->string('Fields'), 'field.php'); -$navigator->add_component('tab', 'users', null, $lang->string('Users and Permissions'), 'user.php'); +$navigator->add_component('tab', 'users', null, $lang->string('Users & Permissions'), 'user.php'); require_once('./includes/class_admin_navigation.php'); -$globalnav = array( - $lang->string('User Management') => array( - $lang->string('Users') => 'user.php', - $lang->string('Usergroups') => 'usergroup.php', - $lang->string('Usergroup Permissions') => 'permission.php' - ) -); - // ################################################################### // continue loading diff --git a/admin/permission.php b/admin/permission.php index ab12474..4f64498 100755 --- a/admin/permission.php +++ b/admin/permission.php @@ -22,6 +22,10 @@ require_once('./global.php'); require_once('./includes/functions_datastore.php'); +NavLinks::usersPages(); +$navigator->set_focus('tab', 'users', null); +$navigator->set_focus('link', 'users-pages-permissions', 'users-pages'); + if (!can_perform('canadmingroups')) { admin_login(); diff --git a/admin/user.php b/admin/user.php index dad192f..8c840ba 100644 --- a/admin/user.php +++ b/admin/user.php @@ -22,6 +22,9 @@ require_once('./global.php'); require_once('./includes/api_user.php'); +NavLinks::usersPages(); +$navigator->set_focus('tab', 'users', null); + if (!can_perform('canadminusers')) { admin_login(); @@ -100,12 +103,20 @@ if ($_REQUEST['do'] == 'edit' OR $_REQUEST['do'] == 'add') if ($edit) { + NavLinks::usersEdit($bugsys->in['userid']); + $navigator->set_focus('link', 'users-pages-users', 'users-pages'); + $user = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "user WHERE userid = " . $bugsys->input_clean('userid', TYPE_UINT)); if (!$user) { $admin->error($lang->getlex('error_invalid_id')); } } + else + { + NavLinks::usersAdd(); + $navigator->set_focus('link', 'users-add', 'users'); + } $admin->page_start(($add ? $lang->string('Add User') : $lang->string('Edit User'))); @@ -145,7 +156,7 @@ if ($_REQUEST['do'] == 'edit' OR $_REQUEST['do'] == 'add') } $admin->row_list($lang->string('Timezone'), 'timezone'); - $admin->row_submit(($edit ? '[' . $lang->string('Delete') . ']' : ''), ':save:', ':reset:', 4); + $admin->row_submit(); $admin->table_end(); $admin->form_end(); @@ -159,6 +170,9 @@ if ($_REQUEST['do'] == 'search') { $fail = false; + NavLinks::usersAdd(); + $navigator->set_focus('link', 'users-pages-users', 'users-pages'); + if (is_numeric($bugsys->in['userdata'])) { $bugsys->input_clean('userdata', TYPE_UINT); @@ -214,6 +228,9 @@ if ($_REQUEST['do'] == 'search') if ($_REQUEST['do'] == 'modify') { + NavLinks::usersAdd(); + $navigator->set_focus('link', 'users-pages-users', 'users-pages'); + $admin->page_start($lang->string('User Search')); $admin->form_start('user.php', 'search'); diff --git a/admin/usergroup.php b/admin/usergroup.php index ca37863..b80f29d 100755 --- a/admin/usergroup.php +++ b/admin/usergroup.php @@ -22,6 +22,9 @@ require_once('./global.php'); require_once('./includes/api_usergroup.php'); +NavLinks::usersPages(); +$navigator->set_focus('tab', 'users', null); + if (!can_perform('canadmingroups')) { admin_login(); @@ -106,6 +109,17 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit') $add = (($_REQUEST['do'] == 'add') ? true : false); $edit = (($_REQUEST['do'] == 'edit') ? true : false); + if ($edit) + { + NavLinks::usergroupsEdit($bugsys->in['usergroupid']); + $navigator->set_focus('link', 'users-pages-usergroups', 'users-pages'); + } + else + { + NavLinks::usergroupsAdd(); + $navigator->set_focus('link', 'usergroups-add', 'usergroups'); + } + $admin->page_start(($add ? $lang->string('New Usergroup') : $lang->string('Edit Usergroup'))); $admin->form_start('usergroup.php', ($add ? 'insert' : 'update')); @@ -122,7 +136,7 @@ if ($_REQUEST['do'] == 'add' OR $_REQUEST['do'] == 'edit') else { $usergroup['permissions'] = 319; - } + } // Details $admin->table_start(); @@ -265,6 +279,9 @@ if ($_POST['do'] == 'update') if ($_REQUEST['do'] == 'modify') { + NavLinks::usergroupsAdd(); + $navigator->set_focus('link', 'users-pages-usergroups', 'users-pages'); + $admin->page_start($lang->string('Usergroup Manager')); $admin->form_start('usergroup.php', 'null'); @@ -296,7 +313,6 @@ if ($_REQUEST['do'] == 'modify') $admin->row_multi_item(array("$group[title]" => 'l', ((!$group['total']) ? '-' : $group['total']) => 'c', "[" . $lang->string('Edit') . "]" . (($group['usergroupid'] > 6) ? "[" . $lang->string('Delete') . "]" : '') => 'c')); } - $admin->row_span('[' . $lang->string('Add New Usergroup') . ']', 'tfoot', 'center', 3); $admin->table_end(); $admin->form_end(); diff --git a/includes/class_admin_navigation.php b/includes/class_admin_navigation.php index f5b6d98..79060a5 100644 --- a/includes/class_admin_navigation.php +++ b/includes/class_admin_navigation.php @@ -328,6 +328,82 @@ class NavLinks NavLinks::autoactionsAdd(); $navigator->add_component('link', 'autoactions-delete', 'autoactions', $lang->string('Delete'), 'autoaction.php?do=delete&actionid=' . $id); } + + // ################################################################### + /** + * User tab pages + * + * @access public + */ + function usersPages() + { + global $navigator, $lang; + + $navigator->add_component('section', 'users-pages', 'users', $lang->string('Users & Permissions'), null); + $navigator->add_component('link', 'users-pages-users', 'users-pages', $lang->string('Users'), 'user.php'); + $navigator->add_component('link', 'users-pages-usergroups', 'users-pages', $lang->string('Usergroups'), 'usergroup.php'); + $navigator->add_component('link', 'users-pages-permissions', 'users-pages', $lang->string('Usergroup Permissions'), 'permission.php'); + } + + // ################################################################### + /** + * Add a new user + * + * @access public + */ + function usersAdd() + { + global $navigator, $lang; + + $navigator->add_component('section', 'users', 'users', $lang->string('Users'), null); + $navigator->add_component('link', 'users-add', 'users', $lang->string('Add New User'), 'user.php?do=add'); + } + + // ################################################################### + /** + * Edit a user + * + * @access public + * + * @param integer User ID + */ + function usersEdit($id) + { + global $navigator, $lang; + + NavLinks::usersAdd(); + $navigator->add_component('link', 'users-delete', 'users', $lang->string('Delete'), 'user.php?do=delete&userid=' . $id); + } + + // ################################################################### + /** + * Add a new usergroup + * + * @access public + */ + function usergroupsAdd() + { + global $navigator, $lang; + + $navigator->add_component('section', 'usergroups', 'users', $lang->string('Usergroups'), null); + $navigator->add_component('link', 'usergroups-add', 'usergroups', $lang->string('Add New Usergroup'), 'usergroup.php?do=add'); + } + + // ################################################################### + /** + * Edit a usergroup + * + * @access public + * + * @param integer User ID + */ + function usergroupsEdit($id) + { + global $navigator, $lang; + + NavLinks::usergroupsAdd(); + $navigator->add_component('link', 'usergroups-delete', 'usergroups', $lang->string('Delete'), 'usergroup.php?do=delete&userid=' . $id); + } } /*=====================================================================*\ -- 2.22.5