Update adminLTE to 2.4.

- Change a few references per upgrade guide
 - define colors[] at the top of index.js as AdminLTE.options does not appear to exist. (there may be a better way of doing this)

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
This commit is contained in:
Adam Warner
2020-05-12 12:58:45 +01:00
parent e96acc415d
commit 3e94ff0f43
4 changed files with 33 additions and 32 deletions
+17 -16
View File
@@ -10,6 +10,23 @@
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,11 +296,6 @@ function updateQueryTypesPie() {
return;
}
var colors = [];
// Get colors from AdminLTE
$.each($.AdminLTE.options.colors, function (key, value) {
colors.push(value);
});
var v = [],
c = [],
k = [],
@@ -375,12 +387,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,11 +459,6 @@ function updateForwardDestinationsPie() {
return;
}
var colors = [];
// Get colors from AdminLTE
$.each($.AdminLTE.options.colors, function (key, value) {
colors.push(value);
});
var v = [],
c = [],
k = [],
+3 -3
View File
@@ -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"))){ ?>
@@ -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 } ?>>
+13
View File
File diff suppressed because one or more lines are too long
-13
View File
File diff suppressed because one or more lines are too long