From 7019af3a11fca9c117818dbfe2c4e4b8d663caaa Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Mon, 30 Sep 2013 11:20:49 +0200 Subject: [PATCH] // Bound the menu to the employee option --- admin-dev/themes/default/js/admin-theme.js | 14 +++++++------- admin-dev/themes/default/template/header.tpl | 12 ++++-------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/admin-dev/themes/default/js/admin-theme.js b/admin-dev/themes/default/js/admin-theme.js index 4a9c528de..16bbcdf33 100755 --- a/admin-dev/themes/default/js/admin-theme.js +++ b/admin-dev/themes/default/js/admin-theme.js @@ -26,6 +26,9 @@ $( document ).ready(function() { //nav side bar function navSidebar(){ + $('body.page-topbar').removeClass('page-topbar').addClass('page-sidebar'); + $('#nav-topbar').attr('id','nav-sidebar'); + $('#nav-sidebar').off(); $('.expanded').removeClass('expanded'); $('.maintab').not('.active').closest('.submenu').hide(); $('#nav-sidebar li.maintab.has_submenu').append(''); @@ -51,6 +54,9 @@ $( document ).ready(function() { } //nav top bar function navTopbar(){ + $('body').removeClass('page-sidebar').removeClass('page-sidebar-closed').addClass('page-topbar'); + $('#nav-sidebar').attr('id','nav-topbar'); + $('#nav-topbar').off(); $('span.submenu_expand').remove(); $('.expanded').removeClass('expanded'); @@ -84,14 +90,8 @@ $( document ).ready(function() { //nav switch function navSwitch(){ if ($('body').hasClass('page-sidebar')||$('body').hasClass('page-sidebar-closed')) { - $('body').removeClass('page-sidebar').removeClass('page-sidebar-closed').addClass('page-topbar'); - $('#nav-sidebar').attr('id','nav-topbar'); - $('#nav-topbar').off(); navTopbar(); } else { - $('body.page-topbar').removeClass('page-topbar').addClass('page-sidebar'); - $('#nav-topbar').attr('id','nav-sidebar'); - $('#nav-sidebar').off(); navSidebar(); } } @@ -100,7 +100,7 @@ $( document ).ready(function() { if ($('body').hasClass('page-sidebar')){ navSidebar(); } else if($('body').hasClass('page-topbar')) { - navTopbar(); + navTopbar(); } $('#header_shopname').on('click', diff --git a/admin-dev/themes/default/template/header.tpl b/admin-dev/themes/default/template/header.tpl index 7da451979..c8f463241 100644 --- a/admin-dev/themes/default/template/header.tpl +++ b/admin-dev/themes/default/template/header.tpl @@ -102,22 +102,18 @@ {/if} - - + + {if $display_header} {* begin HEADER *}