From 09b3bfa96c5a1cf63daa1993a31d6a6b318c619a Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Thu, 29 Jun 2006 22:30:02 +0000 Subject: [PATCH] r883: - Updating the Admin CP navigation system - Finished the new navigation for all the files in the "Options" tab --- admin/global.php | 56 ++++----------- admin/index.php | 23 ++---- admin/language.php | 19 ++++- admin/setting.php | 4 ++ admin/userhelp.php | 10 ++- includes/class_admin_navigation.php | 106 ++++++++++++++++++++++++++++ 6 files changed, 151 insertions(+), 67 deletions(-) create mode 100644 includes/class_admin_navigation.php diff --git a/admin/global.php b/admin/global.php index 90932df..d8c1d26 100755 --- a/admin/global.php +++ b/admin/global.php @@ -27,18 +27,18 @@ require_once('./includes/functions.php'); // ################################################################### // admin navigation +$bugsys->load('printer_navigation', 'navigator', true); +$navigator->add_top_link($lang->string('Home'), 'index.php'); +$navigator->add_top_link($lang->string('Logout'), '../login.php?do=cplogout'); + +$navigator->add_component('tab', 'options', null, $lang->string('Options'), 'setting.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'); + +require_once('./includes/class_admin_navigation.php'); + $globalnav = array( - $lang->string('Administration Locations') => array( - $lang->string('Home') => 'index.php', - $lang->string('Logout') => '../login.php?do=cplogout' - ), - - $lang->string('Options') => array( - $lang->string('Bugdar Settings') => 'setting.php', - $lang->string('Manage Languages') => 'language.php', - $lang->string('Edit User Help') => 'userhelp.php' - ), - $lang->string('Bug Fields') => array( $lang->string('Products / Versions / Components') => 'product.php', $lang->string('Priorities') => 'priority.php', @@ -60,8 +60,7 @@ $globalnav = array( // continue loading $bugsys->load('printer', 'admin', true); -$admin->set('realm', $lang->string('Administration')); -$admin->set('page_start_hook', 'nav_hook'); +$admin->set('realm', $lang->string('Administration')); $admin->css_link('../framework/printer.css.php'); // ################################################################### @@ -118,37 +117,6 @@ if (!$_COOKIE[COOKIE_PREFIX . 'adminsession']) admin_login(); } -// ################################################################### -// TEMPORARY NAVIGATION SYSTEM - -function nav_hook() -{ - global $globalnav, $bugsys; - - $location = parse_url($_SERVER['SCRIPT_URL']); - $location['path'] = preg_quote(end(explode('/', $location['path']))); - $location['path'] = ((!$location['path']) ? 'index.php' : $location['path']); - - echo "
\n"; - echo "\n\t
"; - echo "\n\t" . $bugsys->lang->string('Tracker Home') . ""; - echo "\n\t\t" . $bugsys->lang->string('Navigation') . ": "; - echo "\n\t\tlang->string('Go') . " \" class=\"button\" />"; - echo "\n\t
"; - echo "\n
"; -} - /*=====================================================================*\ || ################################################################### || # $HeadURL$ diff --git a/admin/index.php b/admin/index.php index a123aaf..9bb6d83 100755 --- a/admin/index.php +++ b/admin/index.php @@ -21,29 +21,16 @@ require_once('./global.php'); -$admin->page_start('Index'); +NavLinks::optionsPages(); +$navigator->set_focus('tab', 'options', null); +$navigator->set_focus('link', 'options-pages-home', 'options-pages'); -$admin->table_start(true, '300'); -$admin->table_head($lang->string('Bugdar Administration Menu'), 2, 'admin_index'); +$admin->page_start('Home'); -$navdata = '"; - -$admin->row_span($navdata, $class = ':swap:', $align = 'left', $colspan = 1); -$admin->table_end(); +$admin->page_code($lang->string('Hi and welcome to the Bugdar administration screen!')); $admin->page_end(); - /*=====================================================================*\ || ################################################################### || # $HeadURL$ diff --git a/admin/language.php b/admin/language.php index ac78df3..147200c 100644 --- a/admin/language.php +++ b/admin/language.php @@ -22,6 +22,9 @@ require_once('./global.php'); require_once('./includes/functions_datastore.php'); +NavLinks::optionsPages(); +$navigator->set_focus('tab', 'options', null); + if (!can_perform('canadmintools')) { admin_login(); @@ -87,6 +90,9 @@ if ($_POST['do'] == 'insert') if ($_REQUEST['do'] == 'add') { + NavLinks::languagesAdd(); + $navigator->set_focus('link', 'options-languages-add', 'options-languages'); + $admin->page_start($lang->string('New Language')); $admin->form_start('language.php', 'insert'); @@ -133,7 +139,12 @@ if ($_POST['do'] == 'update') if ($_REQUEST['do'] == 'edit') { - $language = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "language WHERE languageid = " . intval($bugsys->in['languageid'])); + $bugsys->input_clean('languageid', TYPE_UINT); + + NavLinks::languagesEdit($bugsys->in['languageid']); + $navigator->set_focus('link', 'options-languages-edit', 'options-languages'); + + $language = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "language WHERE languageid = " . $bugsys->in['languageid']); if (!$language) { $admin->error($lang->getlex('error_invalid_id')); @@ -156,7 +167,7 @@ if ($_REQUEST['do'] == 'edit') $admin->row_yesno($lang->string('User Selectable'), 'userselect', $language['userselect']); $admin->row_yesno($lang->string('Debug Mode (run directly from XML)'), 'langdebug', (bool)$language['debug']); - $admin->row_submit('[' . $lang->string('Delete') . ']'); + $admin->row_submit(); $admin->table_end(); $admin->form_end(); @@ -182,6 +193,9 @@ if ($_REQUEST['do'] == 'reload') if ($_REQUEST['do'] == 'modify') { + NavLinks::languagesAdd(); + $navigator->set_focus('link', 'options-pages-languages', 'options-pages'); + $admin->page_start($lang->string('Manage Languages')); $admin->table_start(); @@ -200,7 +214,6 @@ if ($_REQUEST['do'] == 'modify') )); } - $admin->row_span('[' . $lang->string('Add New Language') . ']', 'tfoot', 'center', 4); $admin->table_end(); $admin->page_end(); diff --git a/admin/setting.php b/admin/setting.php index 3d3b6cc..ad594b8 100755 --- a/admin/setting.php +++ b/admin/setting.php @@ -23,6 +23,10 @@ require_once('./global.php'); require_once('./includes/settings.php'); require_once('./includes/functions_datastore.php'); +NavLinks::optionsPages(); +$navigator->set_focus('tab', 'options', null); +$navigator->set_focus('link', 'options-pages-settings', 'options-pages'); + if (!can_perform('canadmintools')) { admin_login(); diff --git a/admin/userhelp.php b/admin/userhelp.php index 3e4b458..b438de1 100755 --- a/admin/userhelp.php +++ b/admin/userhelp.php @@ -22,6 +22,10 @@ require_once('./global.php'); require_once('./includes/functions_datastore.php'); +NavLinks::optionsPages(); +NavLinks::userhelpAdd(); +$navigator->set_focus('tab', 'options', null); + if (!can_perform('canadmintools')) { admin_login(); @@ -109,6 +113,8 @@ if ($_POST['do'] == 'insert') if ($_REQUEST['do'] == 'add') { + $navigator->set_focus('link', 'options-userhelp-add', 'options-userhelp'); + $admin->page_start($lang->string('New Help Text')); $admin->form_start('userhelp.php', 'insert'); @@ -159,6 +165,8 @@ if ($_POST['do'] == 'update') if ($_REQUEST['do'] == 'modify') { + $navigator->set_focus('link', 'options-pages-userhelp', 'options-pages'); + $admin->page_start($lang->string('Edit User Help')); $admin->form_start('userhelp.php', 'update'); @@ -175,8 +183,6 @@ if ($_REQUEST['do'] == 'modify') $admin->row_textarea($inputfield . '
' . $topic['keystring'] . '' . $delete, 'help[' . $topic['keystring'] . '][body]', $topic['body']); } - $admin->row_submit('[' . $lang->string('Add New Help Text') . ']'); - $admin->table_end(); $admin->page_end(); diff --git a/includes/class_admin_navigation.php b/includes/class_admin_navigation.php new file mode 100644 index 0000000..73d222d --- /dev/null +++ b/includes/class_admin_navigation.php @@ -0,0 +1,106 @@ +add_component('section', 'options-pages', 'options', $lang->string('Options'), null); + $navigator->add_component('link', 'options-pages-home', 'options-pages', $lang->string('Home'), 'index.php'); + $navigator->add_component('link', 'options-pages-settings', 'options-pages', $lang->string('Bugdar Settings'), 'setting.php'); + $navigator->add_component('link', 'options-pages-languages', 'options-pages', $lang->string('Languages'), 'language.php'); + $navigator->add_component('link', 'options-pages-userhelp', 'options-pages', $lang->string('User Help Items'), 'userhelp.php'); + } + + // ################################################################### + /** + * Adding a new language + * + * @access public + */ + function languagesAdd() + { + global $navigator, $lang; + + $navigator->add_component('section', 'options-languages', 'options', $lang->string('Languages'), null); + $navigator->add_component('link', 'options-languages-add', 'options-languages', $lang->string('Add New Language'), 'language.php?do=add'); + } + + // ################################################################### + /** + * Edit a language + * + * @access public + * + * @param integer Language ID + */ + function languagesEdit($id) + { + global $navigator, $lang; + + NavLinks::languagesAdd(); + $navigator->add_component('link', 'options-languages-edit', 'options-languages', $lang->string('Edit Language'), 'language.php?do=edit&languageid=' . $id); + $navigator->add_component('link', 'options-languages-reload', 'options-languages', $lang->string('Reload XML'), 'language.php?do=reload&languageid=' . $id); + $navigator->add_component('link', 'options-languages-delete', 'options-languages', $lang->string('Delete'), 'language.php?do=delete&languageid=' . $id); + } + + // ################################################################### + /** + * Adding a new user help item + * + * @access public + */ + function userhelpAdd() + { + global $navigator, $lang; + + $navigator->add_component('section', 'options-userhelp', 'options', $lang->string('User Help Items'), null); + $navigator->add_component('link', 'options-userhelp-add', 'options-userhelp', $lang->string('Add New Item'), 'userhelp.php?do=add'); + } +} + +/*=====================================================================*\ +|| ################################################################### +|| # $HeadURL$ +|| # $Id$ +|| ################################################################### +\*=====================================================================*/ +?> \ No newline at end of file -- 2.22.5