From 937f91f352b2c87a08bdb27004d35bf22e496c85 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sun, 27 Nov 2016 01:35:08 -0500 Subject: [PATCH] Got a basic layout with top bar only working. Need to handle each page now --- admin/admin_main.php | 1 + admin/admin_settings.php | 1 + admin/admin_ticket.php | 1 + admin/api_settings.php | 1 + admin/banned_emails.php | 1 + admin/banned_ips.php | 1 + admin/calendar.php | 1 + admin/custom_fields.php | 2 ++ admin/edit_note.php | 1 + admin/edit_post.php | 1 + admin/export.php | 1 + admin/find_tickets.php | 3 ++- admin/knowledgebase_private.php | 1 + admin/mail.php | 1 + admin/manage_canned.php | 1 + admin/manage_categories.php | 1 + admin/manage_email_templates.php | 1 + admin/manage_knowledgebase.php | 1 + admin/manage_permission_templates.php | 3 ++- admin/manage_ticket_templates.php | 1 + admin/manage_users.php | 1 + admin/new_ticket.php | 1 + admin/profile.php | 1 + admin/reports.php | 1 + admin/service_messages.php | 1 + admin/show_tickets.php | 1 + admin/view_message_log.php | 1 + css/mods-for-hesk-new.css | 27 +++++++++++++++++++++++++ inc/headerAdmin.inc.php | 8 +++++++- inc/show_admin_nav.inc.php | 29 +++++++++++++++++---------- 30 files changed, 82 insertions(+), 14 deletions(-) diff --git a/admin/admin_main.php b/admin/admin_main.php index b76bf937..c5d62be2 100644 --- a/admin/admin_main.php +++ b/admin/admin_main.php @@ -34,6 +34,7 @@ hesk_isLoggedIn(); define('CALENDAR', 1); define('MAIN_PAGE', 1); define('PAGE_TITLE', 'ADMIN_HOME'); +define('MFH_PAGE_LAYOUT', 'TOP_ONLY'); define('AUTO_RELOAD', 1); /* Print header */ diff --git a/admin/admin_settings.php b/admin/admin_settings.php index e7452200..5e9a80d5 100644 --- a/admin/admin_settings.php +++ b/admin/admin_settings.php @@ -14,6 +14,7 @@ define('IN_SCRIPT', 1); define('HESK_PATH', '../'); define('PAGE_TITLE', 'ADMIN_SETTINGS'); +define('MFH_PAGE_LAYOUT', 'TOP_AND_SIDE'); define('LOAD_TABS', 1); // Make sure the install folder is deleted diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php index 48532063..77579fea 100644 --- a/admin/admin_ticket.php +++ b/admin/admin_ticket.php @@ -15,6 +15,7 @@ define('IN_SCRIPT', 1); define('HESK_PATH', '../'); define('WYSIWYG', 1); define('VALIDATOR', 1); +define('MFH_PAGE_LAYOUT', 'TOP_AND_SIDE'); define('EXTRA_JS', ''); diff --git a/admin/api_settings.php b/admin/api_settings.php index 072bddb1..31e867a0 100644 --- a/admin/api_settings.php +++ b/admin/api_settings.php @@ -31,6 +31,7 @@ define('IN_SCRIPT', 1); define('HESK_PATH', '../'); define('PAGE_TITLE', 'ADMIN_SETTINGS'); +define('MFH_PAGE_LAYOUT', 'TOP_AND_SIDE'); // Make sure the install folder is deleted if (is_dir(HESK_PATH . 'install')) { diff --git a/admin/banned_emails.php b/admin/banned_emails.php index d3aa2adf..9e979286 100644 --- a/admin/banned_emails.php +++ b/admin/banned_emails.php @@ -14,6 +14,7 @@ define('IN_SCRIPT', 1); define('HESK_PATH', '../'); define('PAGE_TITLE', 'ADMIN_TOOLS'); +define('MFH_PAGE_LAYOUT', 'TOP_ONLY'); /* Get all the required files and functions */ require(HESK_PATH . 'hesk_settings.inc.php'); diff --git a/admin/banned_ips.php b/admin/banned_ips.php index 49d8dd15..70e5dc48 100644 --- a/admin/banned_ips.php +++ b/admin/banned_ips.php @@ -14,6 +14,7 @@ define('IN_SCRIPT', 1); define('HESK_PATH', '../'); define('PAGE_TITLE', 'ADMIN_TOOLS'); +define('MFH_PAGE_LAYOUT', 'TOP_ONLY'); /* Get all the required files and functions */ require(HESK_PATH . 'hesk_settings.inc.php'); diff --git a/admin/calendar.php b/admin/calendar.php index a32d46de..9dae3602 100644 --- a/admin/calendar.php +++ b/admin/calendar.php @@ -32,6 +32,7 @@ define('IN_SCRIPT', 1); define('VALIDATOR', 1); define('HESK_PATH', '../'); define('PAGE_TITLE', 'ADMIN_CALENDAR'); +define('MFH_PAGE_LAYOUT', 'TOP_AND_SIDE'); define('USE_JQUERY_2', 1); /* Get all the required files and functions */ diff --git a/admin/custom_fields.php b/admin/custom_fields.php index bbd978f2..bbff7013 100755 --- a/admin/custom_fields.php +++ b/admin/custom_fields.php @@ -13,6 +13,8 @@ define('IN_SCRIPT',1); define('HESK_PATH','../'); +define('MFH_PAGE_LAYOUT', 'TOP_ONLY'); +define('PAGE_TITLE', 'ADMIN_CUSTOM_FIELDS'); define('LOAD_TABS',1); define('CALENDAR',1); diff --git a/admin/edit_note.php b/admin/edit_note.php index a269e5ab..fed360b1 100644 --- a/admin/edit_note.php +++ b/admin/edit_note.php @@ -13,6 +13,7 @@ define('IN_SCRIPT', 1); define('HESK_PATH', '../'); +define('MFH_PAGE_LAYOUT', 'TOP_ONLY'); /* Get all the required files and functions */ require(HESK_PATH . 'hesk_settings.inc.php'); diff --git a/admin/edit_post.php b/admin/edit_post.php index 34ac110c..3b4156dd 100644 --- a/admin/edit_post.php +++ b/admin/edit_post.php @@ -15,6 +15,7 @@ define('IN_SCRIPT', 1); define('HESK_PATH', '../'); define('WYSIWYG', 1); define('VALIDATOR', 1); +define('MFH_PAGE_LAYOUT', 'TOP_ONLY'); /* Get all the required files and functions */ require(HESK_PATH . 'hesk_settings.inc.php'); diff --git a/admin/export.php b/admin/export.php index 5ae26010..f0f8cf96 100644 --- a/admin/export.php +++ b/admin/export.php @@ -13,6 +13,7 @@ define('IN_SCRIPT', 1); define('HESK_PATH', '../'); define('PAGE_TITLE', 'ADMIN_REPORTS'); +define('MFH_PAGE_LAYOUT', 'TOP_ONLY'); /* Get all the required files and functions */ require(HESK_PATH . 'hesk_settings.inc.php'); diff --git a/admin/find_tickets.php b/admin/find_tickets.php index c10c6e55..a6964d76 100644 --- a/admin/find_tickets.php +++ b/admin/find_tickets.php @@ -13,7 +13,8 @@ define('IN_SCRIPT', 1); define('HESK_PATH', '../'); -define('PAGE_TITLE', 'ADMIN_TICKET'); +define('PAGE_TITLE', 'ADMIN_HOME'); +define('MFH_PAGE_LAYOUT', 'TOP_ONLY'); /* Get all the required files and functions */ require(HESK_PATH . 'hesk_settings.inc.php'); diff --git a/admin/knowledgebase_private.php b/admin/knowledgebase_private.php index d83f49dd..8e13596c 100644 --- a/admin/knowledgebase_private.php +++ b/admin/knowledgebase_private.php @@ -31,6 +31,7 @@ define('IN_SCRIPT',1); define('HESK_PATH','../'); define('PAGE_TITLE', 'ADMIN_KB'); +define('MFH_PAGE_LAYOUT', 'TOP_ONLY'); /* Get all the required files and functions */ require(HESK_PATH . 'hesk_settings.inc.php'); diff --git a/admin/mail.php b/admin/mail.php index d0a8f3f9..abcb83b3 100644 --- a/admin/mail.php +++ b/admin/mail.php @@ -14,6 +14,7 @@ define('IN_SCRIPT', 1); define('HESK_PATH', '../'); define('PAGE_TITLE', 'ADMIN_MAIL'); +define('MFH_PAGE_LAYOUT', 'TOP_AND_SIDE'); /* Get all the required files and functions */ require(HESK_PATH . 'hesk_settings.inc.php'); diff --git a/admin/manage_canned.php b/admin/manage_canned.php index 98d87644..70d61546 100644 --- a/admin/manage_canned.php +++ b/admin/manage_canned.php @@ -15,6 +15,7 @@ define('IN_SCRIPT', 1); define('HESK_PATH', '../'); define('VALIDATOR', 1); define('PAGE_TITLE', 'ADMIN_CANNED'); +define('MFH_PAGE_LAYOUT', 'TOP_ONLY'); /* Get all the required files and functions */ require(HESK_PATH . 'hesk_settings.inc.php'); diff --git a/admin/manage_categories.php b/admin/manage_categories.php index d88d3737..23e70df7 100644 --- a/admin/manage_categories.php +++ b/admin/manage_categories.php @@ -15,6 +15,7 @@ define('IN_SCRIPT', 1); define('HESK_PATH', '../'); define('VALIDATOR', 1); define('PAGE_TITLE', 'ADMIN_CATEGORIES'); +define('MFH_PAGE_LAYOUT', 'TOP_ONLY'); /* Get all the required files and functions */ require(HESK_PATH . 'hesk_settings.inc.php'); diff --git a/admin/manage_email_templates.php b/admin/manage_email_templates.php index 8b487e29..68980837 100644 --- a/admin/manage_email_templates.php +++ b/admin/manage_email_templates.php @@ -3,6 +3,7 @@ define('IN_SCRIPT', 1); define('HESK_PATH', '../'); define('PAGE_TITLE', 'ADMIN_TOOLS'); +define('MFH_PAGE_LAYOUT', 'TOP_ONLY'); /* Get all the required files and functions */ require(HESK_PATH . 'hesk_settings.inc.php'); diff --git a/admin/manage_knowledgebase.php b/admin/manage_knowledgebase.php index ceeeec48..a4262485 100644 --- a/admin/manage_knowledgebase.php +++ b/admin/manage_knowledgebase.php @@ -32,6 +32,7 @@ define('IN_SCRIPT',1); define('HESK_PATH','../'); define('VALIDATOR', 1); define('PAGE_TITLE', 'ADMIN_KB'); +define('MFH_PAGE_LAYOUT', 'TOP_ONLY'); /* Get all the required files and functions */ require(HESK_PATH . 'hesk_settings.inc.php'); diff --git a/admin/manage_permission_templates.php b/admin/manage_permission_templates.php index 2434657b..7c627f86 100644 --- a/admin/manage_permission_templates.php +++ b/admin/manage_permission_templates.php @@ -14,7 +14,8 @@ define('IN_SCRIPT', 1); define('HESK_PATH', '../'); define('VALIDATOR', 1); -define('PAGE_TITLE', 'ADMIN_USERS'); +define('PAGE_TITLE', 'ADMIN_PERMISSION_TPL'); +define('MFH_PAGE_LAYOUT', 'TOP_ONLY'); /* Get all the required files and functions */ require(HESK_PATH . 'hesk_settings.inc.php'); diff --git a/admin/manage_ticket_templates.php b/admin/manage_ticket_templates.php index 666167ac..ae171455 100644 --- a/admin/manage_ticket_templates.php +++ b/admin/manage_ticket_templates.php @@ -15,6 +15,7 @@ define('IN_SCRIPT', 1); define('HESK_PATH', '../'); define('VALIDATOR', 1); define('PAGE_TITLE', 'ADMIN_CANNED'); +define('MFH_PAGE_LAYOUT', 'TOP_ONLY'); /* Get all the required files and functions */ require(HESK_PATH . 'hesk_settings.inc.php'); diff --git a/admin/manage_users.php b/admin/manage_users.php index 4c4a1812..ba9ee919 100644 --- a/admin/manage_users.php +++ b/admin/manage_users.php @@ -15,6 +15,7 @@ define('IN_SCRIPT', 1); define('HESK_PATH', '../'); define('VALIDATOR', 1); define('PAGE_TITLE', 'ADMIN_USERS'); +define('MFH_PAGE_LAYOUT', 'TOP_ONLY'); /* Get all the required files and functions */ require(HESK_PATH . 'hesk_settings.inc.php'); diff --git a/admin/new_ticket.php b/admin/new_ticket.php index 22397948..bf4f0f33 100644 --- a/admin/new_ticket.php +++ b/admin/new_ticket.php @@ -13,6 +13,7 @@ define('IN_SCRIPT', 1); define('HESK_PATH', '../'); +define('MFH_PAGE_LAYOUT', 'TOP_ONLY'); define('WYSIWYG', 1); define('VALIDATOR', 1); diff --git a/admin/profile.php b/admin/profile.php index 3e607602..bfc40082 100644 --- a/admin/profile.php +++ b/admin/profile.php @@ -14,6 +14,7 @@ define('IN_SCRIPT', 1); define('HESK_PATH', '../'); define('PAGE_TITLE', 'ADMIN_PROFILE'); +define('MFH_PAGE_LAYOUT', 'TOP_ONLY'); /* Get all the required files and functions */ require(HESK_PATH . 'hesk_settings.inc.php'); diff --git a/admin/reports.php b/admin/reports.php index 844f264f..58c79cb3 100644 --- a/admin/reports.php +++ b/admin/reports.php @@ -14,6 +14,7 @@ define('IN_SCRIPT', 1); define('HESK_PATH', '../'); define('PAGE_TITLE', 'ADMIN_REPORTS'); +define('MFH_PAGE_LAYOUT', 'TOP_ONLY'); /* Get all the required files and functions */ require(HESK_PATH . 'hesk_settings.inc.php'); diff --git a/admin/service_messages.php b/admin/service_messages.php index 214c4b11..3eefe64b 100644 --- a/admin/service_messages.php +++ b/admin/service_messages.php @@ -14,6 +14,7 @@ define('IN_SCRIPT', 1); define('HESK_PATH', '../'); define('PAGE_TITLE', 'ADMIN_TOOLS'); +define('MFH_PAGE_LAYOUT', 'TOP_ONLY'); /* Get all the required files and functions */ require(HESK_PATH . 'hesk_settings.inc.php'); diff --git a/admin/show_tickets.php b/admin/show_tickets.php index a326a9fd..1ca639f6 100644 --- a/admin/show_tickets.php +++ b/admin/show_tickets.php @@ -14,6 +14,7 @@ define('IN_SCRIPT', 1); define('HESK_PATH', '../'); define('PAGE_TITLE', 'ADMIN_TICKET'); +define('MFH_PAGE_LAYOUT', 'TOP_ONLY'); /* Get all the required files and functions */ require(HESK_PATH . 'hesk_settings.inc.php'); diff --git a/admin/view_message_log.php b/admin/view_message_log.php index d96f9b2b..84f59e40 100644 --- a/admin/view_message_log.php +++ b/admin/view_message_log.php @@ -3,6 +3,7 @@ define('IN_SCRIPT', 1); define('HESK_PATH', '../'); define('PAGE_TITLE', 'ADMIN_TOOLS'); +define('MFH_PAGE_LAYOUT', 'TOP_ONLY'); /* Get all the required files and functions */ require(HESK_PATH . 'hesk_settings.inc.php'); diff --git a/css/mods-for-hesk-new.css b/css/mods-for-hesk-new.css index be48841b..a82dd538 100644 --- a/css/mods-for-hesk-new.css +++ b/css/mods-for-hesk-new.css @@ -49,6 +49,33 @@ } } +@media (min-width: 768px) and (max-width: 991px) { + .navbar-collapse.pull-left + .navbar-custom-menu { + position: relative; + } +} + +@media (max-width: 767px) { + body.layout-top-nav .navbar-collapse.pull-left + .navbar-custom-menu { + margin-top: 50px; + } +} + +@media (max-width: 767px) { + #header-right-side .navbar-nav .dropdown-menu li a { + color: #777; + } +} + +@media (max-width: 767px) { + #header-right-side .navbar-nav .dropdown-menu li a:hover, + #header-right-side .navbar-nav .dropdown-menu li a:focus { + color: #262626; + text-decoration: none; + background-color: #f5f5f5; + } +} + .ticket-property-title { color: rgba(255, 255, 255, .75); font-size: 11px; diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php index 5ed4a988..805a0d78 100644 --- a/inc/headerAdmin.inc.php +++ b/inc/headerAdmin.inc.php @@ -233,8 +233,14 @@ $modsForHesk_settings = mfh_getSettings(); ?> + +unset($onload); ?>" class=" hold-transition sidebar-mini">
- - + + -
\ No newline at end of file