Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-04-28 04:33:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/devel' into devel-v6

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2023-04-26 09:18:39 +02:00
parent 08e7b0bed7 a44efc0b11
commit fb64759fdf
24 changed files with 1741 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/pi-hole/js/index.js
View File

@@ -223,9 +223,9 @@ function updateQueriesOverTime() {
timeLineChart.data.datasets = [];
var labels = ["Blocked DNS Queries", "Cached DNS Queries", "Forwarded DNS Queries"];
var blockedColor = $(".queries-blocked").css("background-color");
var cachedColor = $(".queries-cached").css("background-color");
var permittedColor = $(".queries-permitted").css("background-color");
var cachedColor = utils.getCSSval("queries-cached", "background-color");
var blockedColor = utils.getCSSval("queries-blocked", "background-color");
var permittedColor = utils.getCSSval("queries-permitted", "background-color");
var colors = [blockedColor, cachedColor, permittedColor];
// Collect values and colors, and labels
@@ -740,8 +740,8 @@ $(function () {
// Pull in data via AJAX
updateSummaryData();
var gridColor = $(".graphs-grid").css("background-color");
var ticksColor = $(".graphs-ticks").css("color");
var gridColor = utils.getCSSval("graphs-grid", "background-color");
var ticksColor = utils.getCSSval("graphs-ticks", "color");
var ctx = document.getElementById("queryOverTimeChart").getContext("2d");
timeLineChart = new Chart(ctx, {
type: utils.getGraphType(),