From 91aa1d937863b3454c1c0118c5c35d26c4ff23c6 Mon Sep 17 00:00:00 2001 From: Deon George Date: Mon, 18 Feb 2019 20:44:17 +1100 Subject: [PATCH] Enabled search results and remember sidebar collapse --- .../layouts/partials/contentheader.blade.php | 2 +- .../layouts/partials/mainheader.blade.php | 14 ++++--- .../views/layouts/partials/scripts.blade.php | 39 +++++++++++++++++++ 3 files changed, 49 insertions(+), 6 deletions(-) diff --git a/resources/themes/adminlte/views/layouts/partials/contentheader.blade.php b/resources/themes/adminlte/views/layouts/partials/contentheader.blade.php index 43d797b..a336248 100644 --- a/resources/themes/adminlte/views/layouts/partials/contentheader.blade.php +++ b/resources/themes/adminlte/views/layouts/partials/contentheader.blade.php @@ -7,7 +7,7 @@ @yield('contentheader_description','Description')
-
+ +
@@ -95,14 +97,15 @@ type : 'GET', data : 'term=' + query, dataType : 'JSON', - async : false, + async : true, cache : false, beforeSend : function() { if (c++ == 0) { if (icon) $('i[name='+icon+']').addClass("fa-spin"); - else - $('i[name=searching]').removeClass("hidden"); + else { + $('span[name=searching]').removeClass("d-none"); + } } }, success : function(data) { @@ -125,8 +128,9 @@ if (--c == 0) { if (icon) $('i[name='+icon+']').removeClass("fa-spin"); - else - $('i[name=searching]').addClass("hidden"); + else { + $('span[name=searching]').addClass("d-none"); + } } } }) diff --git a/resources/themes/adminlte/views/layouts/partials/scripts.blade.php b/resources/themes/adminlte/views/layouts/partials/scripts.blade.php index 93cae96..9321f4d 100644 --- a/resources/themes/adminlte/views/layouts/partials/scripts.blade.php +++ b/resources/themes/adminlte/views/layouts/partials/scripts.blade.php @@ -13,4 +13,43 @@ 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') } }); + + $.AdminLTESidebarTweak = {}; + + $.AdminLTESidebarTweak.options = { + EnableRemember: true, + //Removes the transition after page reload. + NoTransitionAfterReload: false + }; + + $(function () { + "use strict"; + + $("body").on("collapsed.lte.pushmenu", function(){ + if($.AdminLTESidebarTweak.options.EnableRemember){ + document.cookie = "toggleState=closed"; + } + }); + + $("body").on("expanded.lte.pushmenu", function(){ + if($.AdminLTESidebarTweak.options.EnableRemember){ + document.cookie = "toggleState=opened"; + } + }); + + if($.AdminLTESidebarTweak.options.EnableRemember){ + var re = new RegExp('toggleState' + "=([^;]+)"); + var value = re.exec(document.cookie); + var toggleState = (value != null) ? unescape(value[1]) : null; + if(toggleState == 'closed'){ + if($.AdminLTESidebarTweak.options.NoTransitionAfterReload){ + $("body").addClass('sidebar-collapse hold-transition').delay(100).queue(function(){ + $(this).removeClass('hold-transition'); + }); + }else{ + $("body").addClass('sidebar-collapse'); + } + } + } + }); \ No newline at end of file