mirror of
https://github.com/pi-hole/web.git
synced 2025-12-24 12:48:29 +00:00
Merge branch 'development-v6' into fix/overTimeGraphs
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
@@ -411,10 +411,8 @@ function updateSummaryData(runOnce = false) {
|
||||
intl.format(parseInt(data.clients.total, 10)) + " total clients"
|
||||
);
|
||||
glowIfChanged($("span#blocked_queries"), intl.format(parseFloat(data.queries.blocked)));
|
||||
glowIfChanged(
|
||||
$("span#percent_blocked"),
|
||||
parseFloat(data.queries.percent_blocked).toFixed(1) + "%"
|
||||
);
|
||||
var formattedPercentage = utils.toPercent(data.queries.percent_blocked, 1);
|
||||
glowIfChanged($("span#percent_blocked"), formattedPercentage);
|
||||
glowIfChanged(
|
||||
$("span#gravity_size"),
|
||||
intl.format(parseInt(data.gravity.domains_being_blocked, 10))
|
||||
@@ -451,7 +449,12 @@ function labelWithPercentage(tooltipLabel, skipZero = false) {
|
||||
|
||||
if (skipZero && data === 0) return undefined;
|
||||
return (
|
||||
tooltipLabel.dataset.label + ": " + tooltipLabel.parsed.y + " (" + percentage.toFixed(1) + "%)"
|
||||
tooltipLabel.dataset.label +
|
||||
": " +
|
||||
tooltipLabel.parsed.y +
|
||||
" (" +
|
||||
utils.toPercent(percentage, 1) +
|
||||
")"
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user