Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-02-15 07:25:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development-v6' into tweak/multi_revServers

Browse Source 
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
This commit is contained in:
RD WebDesign
2024-04-02 16:33:23 -03:00
committed by GitHub
parent d988fdcb99 92cf92b40b
commit 48011ad79e
8 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/pi-hole/js/footer.js
View File

@@ -701,7 +701,12 @@ function applyExpertSettings() {
// If we left with an empty page (no visible boxes) after switching from
// Expert to Basic settings, redirect to admin/settings/system instead
if ($(".box:visible").length === 0) {
// - class settings-selector is present (this class is present in every
// settings pages, but not in other pages - it is there on the "all"
// settings page as well, even when the button has "only modified"
// functionality there), and
// - there are no visible boxes (the page is empty)
if ($(".settings-selector").length > 0 && $(".box:visible").length === 0) {
window.location.href = "/admin/settings/system";
}
}

2
scripts/pi-hole/js/settings-advanced.js
View File

@@ -209,7 +209,7 @@ function generateRow(topic, key, value) {
box +=
'<label class="col-sm-5 control-label">Values (one item per line)</label>' +
'<div class="col-sm-7">' +
'<textarea class="form-control" data-key="' +
'<textarea class="form-control field-sizing-content" data-key="' +
key +
'"' +
extraAttributes +

1
scripts/pi-hole/js/taillog.js
View File

@@ -53,6 +53,7 @@ function formatFTL(line, prio) {
}
case "ERR":
case "ERROR":
case "EMERG":
case "ALERT":
case "CRIT": {

2
scripts/pi-hole/lua/sidebar.lp
View File

@@ -163,7 +163,7 @@
<i class="fa-fw menu-icon fa-solid fa-file-export"></i> <span>Teleporter</span>
</a>
</li>
<li class="<? if scriptname == 'settings/dnsrecords' then ?> active<? end ?> settings-level-expert">
<li class="<? if scriptname == 'settings/dnsrecords' then ?> active<? end ?>">
<a href="<?=webhome?>settings/dnsrecords">
<i class="fa-fw menu-icon fa-solid fa-address-book"></i> <span>Local DNS Records</span>
</a>

4
settings-api.lp
View File

@@ -25,12 +25,12 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
<div class="row">
<div class="col-md-6">
<p><strong>Domains to be excluded from Top Domain Lists and Query Log</strong></p>
<textarea class="form-control" rows="4" id="webserver.api.excludeDomains" data-key="webserver.api.excludeDomains" placeholder="Enter regex domains, one per line" style="resize: vertical;"></textarea>
<textarea class="form-control field-sizing-content" rows="4" id="webserver.api.excludeDomains" data-key="webserver.api.excludeDomains" placeholder="Enter regex domains, one per line" style="resize: vertical;"></textarea>
<p class="help-block">Domains may be described by their domain name (like <code>^example\.com$</code>)</p>
</div>
<div class="col-md-6">
<p><strong>Clients to be excluded from Top Client Lists and Query Log </strong></p>
<textarea class="form-control" rows="4" id="webserver.api.excludeClients" data-key="webserver.api.excludeClients" placeholder="Enter regex clients, one per line" style="resize: vertical;"></textarea>
<textarea class="form-control field-sizing-content" rows="4" id="webserver.api.excludeClients" data-key="webserver.api.excludeClients" placeholder="Enter regex clients, one per line" style="resize: vertical;"></textarea>
<p class="help-block">Clients may be described either by their IP addresses (IPv4 and IPv6 are supported), or hostnames (like <code>^laptop\.lan$</code>).</p>
</div>
</div>

2
settings-dhcp.lp
View File

@@ -156,7 +156,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
<div class="row">
<div class="col-xs-12 col-md-6">
<p>Specify per host parameters for the DHCP server. This allows a machine with a particular hardware address to be always allocated the same hostname, IP address and lease time. A hostname specified like this overrides any supplied by the DHCP client on the machine. It is also allowable to omit the hardware address and include the hostname, in which case the IP address and lease times will apply to any machine claiming that name.</p>
<textarea class="form-control" id="dhcp-hosts" data-key="dhcp.hosts" style="resize: vertical;"></textarea><br>&nbsp;
<textarea class="form-control field-sizing-content" id="dhcp-hosts" data-key="dhcp.hosts" style="resize: vertical;"></textarea><br>&nbsp;
<p>Each entry should be on a separate line, and should be of the form:</p>
<pre>[&lt;hwaddr&gt;][,id:&lt;client_id&gt;|*][,set:&lt;tag&gt;][,tag:&lt;tag&gt;][,&lt;ipaddr&gt;][,&lt;hostname&gt;][,&lt;lease_time&gt;][,ignore]</pre>
<p>Only one entry per MAC address is allowed.</p>

4
settings-dnsrecords.lp
View File

@@ -14,7 +14,7 @@ PageTitle = "Local DNS Settings"
mg.include('scripts/pi-hole/lua/settings_header.lp','r')
?>
<div class="row">
<div class="col-md-12 col-lg-6 settings-level-expert">
<div class="col-md-12 col-lg-6">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title" id="title-hosts" data-configkeys="dns.hosts">Local DNS records</h3>
@@ -56,7 +56,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
</div>
</div>
</div>
<div class="col-md-12 col-lg-6 settings-level-expert">
<div class="col-md-12 col-lg-6">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title" id="title-cnameRecords" data-configkeys="dns.cnameRecords">Local CNAME records records</h3>

7
style/pi-hole.css
View File

@@ -1472,3 +1472,10 @@ table.dataTable tbody > tr > .selected {
text-align: right;
}
}
textarea.field-sizing-content {
min-block-size: 3.5rlh;
max-block-size: 20rlh;
min-inline-size: 20ch;
field-sizing: content;
}