Update AdminLTE

- from 2.4.5 to 2.4.18 (cannot detect any issues)
- set default scancycle for Apple Devices to 1

front/lib/AdminLTE/build/js/BoxRefresh.js

@@ -35,7 +35,7 @@
   var BoxRefresh = function (element, options) {
     this.element  = element;
     this.options  = options;
-    this.$overlay = $(options.overlay);
+    this.$overlay = $(options.overlayTemplate);
 
     if (options.source === '') {
       throw new Error('Source url was not defined. Please specify a url in your BoxRefresh source option.');
@@ -51,7 +51,7 @@
 
     $.get(this.options.source, this.options.params, function (response) {
       if (this.options.loadInContent) {
-        $(this.options.content).html(response);
+        $(this.element).find(this.options.content).html(response);
       }
       this.options.onLoadDone.call($(this), response);
       this._removeOverlay();
@@ -61,7 +61,7 @@
   // Private
 
   BoxRefresh.prototype._setUpListeners = function () {
-    $(this.element).on('click', Selector.trigger, function (event) {
+    $(this.element).on('click', this.options.trigger, function (event) {
       if (event) event.preventDefault();
       this.load();
     }.bind(this));
@@ -72,7 +72,7 @@
   };
 
   BoxRefresh.prototype._removeOverlay = function () {
-    $(this.element).remove(this.$overlay);
+    $(this.$overlay).remove();
   };
 
   // Plugin Definition

front/lib/AdminLTE/build/js/BoxWidget.js

@@ -34,10 +34,13 @@
   };
 
   var Event = {
-    collapsed: 'collapsed.boxwidget',
-    expanded : 'expanded.boxwidget',
-    removed  : 'removed.boxwidget'
-  };
+        collapsing: 'collapsing.boxwidget',
+        collapsed: 'collapsed.boxwidget',
+        expanding: 'expanding.boxwidget',
+        expanded: 'expanded.boxwidget',
+        removing: 'removing.boxwidget',
+        removed: 'removed.boxwidget'        
+    };
 
   // BoxWidget Class Definition
   // =====================
@@ -60,6 +63,7 @@
 
   BoxWidget.prototype.expand = function () {
     var expandedEvent = $.Event(Event.expanded);
+    var expandingEvent = $.Event(Event.expanding);
     var collapseIcon  = this.options.collapseIcon;
     var expandIcon    = this.options.expandIcon;
 
@@ -75,11 +79,13 @@
     $(this.element).children(Selector.body + ', ' + Selector.footer)
       .slideDown(this.options.animationSpeed, function () {
         $(this.element).trigger(expandedEvent);
-      }.bind(this));
+      }.bind(this))
+      .trigger(expandingEvent);
   };
 
   BoxWidget.prototype.collapse = function () {
     var collapsedEvent = $.Event(Event.collapsed);
+    var collapsingEvent = $.Event(Event.collapsing);
     var collapseIcon   = this.options.collapseIcon;
     var expandIcon     = this.options.expandIcon;
 
@@ -94,16 +100,19 @@
       .slideUp(this.options.animationSpeed, function () {
         $(this.element).addClass(ClassName.collapsed);
         $(this.element).trigger(collapsedEvent);
-      }.bind(this));
+      }.bind(this))
+      .trigger(collapsingEvent);
   };
 
   BoxWidget.prototype.remove = function () {
     var removedEvent = $.Event(Event.removed);
+    var removingEvent = $.Event(Event.removing);
 
     $(this.element).slideUp(this.options.animationSpeed, function () {
       $(this.element).trigger(removedEvent);
       $(this.element).remove();
-    }.bind(this));
+    }.bind(this))
+    .trigger(removingEvent);
   };
 
   // Private

front/lib/AdminLTE/build/js/ControlSidebar.js

