diff --git a/scripts/pi-hole/js/settings.js b/scripts/pi-hole/js/settings.js index 155557c3..03a7fa72 100644 --- a/scripts/pi-hole/js/settings.js +++ b/scripts/pi-hole/js/settings.js @@ -115,12 +115,9 @@ $(document).ready(function() { "columnDefs": [ { "bSortable": false, "orderable": false, targets: -1} ], "paging": false, "scrollCollapse": true, - "scrollY": "200px", + "scrollY": "500px", "scrollX" : true }); - $("#leaseexpand").on( "click", function () { - setTimeout(function(){leasetable.draw();},100); - } ); } if(document.getElementById("DHCPStaticLeasesTable")) { @@ -130,12 +127,15 @@ $(document).ready(function() { "paging": false, "scrollCollapse": true, "scrollY": "200px", - "scrollX" : true + "scrollX" : "100%" }); - $("#leaseexpand").on( "click", function () { - setTimeout(function(){staticleasetable.draw();},100); - } ); } + //call draw() on each table... they don't render properly with scrollX and scrollY set... ¯\_(ツ)_/¯ + $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) { + leasetable.draw(); + staticleasetable.draw(); + }); + } ); // Handle hiding of alerts diff --git a/settings.php b/settings.php index 0bf3f4ce..72746feb 100644 --- a/settings.php +++ b/settings.php @@ -294,7 +294,6 @@ if (isset($setupVars["API_PRIVACY_MODE"])) { $piHoleDomain = "local"; } ?> -
@@ -484,84 +483,87 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {

DHCP leases

-
- - - - - - - - - - - - -
Remaining lease time:
DHCP UID: "> - - - - - -
MAC addressIP addressHostname
- -
-
-
-
- - - - - - - - - - - - +
+
+ +
MAC addressIP addressHostname
+ - - - - - - - - - - - - - -
0) { ?> -
- -
-

Specifying the MAC address is mandatory and only one entry per MAC - address is allowed. If the IP address is omitted and a host name is - given, the IP address will still be generated dynamically and the - specified host name will be used. If the host name is omitted, only - a - static lease will be added.

+ MAC address + IP address + Hostname + + + + + +
Remaining lease time:
DHCP UID: "> + + + + + + + + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
MAC addressIP addressHostname
0) { ?> +
+ +
+

Specifying the MAC address is mandatory and only one entry per MAC + address is allowed. If the IP address is omitted and a host name is + given, the IP address will still be generated dynamically and the + specified host name will be used. If the host name is omitted, only + a + static lease will be added.

+
@@ -696,19 +698,30 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
+ checked >Listen + on all interfaces
Allows only queries from + devices that are at most one hop away (local + devices)
+ checked >Listen + on all interfaces, permit all origins
-

Note that the last option should not be used on devices which are directly connected to the Internet. This option is safe if your Pi-hole is located within your local network, i.e. protected behind your router, and you have not forwarded port 53 to this device. In virtually all other cases you have to make sure that your Pi-hole is properly firewalled.

+

Note that the last option should not be used on devices which are + directly connected to the Internet. This option is safe if your + Pi-hole is located within your local network, i.e. protected behind + your router, and you have not forwarded port 53 to this device. In + virtually all other cases you have to make sure that your Pi-hole is + properly firewalled.

@@ -976,18 +989,19 @@ if (isset($setupVars["API_PRIVACY_MODE"])) { 
-FTL version: 
+                                FTL version: 
 
-Process identifier (PID): 
+                                Process identifier (PID): 
 
-Time FTL started: 
+                                Time FTL started: 
 
-User / Group:  / 
+                                User / Group: 
+                                / 
 
-Total CPU utilization: %
+                                Total CPU utilization: %
 Memory utilization: %
 Used memory: 
-
+
@@ -1101,17 +1115,24 @@ Memory utilization: %

Danger Zone!


-

-

-

-

+

+ +

+ +

+

+ +

+

+ +