From 90164107c2c7d7e72a9ddc0acec88875416a6b99 Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@osticket.com>
Date: Thu, 23 Aug 2012 10:55:17 -0400
Subject: [PATCH] Admin panel navigation changes * Collapse Department into
Staff tab. * Add a new 'Manage' tab - home for managing items, lists..etc.
* Collapse Help Topics into Manage tab. * Move SLA and API from Settings to
Manage tab.
---
include/class.nav.php | 35 ++++++++++++-----------------------
scp/apikeys.php | 2 +-
scp/departments.php | 2 +-
scp/filters.php | 2 +-
scp/helptopics.php | 2 +-
scp/slas.php | 2 +-
6 files changed, 17 insertions(+), 28 deletions(-)
diff --git a/include/class.nav.php b/include/class.nav.php
index 0d5fddcbf..78cae2fc8 100644
--- a/include/class.nav.php
+++ b/include/class.nav.php
@@ -162,12 +162,11 @@ class AdminNav extends StaffNav{
if(!$this->tabs){
$tabs=array();
- $tabs['dashboard']=array('desc'=>'Dashboard','href'=>'admin.php','title'=>'Admin Dashboard');
+ $tabs['dashboard']=array('desc'=>'Dashboard','href'=>'logs.php','title'=>'Admin Dashboard');
$tabs['settings']=array('desc'=>'Settings','href'=>'settings.php','title'=>'System Settings');
+ $tabs['manage']=array('desc'=>'Manage','href'=>'helptopics.php','title'=>'Manage Options');
$tabs['emails']=array('desc'=>'Emails','href'=>'emails.php','title'=>'Email Settings');
- $tabs['topics']=array('desc'=>'Help Topics','href'=>'helptopics.php','title'=>'Help Topics');
- $tabs['staff']=array('desc'=>'Staff','href'=>'staff.php','title'=>'Staff Members');
- $tabs['depts']=array('desc'=>'Departments','href'=>'departments.php','title'=>'Departments');
+ $tabs['staff']=array('desc'=>'Staff','href'=>'staff.php','title'=>'Manage Staff');
$this->tabs=$tabs;
}
@@ -185,36 +184,26 @@ class AdminNav extends StaffNav{
break;
case 'settings':
$subnav[]=array('desc'=>'Settings & Preferences','href'=>'settings.php','iconclass'=>'preferences');
+ break;
+ case 'manage':
+ $subnav[]=array('desc'=>'Help Topics','href'=>'helptopics.php','iconclass'=>'helpTopics');
+ $subnav[]=array('desc'=>'Ticket Filters','href'=>'filters.php',
+ 'title'=>'Ticket Filters','iconclass'=>'emailFilters');
$subnav[]=array('desc'=>'SLA Plans','href'=>'slas.php','iconclass'=>'sla');
$subnav[]=array('desc'=>'API Keys','href'=>'apikeys.php','iconclass'=>'api');
break;
case 'emails':
- $subnav[]=array('desc'=>'Email Addresses','href'=>'emails.php','iconclass'=>'emailSettings');
- $subnav[]=array('desc'=>'Email Filters','href'=>'filters.php',
- 'title'=>'Email Filters','iconclass'=>'emailFilters');
- $subnav[]=array('desc'=>'Email Banlist','href'=>'banlist.php',
+ $subnav[]=array('desc'=>'Emails','href'=>'emails.php', 'title'=>'Email Addresses', 'iconclass'=>'emailSettings');
+ $subnav[]=array('desc'=>'Banlist','href'=>'banlist.php',
'title'=>'Banned Emails','iconclass'=>'emailDiagnostic');
- $subnav[]=array('desc'=>'Email Templates','href'=>'templates.php','title'=>'Email Templates','iconclass'=>'emailTemplates');
- $subnav[]=array('desc'=>'Email Diagnostic','href'=>'emailtest.php','iconclass'=>'emailDiagnostic');
- break;
- case 'topics':
- $subnav[]=array('desc'=>'Help Topics','href'=>'helptopics.php','iconclass'=>'helpTopics');
- $subnav[]=array('desc'=>'Add New Help Topics',
- 'href'=>'helptopics.php?a=add',
- 'iconclass'=>'newHelpTopic',
- 'droponly'=>true);
+ $subnav[]=array('desc'=>'Templates','href'=>'templates.php','title'=>'Email Templates','iconclass'=>'emailTemplates');
+ $subnav[]=array('desc'=>'Diagnostic','href'=>'emailtest.php', 'title'=>'Email Diagnostic', 'iconclass'=>'emailDiagnostic');
break;
case 'staff':
$subnav[]=array('desc'=>'Staff Members','href'=>'staff.php','iconclass'=>'users');
$subnav[]=array('desc'=>'Teams','href'=>'teams.php','iconclass'=>'teams');
$subnav[]=array('desc'=>'Groups','href'=>'groups.php','iconclass'=>'groups');
- break;
- case 'depts':
$subnav[]=array('desc'=>'Departments','href'=>'departments.php','iconclass'=>'departments');
- $subnav[]=array('desc'=>'Add New Department',
- 'href'=>'departments.php?a=add',
- 'iconclass'=>'newDepartment',
- 'droponly'=>true);
break;
}
if($subnav)
diff --git a/scp/apikeys.php b/scp/apikeys.php
index e393a31c5..1e1767544 100644
--- a/scp/apikeys.php
+++ b/scp/apikeys.php
@@ -96,7 +96,7 @@ $page='apikeys.inc.php';
if($api || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add')))
$page='apikey.inc.php';
-$nav->setTabActive('settings');
+$nav->setTabActive('manage');
require(STAFFINC_DIR.'header.inc.php');
require(STAFFINC_DIR.$page);
include(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/departments.php b/scp/departments.php
index ef1acb12d..31fc4c6df 100644
--- a/scp/departments.php
+++ b/scp/departments.php
@@ -104,7 +104,7 @@ $page='departments.inc.php';
if($dept || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add')))
$page='department.inc.php';
-$nav->setTabActive('depts');
+$nav->setTabActive('staff');
require(STAFFINC_DIR.'header.inc.php');
require(STAFFINC_DIR.$page);
include(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/filters.php b/scp/filters.php
index 4ce0f3076..2fe1f9fb7 100644
--- a/scp/filters.php
+++ b/scp/filters.php
@@ -100,7 +100,7 @@ $page='filters.inc.php';
if($filter || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add')))
$page='filter.inc.php';
-$nav->setTabActive('emails');
+$nav->setTabActive('manage');
require(STAFFINC_DIR.'header.inc.php');
require(STAFFINC_DIR.$page);
include(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/helptopics.php b/scp/helptopics.php
index 5bd1ded70..37e865b22 100644
--- a/scp/helptopics.php
+++ b/scp/helptopics.php
@@ -96,7 +96,7 @@ $page='helptopics.inc.php';
if($topic || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add')))
$page='helptopic.inc.php';
-$nav->setTabActive('topics');
+$nav->setTabActive('manage');
require(STAFFINC_DIR.'header.inc.php');
require(STAFFINC_DIR.$page);
include(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/slas.php b/scp/slas.php
index 8f3b0f75c..8dd5b86c9 100644
--- a/scp/slas.php
+++ b/scp/slas.php
@@ -96,7 +96,7 @@ $page='slaplans.inc.php';
if($sla || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add')))
$page='slaplan.inc.php';
-$nav->setTabActive('settings');
+$nav->setTabActive('manage');
require(STAFFINC_DIR.'header.inc.php');
require(STAFFINC_DIR.$page);
include(STAFFINC_DIR.'footer.inc.php');
--
GitLab