@@ -12,7 +12,7 @@
   var DataKey = 'lte.controlsidebar';
 
   var Default = {
-    slide: true
+    controlsidebarSlide: true
   };
 
   var Selector = {
@@ -26,7 +26,8 @@
   };
 
   var ClassName = {
-    open : 'control-sidebar-open',
+    open: 'control-sidebar-open',
+    transition: 'control-sidebar-hold-transition',
     fixed: 'fixed'
   };
 
@@ -71,17 +72,30 @@
   };
 
   ControlSidebar.prototype.expand = function () {
-    if (!this.options.slide) {
-      $('body').addClass(ClassName.open);
+    $(Selector.sidebar).show();
+    if (!this.options.controlsidebarSlide) {
+      $('body').addClass(ClassName.transition).addClass(ClassName.open).delay(50).queue(function(){
+        $('body').removeClass(ClassName.transition);
+        $(this).dequeue()
+      })
     } else {
       $(Selector.sidebar).addClass(ClassName.open);
     }
 
+
     $(this.element).trigger($.Event(Event.expanded));
   };
 
   ControlSidebar.prototype.collapse = function () {
-    $('body, ' + Selector.sidebar).removeClass(ClassName.open);
+    if (!this.options.controlsidebarSlide) {
+      $('body').addClass(ClassName.transition).removeClass(ClassName.open).delay(50).queue(function(){
+        $('body').removeClass(ClassName.transition);
+        $(this).dequeue()
+      })
+    } else {
+      $(Selector.sidebar).removeClass(ClassName.open);
+    }
+    $(Selector.sidebar).fadeOut();
     $(this.element).trigger($.Event(Event.collapsed));
   };
 

front/lib/AdminLTE/build/js/Layout.js

@@ -23,6 +23,8 @@
     layoutBoxed   : '.layout-boxed',
     mainFooter    : '.main-footer',
     mainHeader    : '.main-header',
+    mainSidebar   : '.main-sidebar',
+    slimScrollDiv : 'slimScrollDiv',
     sidebar       : '.sidebar',
     controlSidebar: '.control-sidebar',
     fixed         : '.fixed',
@@ -84,11 +86,11 @@
     $(Selector.layoutBoxed + ' > ' + Selector.wrapper).css('overflow', 'hidden');
 
     // Get window height and the wrapper height
-    var footerHeight = $(Selector.mainFooter).outerHeight() || 0;
+    var footerHeight  = $(Selector.mainFooter).outerHeight() || 0;
     var headerHeight  = $(Selector.mainHeader).outerHeight() || 0;
     var neg           = headerHeight + footerHeight;
     var windowHeight  = $(window).height();
-    var sidebarHeight = $(Selector.sidebar).height() || 0;
+    var sidebarHeight = $(Selector.sidebar).outerHeight() || 0;
 
     // Set the min-height of the content and sidebar based on
     // the height of the document.
@@ -97,7 +99,7 @@
     } else {
       var postSetHeight;
 
-      if (windowHeight >= sidebarHeight) {
+      if (windowHeight >= sidebarHeight + headerHeight) {
         $(Selector.contentWrapper).css('min-height', windowHeight - neg);
         postSetHeight = windowHeight - neg;
       } else {
@@ -130,9 +132,11 @@
         // $(Selector.sidebar).slimScroll({ destroy: true }).height('auto')
 
         // Add slimscroll
-        $(Selector.sidebar).slimScroll({
-          height: ($(window).height() - $(Selector.mainHeader).height()) + 'px'
-        });
+        if ($(Selector.mainSidebar).find(Selector.slimScrollDiv).length === 0) {
+          $(Selector.sidebar).slimScroll({
+            height: ($(window).height() - $(Selector.mainHeader).height()) + 'px'
+          });
+        }
       }
     }
   };

front/lib/AdminLTE/build/js/Tree.js

@@ -82,8 +82,9 @@
     }
 
     parent.addClass(ClassName.open);
