closes gurayyarar#9, gurayyarar#19, gurayyarar#24, gurayyarar#31

Hitamashi · Mar 11, 2017 · 6e9cd58 · 6e9cd58
1 parent d085143
commit 6e9cd58
Show file tree

Hide file tree

Showing 12 changed files with 114 additions and 68 deletions.
diff --git a/css/style.css b/css/style.css
@@ -2337,7 +2337,14 @@
   .navbar .dropdown-menu {
     margin-left: -50px; }
   .navbar .js-right-sidebar {
-    margin-top: 15px; } }
+    margin-top: 15px; }
+  .dt-buttons {
+    float: none !important;
+    text-align: center;
+    margin-bottom: 15px; }
+  .panel-switch-btn {
+    top: 12px;
+    right: 0 !important; } }
 
 @media (min-width: 768px) and (max-width: 991px) {
   .navbar > .container .navbar-brand,
@@ -2968,6 +2975,8 @@ section.content {
         .card .header h2 small a {
           font-weight: bold;
           color: #777; }
+    .card .header .col-xs-12 h2 {
+      margin-top: 5px; }
   .card .body {
     font-size: 14px;
     color: #555;
@@ -7842,7 +7851,6 @@ fieldset[disabled] .form-control {
 
 .panel-switch-btn {
   position: relative;
-  top: -20px;
   right: 20px;
   z-index: 9; }
   .panel-switch-btn label {
@@ -7935,9 +7943,7 @@ fieldset[disabled] .form-control {
     .dataTables_wrapper input[type="search"]:focus, .dataTables_wrapper input[type="search"]:active {
       border-bottom: 2px solid #1f91f3; }
   .dataTables_wrapper .dt-buttons {
-    position: absolute;
-    top: 0;
-    left: 0; }
+    float: left; }
     .dataTables_wrapper .dt-buttons a.dt-button {
       background-color: #607D8B;
       color: #fff;
@@ -7955,6 +7961,27 @@ fieldset[disabled] .form-control {
       .dataTables_wrapper .dt-buttons a.dt-button:active {
         opacity: 0.8; }
 
+.dt-button-info {
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  min-width: 400px;
+  text-align: center;
+  background-color: #fff;
+  border: 2px solid #999;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  -ms-border-radius: 3px;
+  border-radius: 3px;
+  margin-top: -100px;
+  margin-left: -200px;
+  z-index: 21; }
+  .dt-button-info h2 {
+    color: #777; }
+  .dt-button-info div {
+    color: #777;
+    margin-bottom: 20px; }
+
 /* Light Gallery ================================ */
 .lg-outer .lg-thumb-item,
 .lg-outer .lg-toogle-thumb {

diff --git a/css/style.min.css b/css/style.min.css
diff --git a/index.html b/index.html
@@ -851,11 +851,15 @@ <h2>DASHBOARD</h2>
                 <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
                     <div class="card">
                         <div class="header">
-                            <h2>CPU USAGE (%)</h2>
-                            <div class="pull-right">
-                                <div class="switch panel-switch-btn">
-                                    <span class="m-r-10 font-12">REAL TIME</span>
-                                    <label>OFF<input type="checkbox" id="realtime" checked><span class="lever switch-col-cyan"></span>ON</label>
+                            <div class="row clearfix">
+                                <div class="col-xs-12 col-sm-6">
+                                    <h2>CPU USAGE (%)</h2>
+                                </div>
+                                <div class="col-xs-12 col-sm-6 align-right">
+                                    <div class="switch panel-switch-btn">
+                                        <span class="m-r-10 font-12">REAL TIME</span>
+                                        <label>OFF<input type="checkbox" id="realtime" checked><span class="lever switch-col-cyan"></span>ON</label>
+                                    </div>
                                 </div>
                             </div>
                             <ul class="header-dropdown m-r--5">

diff --git a/js/admin.js b/js/admin.js
@@ -32,7 +32,8 @@ $.AdminBSB.options = {
         scrollWidth: '4px',
         scrollAlwaysVisible: false,
         scrollBorderRadius: '0',
-        scrollRailBorderRadius: '0'
+        scrollRailBorderRadius: '0',
+        scrollActiveItemWhenPageLoad: true
     },
     dropdownMenu: {
         effectIn: 'fadeIn',
@@ -105,15 +106,12 @@ $.AdminBSB.leftSideBar = {
         Waves.attach('.menu .list a', ['waves-block']);
         Waves.init();
     },
-    setMenuHeight: function () {
+    setMenuHeight: function (isFirstTime) {
         if (typeof $.fn.slimScroll != 'undefined') {
             var configs = $.AdminBSB.options.leftSideBar;
             var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight()));
             var $el = $('.list');
 
-            $el.slimScroll({ destroy: true }).height("auto");
-            $el.parent().find('.slimScrollBar, .slimScrollRail').remove();
-
             $el.slimscroll({
                 height: height + "px",
                 color: configs.scrollColor,
@@ -122,6 +120,12 @@ $.AdminBSB.leftSideBar = {
                 borderRadius: configs.scrollBorderRadius,
                 railBorderRadius: configs.scrollRailBorderRadius
             });
+
+            //Scroll active menu item when page load, if option set = true
+            if ($.AdminBSB.options.leftSideBar.scrollActiveItemWhenPageLoad) {
+                var activeItemOffsetTop = $('.menu .list li.active')[0].offsetTop
+                if (activeItemOffsetTop > 150) $el.slimscroll({ scrollTo: activeItemOffsetTop + 'px' });
+            }
         }
     },
     checkStatuForResize: function (firstTime) {

diff --git a/js/pages/tables/jquery-datatable.js b/js/pages/tables/jquery-datatable.js
@@ -1,9 +1,12 @@
 $(function () {
-    $('.js-basic-example').DataTable();
+    $('.js-basic-example').DataTable({
+        responsive: true
+    });
 
     //Exportable table
     $('.js-exportable').DataTable({
         dom: 'Bfrtip',
+        responsive: true,
         buttons: [
             'copy', 'csv', 'excel', 'pdf', 'print'
         ]

diff --git a/plugins/jquery-slimscroll/jquery.slimscroll.js b/plugins/jquery-slimscroll/jquery.slimscroll.js
@@ -2,12 +2,12 @@
  * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
  * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
  *
- * Version: 1.3.6
+ * Version: 1.3.0
  *
  */
 (function ($) {
 
-    $.fn.extend({
+    jQuery.fn.extend({
         slimScroll: function (options) {
 
             var defaults = {
@@ -73,10 +73,10 @@
                 touchScrollStep: 200,
 
                 // sets border radius
-                borderRadius: '0',
+                borderRadius: '7px',
 
                 // sets border radius of the rail
-                railBorderRadius: '0'
+                railBorderRadius: '7px'
             };
 
             var o = $.extend(defaults, options);
@@ -99,8 +99,8 @@
                     var offset = me.scrollTop();
 
                     // find bar and rail
-                    bar = me.closest('.' + o.barClass);
-                    rail = me.closest('.' + o.railClass);
+                    bar = me.parent().find('.' + o.barClass);
+                    rail = me.parent().find('.' + o.railClass);
 
                     getBarHeight();
 
@@ -137,11 +137,6 @@
 
                     return;
                 }
-                else if ($.isPlainObject(options)) {
-                    if ('destroy' in options) {
-                        return;
-                    }
-                }
 
                 // optionally set height to the parent's height
                 o.height = (o.height == 'auto') ? me.parent().height() : o.height;
@@ -297,7 +292,7 @@
                 }
 
                 // attach scroll events
-                attachWheel(this);
+                attachWheel();
 
                 function _onWheel(e) {
                     // use mouse wheel only when mouse is over
@@ -310,8 +305,11 @@
                     if (e.detail) { delta = e.detail / 3; }
 
                     var target = e.target || e.srcTarget || e.srcElement;
+                    /* console.log($(target).closest('.' + o.wrapperClass).attr("class"));
+                     console.log(me.parent().attr("class"));*/
                     if ($(target).closest('.' + o.wrapperClass).is(me.parent())) {
                         // scroll content
+
                         scrollContent(delta, true);
                     }
 
@@ -321,6 +319,7 @@
                 }
 
                 function scrollContent(y, isWheel, isJump) {
+
                     releaseScroll = false;
                     var delta = y;
                     var maxTop = me.outerHeight() - bar.outerHeight();
@@ -366,10 +365,11 @@
                     hideBar();
                 }
 
-                function attachWheel(target) {
+                function attachWheel() {
                     if (window.addEventListener) {
-                        target.addEventListener('DOMMouseScroll', _onWheel, false);
-                        target.addEventListener('mousewheel', _onWheel, false);
+                        this.addEventListener('DOMMouseScroll', _onWheel, false);
+                        this.addEventListener('mousewheel', _onWheel, false);
+                        //this.addEventListener('MozMousePixelScroll', _onWheel, false );
                     }
                     else {
                         document.attachEvent("onmousewheel", _onWheel)
@@ -436,8 +436,8 @@
         }
     });
 
-    $.fn.extend({
-        slimscroll: $.fn.slimScroll
+    jQuery.fn.extend({
+        slimscroll: jQuery.fn.slimScroll
     });
 
-})(jQuery);
+})(jQuery);
diff --git a/plugins/jquery-slimscroll/jquery.slimscroll.min.js b/plugins/jquery-slimscroll/jquery.slimscroll.min.js
diff --git a/plugins/jquery-slimscroll/package.js b/plugins/jquery-slimscroll/package.js
diff --git a/scss/_card.scss b/scss/_card.scss
@@ -114,6 +114,12 @@
                 }
             }
         }
+
+        .col-xs-12 {
+            h2 {
+                margin-top: 5px;
+            }
+        }
     }
 
     .body {

diff --git a/scss/_charts.scss b/scss/_charts.scss
@@ -13,7 +13,6 @@
 
 .panel-switch-btn {
     position: relative;
-    top: -20px;
     right: 20px;
     z-index: 9;
 

diff --git a/scss/_jquerydatatable.scss b/scss/_jquerydatatable.scss
@@ -27,9 +27,7 @@
     }
 
     .dt-buttons {
-        position: absolute;
-        top: 0;
-        left: 0;
+        float: left;
 
         a.dt-button {
             background-color: #607D8B;
@@ -49,3 +47,26 @@
         }
     }
 }
+
+.dt-button-info {
+    position: fixed;
+    top: 50%;
+    left: 50%;
+    min-width: 400px;
+    text-align: center;
+    background-color: #fff;
+    border: 2px solid #999;
+    @include border-radius(3px);
+    margin-top: -100px;
+    margin-left: -200px;
+    z-index: 21;
+
+    h2 {
+        color: #777;
+    }
+
+    div {
+        color: #777;
+        margin-bottom: 20px;
+    }
+}
diff --git a/scss/_media.scss b/scss/_media.scss
@@ -41,6 +41,17 @@
             margin-top: 15px;
         }
     }
+
+    .dt-buttons {
+        float: none !important;
+        text-align: center;
+        margin-bottom: 15px;
+    }
+
+    .panel-switch-btn {
+        top: 12px;
+        right: 0 !important;
+    }
 }
 
 @media (min-width: 768px) and (max-width: 991px) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -114,6 +114,12 @@ @@
                     }
                 }
             }
+            .col-xs-12 {
+                h2 {
+                    margin-top: 5px;
+                }
+            }
         }
         .body {
@@ Expand Down @@