Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update adminLTE to 2.4.18 #1272

Merged
merged 7 commits into from May 12, 2020
Merged

Update adminLTE to 2.4.18 #1272

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3e94ff0
Update adminLTE to 2.4.
PromoFaux May 12, 2020
d10f190
fix prettier complaints
PromoFaux May 12, 2020
7001a1b
Update index.js
XhmikosR May 12, 2020
2314a60
Get an endless array of colors without altering the colors array itself.
DL6ER May 12, 2020
9bf9e3b
Use AdminLTE 2.4.18 - include CSS, too.
PromoFaux May 12, 2020
3d6a54f
Add `hold-transition` to body tag
PromoFaux May 12, 2020
bf5e60b
Fix bg image
XhmikosR May 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
35 changes: 19 additions & 16 deletions scripts/pi-hole/js/index.js
View file
Open in desktop
Expand Up @@ -10,6 +10,25 @@
var timeLineChart, clientsChart;
var queryTypePieChart, forwardDestinationPieChart;

var colors = [
"#3c8dbc",
"#f56954",
"#00a65a",
"#00c0ef",
"#f39c12",
"#0073b7",
"#001F3F",
"#39CCCC",
XhmikosR marked this conversation as resolved.
Show resolved Hide resolved
"#3D9970",
"#01FF70",
"#FF851B",
"#F012BE",
"#8E24AA",
"#D81B60",
"#222222",
"#d2d6de"
];

function padNumber(num) {
return ("00" + num).substr(-2, 2);
}
Expand Down Expand Up @@ -279,11 +298,6 @@ function updateQueryTypesPie() {
return;
}

var colors = [];
// Get colors from AdminLTE
$.each($.AdminLTE.options.colors, function (key, value) {
colors.push(value);
});
var v = [],
c = [],
k = [],
Expand Down Expand Up @@ -375,12 +389,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 = [];
Expand Down Expand Up @@ -453,11 +461,6 @@ function updateForwardDestinationsPie() {
return;
}

var colors = [];
// Get colors from AdminLTE
$.each($.AdminLTE.options.colors, function (key, value) {
colors.push(value);
});
var v = [],
c = [],
k = [],
Expand Down
6 changes: 3 additions & 3 deletions scripts/pi-hole/php/header.php
View file
Open in desktop
Expand Up @@ -211,7 +211,7 @@ function pidofFTL()
<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"))){ ?>
Expand Down Expand Up @@ -258,7 +258,7 @@ function pidofFTL()
<!-- 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">
Expand Down Expand Up @@ -425,7 +425,7 @@ function pidofFTL()
$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 } ?>>
Expand Down
13 changes: 13 additions & 0 deletions scripts/vendor/adminlte.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.