-    tree.slideDown(this.options.animationSpeed, function () {
+    tree.stop().slideDown(this.options.animationSpeed, function () {
       $(this.element).trigger(expandedEvent);
+      parent.height('auto');
     }.bind(this));
   };
 
@@ -92,9 +93,12 @@
 
     //tree.find(Selector.open).removeClass(ClassName.open);
     parentLi.removeClass(ClassName.open);
-    tree.slideUp(this.options.animationSpeed, function () {
+    tree.stop().slideUp(this.options.animationSpeed, function () {
       //tree.find(Selector.open + ' > ' + Selector.treeview).slideUp();
       $(this.element).trigger(collapsedEvent);
+
+      // Collapse child items
+      parentLi.find(Selector.treeview).removeClass(ClassName.open).find(Selector.treeviewMenu).hide();
     }.bind(this));
   };
 

front/lib/AdminLTE/build/less/AdminLTE-without-plugins.less

@@ -1,10 +1,13 @@
 /*!
- *   AdminLTE v2.4.0 Without Third-Party Plugins
- *   Author: Almsaeed Studio
- *	 Website: Almsaeed Studio <https://adminlte.io>
- *   License: Open source - MIT
- *           Please visit http://opensource.org/licenses/MIT for more information
-!*/
+ * AdminLTE v2.4.18
+ * Without Third-Party Plugins
+ * 
+ *   Author:  Colorlib
+ *   Support: <https://github.com/ColorlibHQ/AdminLTE/issues>
+ *   Repository: git://github.com/ColorlibHQ/AdminLTE.git
+ *   License: MIT <http://opensource.org/licenses/MIT>
+ */
+
 //Bootstrap Variables & Mixins
 //The core bootstrap code have not been modified. These files
 //are included only for reference.

front/lib/AdminLTE/build/less/AdminLTE.less

@@ -1,10 +1,12 @@
 /*!
- *   AdminLTE v2.4.5
- *   Author: Almsaeed Studio
- *	 Website: Almsaeed Studio <https://adminlte.io>
- *   License: Open source - MIT
- *           Please visit http://opensource.org/licenses/MIT for more information
+ * AdminLTE v2.4.18
+ * 
+ *   Author:  Colorlib
+ *   Support: <https://github.com/ColorlibHQ/AdminLTE/issues>
+ *   Repository: git://github.com/ColorlibHQ/AdminLTE.git
+ *   License: MIT <http://opensource.org/licenses/MIT>
  */
+
 // Bootstrap
 //--------------------------------------------------------
 @import (reference) "../bootstrap-less/mixins";

front/lib/AdminLTE/build/less/boxes.less

@@ -203,9 +203,9 @@
     margin-right: 5px;
   }
   > .box-tools {
-    position: absolute;
-    right: 10px;
-    top: 5px;
+    float: right;
+    margin-top: -5px;
+    margin-bottom: -5px;
     [data-toggle="tooltip"] {
       position: relative;
     }

front/lib/AdminLTE/build/less/control-sidebar.less

@@ -41,6 +41,14 @@
 }
 
 // Open without slide over content
+.control-sidebar-hold-transition {
+  .control-sidebar-bg,
+  .control-sidebar,
+  .content-wrapper {
+    transition: none;
+  }
+
+}
 .control-sidebar-open {
   .control-sidebar-bg,
   .control-sidebar {

front/lib/AdminLTE/build/less/core.less

@@ -70,11 +70,17 @@ body {
 }
 
 .content-wrapper  {
-  min-height: 100%;
+  min-height: ~"calc(100vh - 101px)";
   background-color: @content-bg;
   z-index: 800;
 }
 
+@media (max-width: @screen-header-collapse) {
+  .content-wrapper  {
+    min-height: ~"calc(100vh - 151px)";
+  }
+}
+
 .main-footer {
   background: #fff;
   padding: 15px;

front/lib/AdminLTE/build/less/header.less

@@ -81,6 +81,14 @@
     &:active {
       background: transparent;
     }
+
+    &.fa5 {
+      font-family: "Font Awesome\ 5 Free";
+      &:before {
+        content: "\f0c9";
+        font-weight: 900;
+      }
+    }
   }
   .sidebar-toggle .icon-bar {
     display: none;
@@ -119,14 +127,47 @@
     padding: 0 15px;
     font-weight: 300;
     overflow: hidden;
+
+    img {
+      padding: 4px;
+      object-fit: contain;
+      margin: 0 auto;
+    }
+
     //Add support to sidebar mini by allowing the user to create
     //2 logo designs. mini and lg
     .logo-lg {
       //should be visibile when sidebar isn't collapsed
       display: block;
+
+      img {
+        max-width: 200px;
+        max-height: 50px;
+      }
+      .brandlogo-image {
+        margin-top: 8px;
+        margin-right: 10px;
+        margin-left: -5px;
+      }
     }
     .logo-mini {
       display: none;
+
+      img {
+        max-width: 50px;
+        max-height: 50px;
+      }
+      .brandlogo-image {
+        margin-top: 8px;
+        margin-right: 10px;
+        margin-left: 10px;
+      }
+    }
+
+    .brandlogo-image {
+      float: left;
+      height: 34px;
+      width: auto;
     }
   }
   //Navbar Brand. Alternative logo with layout-top-nav

front/lib/AdminLTE/build/less/login_and_register.less

@@ -16,6 +16,7 @@
 
 .login-page,
 .register-page {
+  height: auto;
   background: @gray-lte;
 }
 

front/lib/AdminLTE/build/less/miscellaneous.less

@@ -604,3 +604,34 @@
     width: 100% !important;
   }
 }
+
+// Horizontal rules
+hr {
+  border-top: 1px solid @hr-border;
+}
+
+// bootstrap slider
+
+#red .slider-selection {
+    background: #f56954;
+}
+
+#blue .slider-selection {
+    background: #3c8dbc;
+}
+
+#green .slider-selection {
+    background: #00a65a;
+}
+
+#yellow .slider-selection {
+    background: #f39c12;
+}
+
+#aqua .slider-selection {
+    background: #00c0ef;
+}
+
+#purple .slider-selection {
+    background: #932ab6;
+}

