Got a basic layout with top bar only working. Need to handle each page now

8 years ago · 937f91f352
parent a89fc9b20f
commit 937f91f352
30 changed files with 82 additions and 14 deletions
--- 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 */
--- 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
--- 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', '<script src="'.HESK_PATH.'internal-api/js/admin-ticket.js"></script>');

--- 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')) {
--- 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');
--- 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');
--- 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 */
--- 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);
--- 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');
--- 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');
--- 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');
--- 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');
--- 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');
--- 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');
--- 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');
--- 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');
--- 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');
--- 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');
--- 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');
--- 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');
--- 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');
--- 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);

--- 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');
--- 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');
--- 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');
--- 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');
--- 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');
--- 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;
--- a/inc/headerAdmin.inc.php
+++ b/inc/headerAdmin.inc.php
@ -233,8 +233,14 @@ $modsForHesk_settings = mfh_getSettings();
    ?>

 </head>
+<?php
+$layout_tag = '';
+if (defined('MFH_PAGE_LAYOUT') && MFH_PAGE_LAYOUT == 'TOP_ONLY') {
+    $layout_tag = 'layout-top-nav';
+}
+?>
 <body onload="<?php echo $onload;
-unset($onload); ?>" class="hold-transition <?php echo $modsForHesk_settings['admin_color_scheme']; ?> sidebar-mini">
+unset($onload); ?>" class="<?php echo $layout_tag ?> hold-transition <?php echo $modsForHesk_settings['admin_color_scheme']; ?> sidebar-mini">

 <?php
 include(HESK_PATH . 'header.txt');
--- a/inc/show_admin_nav.inc.php
+++ b/inc/show_admin_nav.inc.php
@ -20,21 +20,29 @@ $mails = mfh_get_mail_headers_for_dropdown($_SESSION['id'], $hesk_settings, $hes
 ?>
 <div class="wrapper">
    <header class="main-header">
-
-        <!-- Logo -->
+        <?php if (defined('MFH_PAGE_LAYOUT') && MFH_PAGE_LAYOUT == 'TOP_AND_SIDE'): ?>
        <a href="<?php echo $modsForHesk_settings['navbar_title_url']; ?>" class="logo">
-            <!-- mini logo for sidebar mini 50x50 pixels -->
            <span class="logo-mini">&nbsp;</span>
-            <!-- logo for regular state and mobile devices -->
            <span class="logo-lg"><?php echo $hesk_settings['hesk_title'] ?></span>
        </a>
+        <?php endif; ?>

-        <!-- Header Navbar: style can be found in header.less -->
        <nav class="navbar navbar-static-top">
-            <!-- Sidebar toggle button-->
+            <?php if(defined('MFH_PAGE_LAYOUT') && MFH_PAGE_LAYOUT == 'TOP_AND_SIDE'): ?>
            <a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button">
                <span class="sr-only">Toggle navigation</span>
            </a>
+            <?php endif; ?>
+            <div class="navbar-header">
+                <?php if (defined('MFH_PAGE_LAYOUT') && MFH_PAGE_LAYOUT == 'TOP_ONLY'): ?>
+                <a href="<?php echo $modsForHesk_settings['navbar_title_url']; ?>" class="navbar-brand logo">
+                    <?php echo $hesk_settings['hesk_title'] ?>
+                </a>
+                <?php endif; ?>
+                <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse">
+                    <i class="fa fa-bars"></i>
+                </button>
+            </div>
            <div class="collapse navbar-collapse pull-left" id="navbar-collapse">
                <ul class="nav navbar-nav">
                    <?php
@ -119,7 +127,7 @@ $mails = mfh_get_mail_headers_for_dropdown($_SESSION['id'], $hesk_settings, $hes
                </ul>
            </div>
            <!-- Navbar Right Menu -->
-            <div class="navbar-custom-menu">
+            <div class="navbar-custom-menu" id="header-right-side">
                <ul class="nav navbar-nav">
                    <!-- Messages: style can be found in dropdown.less-->
                    <?php
@ -212,7 +220,7 @@ $mails = mfh_get_mail_headers_for_dropdown($_SESSION['id'], $hesk_settings, $hes
                                    <?php endforeach; ?>
                                </ul>
                            </li>
-                            <li class="footer"><a href="mail.php">See All Messages</a></li>
+                            <li class="footer"><a href="mail.php">See All Messages [!!!]</a></li>
                        </ul>
                    </li>
                    <li class="dropdown user user-menu">
@ -227,7 +235,6 @@ $mails = mfh_get_mail_headers_for_dropdown($_SESSION['id'], $hesk_settings, $hes
                            <i class="fa fa-cog"></i>
                        </a>
                        <ul class="dropdown-menu">
-                            <!-- TODO -->
                            <?php
                            if (hesk_checkPermission('can_man_users', 0)):
                                $active = '';
@ -245,7 +252,7 @@ $mails = mfh_get_mail_headers_for_dropdown($_SESSION['id'], $hesk_settings, $hes
                            endif;
                            if (hesk_checkPermission('can_man_permission_tpl', 0)) :
                                $active = '';
-                                if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_USERS') {
+                                if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_PERMISSION_TPL') {
                                    $active = 'active';
                                }
                            ?>
@ -383,6 +390,7 @@ $mails = mfh_get_mail_headers_for_dropdown($_SESSION['id'], $hesk_settings, $hes
                                </li>
                                <?php
                            endif;
+                            echo '<li class="divider"></li>';
                            if (hesk_checkPermission('can_view_logs', 0)):
                                $active = '';
                                if (defined('PAGE_TITLE') && PAGE_TITLE == 'ADMIN_LOGS') {
@ -421,7 +429,6 @@ $mails = mfh_get_mail_headers_for_dropdown($_SESSION['id'], $hesk_settings, $hes
                    </li>
                </ul>
            </div>
-
        </nav>
    </header>
    <div class="content-wrapper">