From d55e19c5d6f287eea1d35d8cf967af80f8a060c2 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sun, 27 Nov 2016 22:01:32 -0500 Subject: [PATCH] Moved content-wrapper to actual pages --- admin/admin_main.php | 4 +- admin/admin_settings.php | 4 +- admin/admin_ticket.php | 5 +- admin/api_settings.php | 4 +- admin/banned_emails.php | 17 +- admin/banned_ips.php | 8 +- admin/calendar.php | 4 +- admin/custom_fields.php | 4 +- admin/edit_note.php | 21 +- admin/edit_post.php | 613 +++++++++++++------------- admin/export.php | 7 +- admin/find_tickets.php | 77 ++-- admin/knowledgebase_private.php | 118 ++--- admin/mail.php | 5 +- admin/manage_canned.php | 7 +- admin/manage_categories.php | 4 +- admin/manage_email_templates.php | 9 +- admin/manage_knowledgebase.php | 27 +- admin/manage_permission_templates.php | 4 +- admin/manage_statuses.php | 10 +- admin/manage_ticket_templates.php | 6 +- admin/manage_users.php | 12 +- admin/new_ticket.php | 28 +- admin/profile.php | 4 +- admin/reports.php | 4 +- admin/service_messages.php | 6 +- admin/show_tickets.php | 4 +- admin/view_message_log.php | 6 +- inc/footer.inc.php | 1 - inc/show_admin_nav.inc.php | 5 +- 30 files changed, 525 insertions(+), 503 deletions(-) diff --git a/admin/admin_main.php b/admin/admin_main.php index c5d62be2..ccf9db6a 100644 --- a/admin/admin_main.php +++ b/admin/admin_main.php @@ -52,7 +52,8 @@ else { } ?> -
+
+
@@ -111,6 +112,7 @@ else { hesk_cleanSessionVars('hide'); ?>
+
-
+
+
+
-
+
+
+

diff --git a/admin/api_settings.php b/admin/api_settings.php index 31e867a0..0c777e40 100644 --- a/admin/api_settings.php +++ b/admin/api_settings.php @@ -62,7 +62,8 @@ require_once(HESK_PATH . 'inc/headerAdmin.inc.php'); // Print main manage users page require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); ?> -
+
+

@@ -230,6 +231,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');

+
-
+
+
@@ -211,14 +212,6 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); ?> -
- - -
-
- - - +
-
+
+
@@ -284,8 +285,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
- - +
-
+
+
@@ -156,6 +157,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
+
+
- -
+
+
@@ -175,6 +175,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
+
-
+
+

@@ -175,7 +176,7 @@ $num = hesk_dbNumRows($result); if ($num > 1) { if ($j == 1) { - echo ' '; + echo ' '; } elseif ($j == $num) { echo ' '; } else { @@ -394,7 +395,7 @@ $num = hesk_dbNumRows($result);

- +
' . $mycat['name'] . ''; } ?> -
+
+

@@ -362,6 +363,7 @@ while ($mycat = hesk_dbFetchAssoc($res)) {

+
+ +
+
- +
    3. @@ -593,6 +597,7 @@ if (!isset($_SESSION['hide']['new_category']))
+ +
    3. @@ -706,11 +712,9 @@ function list_draft() {
- +  '; - /* Clean unneeded session variables */ hesk_cleanSessionVars(array('hide','manage_cat','edit_article')); @@ -749,7 +753,7 @@ function list_private() { $res = hesk_dbQuery("SELECT * FROM `". hesk_dbEscape($hesk_settings['db_pfix'])."kb_articles` WHERE `type`='1' " . (count($private_categories) ? " OR `catid` IN('" . implode("','", $private_categories) . "') " : '') . " ORDER BY `catid` ASC, `id` ASC"); $num = hesk_dbNumRows($res); ?> - +
    3. @@ -856,11 +860,8 @@ function list_private() {
- -  '; - + + - +
    3. @@ -1911,8 +1912,8 @@ function manage_category() {
- - + -
+
+
@@ -147,6 +148,7 @@ while ($row = hesk_dbFetchAssoc($res)) {
+
-
+
+
@@ -374,9 +376,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
- - - +
-
+
+

@@ -281,6 +282,7 @@ $num = hesk_dbNumRows($result);

+
- + - +
-
@@ -463,8 +463,8 @@ function edit_user()
- - + - -
    -
    2. - 1): ?> -
    3. -
    4. - -
    5. - -
-
+
+
    +
    2. + 1): ?> +
    3. +
    4. + +
    5. + +
+
- +
- - +
@@ -1092,6 +1091,7 @@ function print_select_category($number_of_categories) {
+
-
+
+

@@ -143,6 +144,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');

+
-
+
+
+
-
+
+
@@ -439,6 +440,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
+
-
+
+
@@ -100,6 +101,7 @@ C9wPic7DQp9DQo=', "\112"); hesk_cleanSessionVars('hide'); ?>
+
-
+
+

@@ -103,6 +104,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');

+
'; } diff --git a/inc/show_admin_nav.inc.php b/inc/show_admin_nav.inc.php index e67d1b25..2272c0d5 100644 --- a/inc/show_admin_nav.inc.php +++ b/inc/show_admin_nav.inc.php @@ -294,7 +294,7 @@ $mails = mfh_get_mail_headers_for_dropdown($_SESSION['id'], $hesk_settings, $hes endif; if (hesk_checkPermission('can_man_ticket_tpl', 0)): $active = ''; - if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_CANNED') { + if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_TICKET_TPL') { $active = 'active'; } ?> @@ -430,5 +430,4 @@ $mails = mfh_get_mail_headers_for_dropdown($_SESSION['id'], $hesk_settings, $hes - -
\ No newline at end of file + \ No newline at end of file