front/lib/AdminLTE/build/less/sidebar-mini.less

@@ -57,6 +57,7 @@
       .sidebar-menu > li > a > span,
       .sidebar-menu > li > .treeview-menu,
       .sidebar-menu > li > a > .pull-right,
+      .sidebar-menu > li > a > span > .pull-right,
       .sidebar-menu li.header {
         display: none !important;
         -webkit-transform: translateZ(0);
@@ -86,42 +87,44 @@
   }
 }
 
-// Show menu items on hover
-.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse {
-  .sidebar-menu > li:hover {
-    > a {
-      //overflow: visible;
-    }
-    > a > span:not(.pull-right), //:not(.pull-right-container),
-    > .treeview-menu {
-      display: block !important;
-      position: absolute;
-      width: @sidebar-width - 50;
-      left: 50px;
-    }
-
-    //position the header & treeview menus
-    > a > span {
-      top: 0;
-      margin-left: -3px;
-      padding: 12px 5px 12px 20px;
-      background-color: inherit;
-    }
-    > a > .pull-right-container {
-      //display: block!important;
-      position: relative !important;
-      float: right;
-      width: auto !important;
-      left: 200px - 20px !important;
-      top: -22px !important;
-      z-index: 900;
-      > .label:not(:first-of-type) {
-        display: none;
+@media (min-width: @screen-sm) {
+  // Show menu items on hover
+  .sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse {
+    .sidebar-menu > li:hover {
+      > a {
+        //overflow: visible;
+      }
+      > a > span:not(.pull-right), //:not(.pull-right-container),
+      > .treeview-menu {
+        display: block !important;
+        position: absolute;
+        width: @sidebar-width - 50;
+        left: 50px;
+      }
+
+      //position the header & treeview menus
+      > a > span {
+        top: 0;
+        margin-left: -3px;
+        padding: 12px 5px 12px 20px;
+        background-color: inherit;
+      }
+      > a > .pull-right-container {
+        //display: block!important;
+        position: relative !important;
+        float: right;
+        width: auto !important;
+        left: 200px - 20px !important;
+        top: -22px !important;
+        z-index: 900;
+        > .label:not(:first-of-type) {
+          display: none;
+        }
+      }
+      > .treeview-menu {
+        top: 44px;
+        margin-left: 0;
       }
-    }
-    > .treeview-menu {
-      top: 44px;
-      margin-left: 0;
     }
   }
 }

front/lib/AdminLTE/build/less/skins/skin-black-light.less

@@ -11,8 +11,8 @@
 .skin-black-light {
   //Navbar & Logo
   .main-header {
-    //.box-shadow(0px 1px 1px rgba(0, 0, 0, 0.05));
-    border-bottom: 1px solid @gray-lte;
+    .box-shadow(0px 1px 1px rgba(0, 0, 0, 0.05));
+    // border-bottom: 1px solid @gray-lte;
     .navbar-toggle {
       color: #333;
     }
@@ -41,7 +41,7 @@
         }
       }
     }
-    > .logo {
+    .logo {
       .logo-variant(#fff; #333);
       border-right: 1px solid @gray-lte;
       @media (max-width: @screen-header-collapse) {
@@ -62,4 +62,4 @@
   }
   //Create the sidebar skin
   .skin-light-sidebar(#fff);
-}
+}

front/lib/AdminLTE/build/less/skins/skin-black.less

@@ -40,7 +40,7 @@
         }
       }
     }
-    > .logo {
+    .logo {
       .logo-variant(#fff; #333);
       border-right: 1px solid #eee;
       @media (max-width: @screen-header-collapse) {

front/lib/AdminLTE/build/less/treeview.less

@@ -1,4 +1,4 @@
-// Tree view menu
+	// Tree view menu
 .treeview-menu {
 	display: none;
 	list-style: none;
@@ -27,4 +27,19 @@
 	    }
 	  }
 	}
+}
+
+.treeview {
+	> ul.treeview-menu {
+		overflow: hidden;
+		height:auto;
+		padding-top:0px !important;
+		padding-bottom: 0px !important;
+	}
+}
+.treeview.menu-open {
+	> ul.treeview-menu {
+		 overflow: visible;
+  		height:auto;
+	}
 }

front/lib/AdminLTE/build/less/variables.less

@@ -102,6 +102,11 @@
 // Border radius for non flat buttons
 @btn-border-radius: 3px;
 
+// HR
+// --------------------------------------------------------
+// Horizontal line color.
+@hr-border: @gray;
+
 // DIRECT CHAT
 // --------------------------------------------------------
 @direct-chat-height: 250px;

front/lib/AdminLTE/build/scss/_variables.scss

@@ -1,128 +0,0 @@
-// AdminLTE 3 Variables.less
-// =========================
-
-// PATHS
-// --------------------------------------------------------
-$path-to-bootstrap-sass: "../../bower_components/bootstrap/scss" !default;
-
-// COLORS
-// --------------------------------------------------------
-/*
-$blue: #0073b7 !default;
-$black: #111 !default;
-$orange: #FF851B !default;
-*/
-$fuchsia: #F012BE !default;
-$purple: #605ca8 !default;
-$maroon: #D81B60 !default;
-$teal: #39CCCC !default;
-$olive: #3D9970 !default;
-$lime: #01FF70 !default;
-$navy: #001F3F !default;
-$gray-x-light: #d2d6de !default;
-
-// TEXT
-// --------------------------------------------------------
-$font-size-root: 16px !default;
-
-// LAYOUT
-// --------------------------------------------------------
-
-// Side bar and logo width
-$sidebar-width: 230px !default;
-// Boxed layout maximum width
-$boxed-layout-max-width: 1250px !default;
-// When to show the smaller logo
-$screen-header-collapse: map-get($grid-breakpoints, md) !default;
-
-// Link colors (aka: <a> tags)
-$link-color: $brand-primary !default;
-$link-hover-color: lighten($link-color, 15%) !default;
-
-// Body background (Affects main content background only)
-$main-bg: $gray-lighter !default;
-
-// MAIN HEADER
-// --------------------------------------------------------
-$main-header-link-padding-y:  15px !default;
-$main-header-link-padding-x:  15px !default;
-$main-header-brand-padding-y: 12px !default;
-$main-header-brand-padding-x: $main-header-brand-padding-y !default;
-$main-header-height:          (($font-size-root * $line-height-base) + ($main-header-link-padding-y * 2)) !default;
-
-// MAIN FOOTER
-// --------------------------------------------------------
-$main-footer-padding:          15px !default;
-$main-footer-border-top-width: 2px !default;
-$main-footer-border-top:       $main-footer-border-top-width solid darken($main-bg, 10%) !default;
-$main-footer-height:           (($font-size-root * $line-height-base) + ($main-footer-padding * 2)) + $main-footer-border-top-width !default;
-
-// SIDEBAR SKINS
-// --------------------------------------------------------
-
-// Dark sidebar
-$sidebar-dark-bg: #2c333c !default;//#222d32 !default;
-$sidebar-dark-hover-bg: darken($sidebar-dark-bg, 4%) !default;
-$sidebar-dark-color: #C2C7D0!default;//lighten($sidebar-dark-bg, 60%) !default;
-$sidebar-dark-hover-color: #fff !default;
-$sidebar-dark-submenu-bg: lighten($sidebar-dark-bg, 5%) !default;
-$sidebar-dark-submenu-color: #C2C7D0!default;//lighten($sidebar-dark-submenu-bg, 40%) !default;
-$sidebar-dark-submenu-hover-color: #fff !default;
-
-// Light sidebar
-$sidebar-light-bg: #f9fafc !default;
-$sidebar-light-hover-bg: lighten(#f0f0f1, 1.5%) !default;
-$sidebar-light-color: #444 !default;
-$sidebar-light-hover-color: #000 !default;
-$sidebar-light-submenu-bg: $sidebar-light-hover-bg !default;
-$sidebar-light-submenu-color: #777 !default;
-$sidebar-light-submenu-hover-color: #000 !default;
-
-// SIDEBAR MINI
-// --------------------------------------------------------
-$sidebar-mini-width: 55px !default;
-
-// CONTROL SIDEBAR
-// --------------------------------------------------------
-$control-sidebar-width: $sidebar-width !default;
-
-// BOXES
-// --------------------------------------------------------
-$box-border-color: #f4f4f4 !default;
-$box-border-radius: 3px !default;
-$box-footer-bg: #fff !default;
-$box-boxshadow: 0 1px 1px rgba(0, 0, 0, 0.125) !default;
-$box-padding: 10px !default;
-
-// Box variants
-$box-default-border-top-color: $gray-x-light !default;// #d2d6de !default;
-
-// BUTTONS
-// --------------------------------------------------------
-$btn-boxshadow: none !default;
-
-// PROGRESS BARS
-// --------------------------------------------------------
-$progress-bar-border-radius: 1px !default;
-$progress-bar-sm-border-radius: 1px !default;
-$progress-bar-xs-border-radius: 1px !default;
-
-
-
-// DIRECT CHAT
-// --------------------------------------------------------
-$direct-chat-height: 250px !default;
-$direct-chat-default-msg-bg: $gray-x-light !default;
-$direct-chat-default-font-color: #444 !default;
-$direct-chat-default-msg-border-color: $gray-x-light !default;
-
-// CHAT WIDGET
-// --------------------------------------------------------
-$attachment-border-radius: 3px !default;
-
-// TRANSITIONS SETTINGS
-// --------------------------------------------------------
-
-// Transition global options
-$transition-speed: 0.3s !default;
-$transition-fn: ease-in-out !default;