From e865412b5ff1c696949bdfe531a18ea8d45b1f93 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Thu, 11 Aug 2016 13:06:12 -0400 Subject: [PATCH] Moved header stuff to old file names, working on permission templates --- admin/admin_main.php | 4 +- admin/manage_permission_templates.php | 77 ++-- admin/manage_users.php | 4 +- admin/show_tickets.php | 4 +- css/colors.css | 11 +- inc/headerAdmin.inc.php | 38 +- inc/header_new_admin.inc.php | 227 ----------- inc/new_admin_header_and_sidebar.inc.php | 458 ---------------------- inc/profile_functions.inc.php | 2 +- inc/show_admin_nav.inc.php | 464 ++++++++++++++++++++--- 10 files changed, 478 insertions(+), 811 deletions(-) delete mode 100644 inc/header_new_admin.inc.php delete mode 100644 inc/new_admin_header_and_sidebar.inc.php diff --git a/admin/admin_main.php b/admin/admin_main.php index 26043f00..5931f532 100644 --- a/admin/admin_main.php +++ b/admin/admin_main.php @@ -53,8 +53,8 @@ define('MAIN_PAGE', 1); define('PAGE_TITLE', 'ADMIN_HOME'); /* Print header */ -require_once(HESK_PATH . 'inc/header_new_admin.inc.php'); -require_once(HESK_PATH . 'inc/new_admin_header_and_sidebar.inc.php'); +require_once(HESK_PATH . 'inc/headerAdmin.inc.php'); +require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); /* Reset default settings? */ if (isset($_GET['reset']) && hesk_token_check()) { diff --git a/admin/manage_permission_templates.php b/admin/manage_permission_templates.php index 4b1fecef..1f3114d2 100644 --- a/admin/manage_permission_templates.php +++ b/admin/manage_permission_templates.php @@ -37,6 +37,7 @@ define('PAGE_TITLE', 'ADMIN_USERS'); require(HESK_PATH . 'hesk_settings.inc.php'); require(HESK_PATH . 'inc/common.inc.php'); require(HESK_PATH . 'inc/admin_functions.inc.php'); +require(HESK_PATH . 'inc/mail_functions.inc.php'); hesk_load_database_functions(); hesk_session_start(); @@ -96,23 +97,25 @@ while ($row = hesk_dbFetchAssoc($res)) { array_push($categories, $row); } ?> -
-
- -
-
-

- - - - - - -

+
+ +
+
+

+ + +

+
+
+
+
+ + + @@ -129,23 +132,23 @@ while ($row = hesk_dbFetchAssoc($res)) { - - - - - - - - - - "> + + + + + + + + + @@ -159,7 +162,7 @@ while ($row = hesk_dbFetchAssoc($res)) {
-
+
-
- +
+
+ +
diff --git a/admin/manage_users.php b/admin/manage_users.php index 64240433..92ddf2c4 100644 --- a/admin/manage_users.php +++ b/admin/manage_users.php @@ -172,8 +172,8 @@ if ($action = hesk_REQUEST('a')) { /* Print header */ - require_once(HESK_PATH . 'inc/header_new_admin.inc.php'); - require_once(HESK_PATH . 'inc/new_admin_header_and_sidebar.inc.php'); + require_once(HESK_PATH . 'inc/headerAdmin.inc.php'); + require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); ?>
diff --git a/admin/show_tickets.php b/admin/show_tickets.php index 84f34e79..2b8a363c 100644 --- a/admin/show_tickets.php +++ b/admin/show_tickets.php @@ -51,8 +51,8 @@ hesk_checkPermission('can_view_tickets'); /* Print header */ -require_once(HESK_PATH . 'inc/header_new_admin.inc.php'); -require_once(HESK_PATH . 'inc/new_admin_header_and_sidebar.inc.php'); +require_once(HESK_PATH . 'inc/headerAdmin.inc.php'); +require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); ?>
diff --git a/css/colors.css b/css/colors.css index 98958082..71fb60e2 100644 --- a/css/colors.css +++ b/css/colors.css @@ -2,10 +2,19 @@ color: #fff; } -.red { +.red, +.important { color: red; } .green { color: green; +} + +.orange { + color: orange; +} + +.gray { + color: grey; } \ No newline at end of file diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php index ea904680..faec99cd 100644 --- a/inc/headerAdmin.inc.php +++ b/inc/headerAdmin.inc.php @@ -37,42 +37,17 @@ if (!defined('IN_SCRIPT')) { $modsForHesk_settings = mfh_getSettings(); ?> - - + + <?php echo(isset($hesk_settings['tmp_title']) ? $hesk_settings['tmp_title'] : $hesk_settings['hesk_title']); ?> - - - - - - > - - - - - - - - - + @@ -81,7 +56,12 @@ $modsForHesk_settings = mfh_getSettings(); + + + + + @@ -236,7 +216,7 @@ $modsForHesk_settings = mfh_getSettings(); +unset($onload); ?>" class="hold-transition skin-blue sidebar-mini"> - - - - <?php echo(isset($hesk_settings['tmp_title']) ? $hesk_settings['tmp_title'] : $hesk_settings['hesk_title']); ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/inc/new_admin_header_and_sidebar.inc.php b/inc/new_admin_header_and_sidebar.inc.php deleted file mode 100644 index b42223aa..00000000 --- a/inc/new_admin_header_and_sidebar.inc.php +++ /dev/null @@ -1,458 +0,0 @@ - -
-
- - - - - - -
- -
\ No newline at end of file diff --git a/inc/profile_functions.inc.php b/inc/profile_functions.inc.php index a7fdb71d..9b489263 100644 --- a/inc/profile_functions.inc.php +++ b/inc/profile_functions.inc.php @@ -38,7 +38,7 @@ function hesk_profile_tab($session_array = 'new', $is_profile_page = true, $acti { global $hesk_settings, $hesklang, $can_reply_tickets, $can_view_tickets, $can_view_unassigned; ?> -
+
    diff --git a/inc/show_admin_nav.inc.php b/inc/show_admin_nav.inc.php index 83301736..32ea57e6 100644 --- a/inc/show_admin_nav.inc.php +++ b/inc/show_admin_nav.inc.php @@ -33,68 +33,426 @@ if (!defined('IN_SCRIPT')) { die('Invalid attempt'); } -$num_mail = hesk_checkNewMail(); +$mails = mfh_get_mail_headers_for_dropdown($_SESSION['id'], $hesk_settings, $hesklang); ?> -'; - hesk_show_notice($hesklang['mma2'], $hesklang['mma1'], false); - echo '
'; -} +
+
-// Show a notice if we are in "Knowledgebase only" mode -if (hesk_check_kb_only(false)) { - echo '
'; - hesk_show_notice($hesklang['kbo2'], $hesklang['kbo1'], false); - echo '
'; -} -?> -
- +
+
- - +
+ + +
\ No newline at end of file