Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-24 04:38:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always show date (but only once if the interval is on the same date), break long lines on small displays, and abbreviate gray color definition.

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2020-01-02 13:24:45 +00:00
committed by XhmikosR
parent ac1e68acde
commit f2713a9b3d
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
scripts/pi-hole/js/db_graph.js
View File

@@ -190,7 +190,7 @@ function updateQueriesOverTime() {
$(document).ready(function() {
var ctx = document.getElementById("queryOverTimeChart").getContext("2d");
var blockedColor = "#999999";
var blockedColor = "#999";
var permittedColor = "#00a65a";
timeLineChart = new Chart(ctx, {
type: "bar",
@@ -258,12 +258,26 @@ $(document).ready(function() {
":" +
padNumber(time.getSeconds());
if (from_date === until_date) {
return "Queries from " + from_time + " to " + until_time;
} else {
return (
"Queries from " + from_date + " " + from_time + " to " + until_date + " " + until_time
);
// Abbreviated form for intervals on the same day
return "Queries from " + from_time + " to " + until_time + " on " + from_date;
}
// Full tooltip for intervals spanning more than one date.
// We split title in two lines on small screens
if ($(window).width() < 992) {
from_date += "\n";
}
return (
"Queries from " +
from_date +
" " +
from_time +
" to " +
until_date +
" " +
until_time
).split("\n ");
},
label: function(tooltipItems, data) {
if (tooltipItems.datasetIndex === 0) {