Skip to content

Commit

Permalink
Clarify that counts for groups and domains only contains enabled items (
Browse files Browse the repository at this point in the history
  • Loading branch information
yubiuser authored Feb 3, 2025
2 parents 2ec7895 + 1964d4b commit edef3a8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions scripts/js/footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -283,19 +283,19 @@ function updateFtlInfo() {
"title",
"Allowed: " +
intl.format(database.domains.allowed) +
" exact domains, " +
" exact domains and " +
intl.format(database.regex.allowed) +
" regex filters"
" regex filters are enabled"
);
$("#num_denied")
.text(intl.format(database.domains.denied + database.regex.denied))
.attr(
"title",
"Denied: " +
intl.format(database.domains.denied) +
" exact domains, " +
" exact domains and " +
intl.format(database.regex.denied) +
" regex filters"
" regex filters are enabled"
);
updateQueryFrequency(intl, ftl.query_frequency);
$("#sysinfo-cpu-ftl").text("(" + ftl["%cpu"].toFixed(1) + "% used by FTL)");
Expand Down
8 changes: 4 additions & 4 deletions scripts/lua/sidebar.lp
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<a href="<?=webhome?>groups">
<i class="fa fa-fw menu-icon fa-user-friends"></i> <span>Groups
<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>
</a>
</li>
Expand All @@ -61,16 +61,16 @@
<a href="<?=webhome?>groups/domains">
<i class="fa fa-fw menu-icon fa-list"></i> <span>Domains
<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-green pull-right" id="num_allowed" title="Number of allow 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 enabled allow rules (domains and regex)"></span>
</span>
</a>
</li>
<li class="menu-group<? if scriptname == 'groups/lists' then ?> active<? end ?>">
<a href="<?=webhome?>groups/lists">
<i class="fa fa-fw menu-icon fa-shield-alt"></i> <span>Lists
<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>
</a>
Expand Down

0 comments on commit edef3a8

Please sign in to comment.