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

Clarify that counts for groups and domains only contains enabled items (#3206)

Browse Source
This commit is contained in:
yubiuser
2025-02-03 20:01:35 +01:00
committed by GitHub
parent 2ec7895bc7 1964d4b0d6
commit edef3a8edb
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/js/footer.js
View File

@@ -283,9 +283,9 @@ function updateFtlInfo() {
"title", "title",
"Allowed: " + "Allowed: " +
intl.format(database.domains.allowed) + intl.format(database.domains.allowed) +
" exact domains, " + " exact domains and " +
intl.format(database.regex.allowed) + intl.format(database.regex.allowed) +
" regex filters" " regex filters are enabled"
); );
$("#num_denied") $("#num_denied")
.text(intl.format(database.domains.denied + database.regex.denied)) .text(intl.format(database.domains.denied + database.regex.denied))
@@ -293,9 +293,9 @@ function updateFtlInfo() {
"title", "title",
"Denied: " + "Denied: " +
intl.format(database.domains.denied) + intl.format(database.domains.denied) +
" exact domains, " + " exact domains and " +
intl.format(database.regex.denied) + intl.format(database.regex.denied) +
" regex filters" " regex filters are enabled"
); );
updateQueryFrequency(intl, ftl.query_frequency); updateQueryFrequency(intl, ftl.query_frequency);
$("#sysinfo-cpu-ftl").text("(" + ftl["%cpu"].toFixed(1) + "% used by FTL)"); $("#sysinfo-cpu-ftl").text("(" + ftl["%cpu"].toFixed(1) + "% used by FTL)");

8
scripts/lua/sidebar.lp
View File

@@ -45,7 +45,7 @@
<a href="<?=webhome?>groups"> <a href="<?=webhome?>groups">
<i class="fa fa-fw menu-icon fa-user-friends"></i> <span>Groups <i class="fa fa-fw menu-icon fa-user-friends"></i> <span>Groups
<span class="pull-right-container"> <span class="pull-right-container">
<span class="label label-primary pull-right" id="num_groups" title="Number of defined groups"></span> <span class="label label-primary pull-right" id="num_groups" title="Number of enabled groups"></span>
</span> </span>
</a> </a>
</li> </li>
@@ -61,8 +61,8 @@
<a href="<?=webhome?>groups/domains"> <a href="<?=webhome?>groups/domains">
<i class="fa fa-fw menu-icon fa-list"></i> <span>Domains <i class="fa fa-fw menu-icon fa-list"></i> <span>Domains
<span class="pull-right-container"> <span class="pull-right-container">
<span class="label bg-red pull-right" id="num_denied" title="Number of deny rules (domains and regex)"></span> <span class="label bg-red pull-right" id="num_denied" title="Number of enabled deny rules (domains and regex)"></span>
<span class="label bg-green pull-right" id="num_allowed" title="Number of allow rules (domains and regex)"></span> <span class="label bg-green pull-right" id="num_allowed" title="Number of enabled allow rules (domains and regex)"></span>
</span> </span>
</a> </a>
</li> </li>
@@ -70,7 +70,7 @@
<a href="<?=webhome?>groups/lists"> <a href="<?=webhome?>groups/lists">
<i class="fa fa-fw menu-icon fa-shield-alt"></i> <span>Lists <i class="fa fa-fw menu-icon fa-shield-alt"></i> <span>Lists
<span class="pull-right-container"> <span class="pull-right-container">
<span class="label bg-blue pull-right" id="num_lists" title="Number of subscribed lists"></span> <span class="label bg-blue pull-right" id="num_lists" title="Number of subscribed and enabled lists"></span>
<span class="label bg-yellow pull-right" id="num_gravity" title="Total number of domains subscribed by your Pi-hole"></span> <span class="label bg-yellow pull-right" id="num_gravity" title="Total number of domains subscribed by your Pi-hole"></span>
</span> </span>
</a> </a>