diff --git a/img/boxed-bg-dark.jpg b/img/boxed-bg-dark.jpg new file mode 100644 index 00000000..30b3d9e1 Binary files /dev/null and b/img/boxed-bg-dark.jpg differ diff --git a/index.php b/index.php index 78c1a464..cb57225e 100644 --- a/index.php +++ b/index.php @@ -82,6 +82,10 @@
+ + + +

Total queries over last hours

diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js index 8eb6dc85..a9748161 100644 --- a/scripts/pi-hole/js/index.js +++ b/scripts/pi-hole/js/index.js @@ -689,7 +689,7 @@ function updateTopLists() { percentage.toFixed(1) + "% of " + data.dns_queries_today + - '">
' ); @@ -722,7 +722,7 @@ function updateTopLists() { percentage.toFixed(1) + "% of " + data.ads_blocked_today + - '">
' ); @@ -824,8 +824,10 @@ $(document).ready(function () { // Pull in data via AJAX updateSummaryData(); - var blockedColor = "#999"; - var permittedColor = "#00a65a"; + var blockedColor = $(".queries-blocked").css("background-color"); + var permittedColor = $(".queries-permitted").css("background-color"); + var gridColor = $(".graphs-grid").css("background-color"); + var ticksColor = $(".graphs-ticks").css("color"); var ctx = document.getElementById("queryOverTimeChart").getContext("2d"); timeLineChart = new Chart(ctx, { @@ -912,6 +914,12 @@ $(document).ready(function () { hour: "HH:mm" }, tooltipFormat: "HH:mm" + }, + gridLines: { + color: gridColor + }, + ticks: { + fontColor: ticksColor } } ], @@ -920,6 +928,12 @@ $(document).ready(function () { stacked: true, ticks: { beginAtZero: true + }, + gridLines: { + color: gridColor + }, + ticks: { + fontColor: ticksColor } } ] @@ -980,6 +994,12 @@ $(document).ready(function () { hour: "HH:mm" }, tooltipFormat: "HH:mm" + }, + gridLines: { + color: gridColor + }, + ticks: { + fontColor: ticksColor } } ], @@ -988,7 +1008,13 @@ $(document).ready(function () { ticks: { beginAtZero: true }, - stacked: true + stacked: true, + gridLines: { + color: gridColor + }, + ticks: { + fontColor: ticksColor + } } ] }, @@ -1040,6 +1066,11 @@ $(document).ready(function () { datasets: [{ data: [] }] }, options: { + elements: { + arc: { + borderColor: $(".box").css("background-color") + } + }, legend: { display: false }, @@ -1077,6 +1108,11 @@ $(document).ready(function () { datasets: [{ data: [] }] }, options: { + elements: { + arc: { + borderColor: $(".box").css("background-color") + } + }, legend: { display: false }, diff --git a/scripts/pi-hole/php/header.php b/scripts/pi-hole/php/header.php index e54f99d0..0b5fead5 100644 --- a/scripts/pi-hole/php/header.php +++ b/scripts/pi-hole/php/header.php @@ -11,6 +11,9 @@ require_once "scripts/pi-hole/php/FTL.php"; $scriptname = basename($_SERVER['SCRIPT_FILENAME']); + //$theme = "default-light"; + $theme = "default-dark"; + check_cors(); // Generate CSRF token @@ -202,12 +205,11 @@ - - - + + @@ -226,7 +228,7 @@ - +