diff --git a/scripts/pi-hole/js/footer.js b/scripts/pi-hole/js/footer.js index b1a416da..98b46ef4 100644 --- a/scripts/pi-hole/js/footer.js +++ b/scripts/pi-hole/js/footer.js @@ -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"; } } diff --git a/scripts/pi-hole/js/settings-advanced.js b/scripts/pi-hole/js/settings-advanced.js index 6286617c..9f73bf74 100644 --- a/scripts/pi-hole/js/settings-advanced.js +++ b/scripts/pi-hole/js/settings-advanced.js @@ -209,7 +209,7 @@ function generateRow(topic, key, value) { box += '' + '
' + - ' +

Domains may be described by their domain name (like ^example\.com$)

Clients to be excluded from Top Client Lists and Query Log

- +

Clients may be described either by their IP addresses (IPv4 and IPv6 are supported), or hostnames (like ^laptop\.lan$).

diff --git a/settings-dhcp.lp b/settings-dhcp.lp index 4be3ca45..a643b1d1 100644 --- a/settings-dhcp.lp +++ b/settings-dhcp.lp @@ -156,7 +156,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')

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.

-
  +
 

Each entry should be on a separate line, and should be of the form:

[<hwaddr>][,id:<client_id>|*][,set:<tag>][,tag:<tag>][,<ipaddr>][,<hostname>][,<lease_time>][,ignore]

Only one entry per MAC address is allowed.

diff --git a/settings-dnsrecords.lp b/settings-dnsrecords.lp index 24402d21..685c4f05 100644 --- a/settings-dnsrecords.lp +++ b/settings-dnsrecords.lp @@ -14,7 +14,7 @@ PageTitle = "Local DNS Settings" mg.include('scripts/pi-hole/lua/settings_header.lp','r') ?>
-
+

Local DNS records

@@ -56,7 +56,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
-
+

Local CNAME records records

diff --git a/style/pi-hole.css b/style/pi-hole.css index cff89941..ff52b0e4 100644 --- a/style/pi-hole.css +++ b/style/pi-hole.css @@ -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; +}