Merge pull request #1272 from pi-hole/tweak/updateAdminLTE

Update adminLTE to 2.4.18
2024-12-06 19:36:21 +01:00 · 2020-05-12 19:52:38 +02:00
parent e96acc415d bf5e60bae3
commit 7eba926643
6 changed files with 51 additions and 41 deletions
@@ -10,6 +10,25 @@
 var timeLineChart, clientsChart;
 var queryTypePieChart, forwardDestinationPieChart;

+var colors = [
+  "#3c8dbc",
+  "#f56954",
+  "#00a65a",
+  "#00c0ef",
+  "#f39c12",
+  "#0073b7",
+  "#001f3f",
+  "#39cccc",
+  "#3d9970",
+  "#01ff70",
+  "#ff851b",
+  "#f012be",
+  "#8e24aa",
+  "#d81b60",
+  "#222222",
+  "#d2d6de"
+];
+
 function padNumber(num) {
  return ("00" + num).substr(-2, 2);
 }
@@ -279,14 +298,10 @@ function updateQueryTypesPie() {
      return;
    }

-    var colors = [];
-    // Get colors from AdminLTE
-    $.each($.AdminLTE.options.colors, function (key, value) {
-      colors.push(value);
-    });
    var v = [],
      c = [],
      k = [],
+      i = 0,
      iter;
    // Collect values and colors, and labels
    if (Object.prototype.hasOwnProperty.call(data, "querytypes")) {
@@ -297,7 +312,7 @@ function updateQueryTypesPie() {

    $.each(iter, function (key, value) {
      v.push(value);
-      c.push(colors.shift());
+      c.push(colors[i++ % colors.length]);
      k.push(key);
    });
    // Build a single dataset with the data to be pushed
@@ -375,12 +390,6 @@ function updateClientsOverTime() {
      labels.push(clientname);
    }

-    // Get colors from AdminLTE
-    var colors = [];
-    $.each($.AdminLTE.options.colors, function (key, value) {
-      colors.push(value);
-    });
-
    // Remove possibly already existing data
    clientsChart.data.labels = [];
    clientsChart.data.datasets[0].data = [];
@@ -453,14 +462,10 @@ function updateForwardDestinationsPie() {
      return;
    }

-    var colors = [];
-    // Get colors from AdminLTE
-    $.each($.AdminLTE.options.colors, function (key, value) {
-      colors.push(value);
-    });
    var v = [],
      c = [],
      k = [],
+      i = 0,
      values = [];

    // Collect values and colors
@@ -469,7 +474,7 @@ function updateForwardDestinationsPie() {
        key = key.substr(0, key.indexOf("|"));
      }

-      values.push([key, value, colors.shift()]);
+      values.push([key, value, colors[i++ % colors.length]]);
    });

    // Split data into individual arrays for the graphs
@@ -211,7 +211,7 @@
    <script src="scripts/vendor/jquery.min.js"></script>
    <script src="scripts/vendor/jquery-ui.min.js"></script>
    <script src="style/vendor/bootstrap/js/bootstrap.min.js"></script>
-    <script src="scripts/vendor/app.min.js"></script>
+    <script src="scripts/vendor/adminlte.min.js"></script>
    <script src="scripts/vendor/bootstrap-notify.min.js"></script>

 <?php if(in_array($scriptname, array("groups.php", "groups-clients.php", "groups-domains.php", "groups-adlists.php"))){ ?>
@@ -226,7 +226,7 @@
    <script src="scripts/vendor/dataTables.bootstrap.min.js"></script>
    <script src="scripts/vendor/Chart.bundle.min.js"></script>
 </head>
-<body class="skin-blue sidebar-mini <?php if($boxedlayout){ ?>layout-boxed<?php } ?>">
+<body class="hold-transition skin-blue sidebar-mini <?php if($boxedlayout){ ?>layout-boxed<?php } ?>">
 <noscript>
 <!-- JS Warning -->
 <div>
@@ -258,7 +258,7 @@ if($auth) {
        <!-- Header Navbar: style can be found in header.less -->
        <nav class="navbar navbar-static-top">
            <!-- Sidebar toggle button-->
-            <a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button">
+            <a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button">
                <span class="sr-only">Toggle navigation</span>
            </a>
            <div class="navbar-custom-menu">
@@ -425,7 +425,7 @@ if($auth) {
                $scriptname = "login";
            }
            ?>
-            <ul class="sidebar-menu">
+            <ul class="sidebar-menu" data-widget="tree">
                <li class="header">MAIN NAVIGATION</li>
                <!-- Home Page -->
                <li<?php if($scriptname === "index.php"){ ?> class="active"<?php } ?>>
@@ -5,6 +5,10 @@
 *  This file is copyright under the latest version of the EUPL.
 *  Please see LICENSE file for your rights under this license. */

+.layout-boxed {
+    background: url('../img/boxed-bg.jpg') repeat fixed;
+}
+
 .small-box {
 	cursor: default;
 	-webkit-user-select: none; /* Chrome/Safari */