From 148b8048d46baa1d7e609360e090957ea1cc5d70 Mon Sep 17 00:00:00 2001 From: TheME Date: Thu, 2 Nov 2017 20:24:03 +0100 Subject: [PATCH 01/10] set tab active by 'tab'-parameter in URL --- settings.php | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/settings.php b/settings.php index 7123c608..05c21a34 100644 --- a/settings.php +++ b/settings.php @@ -227,20 +227,27 @@ if (isset($setupVars["API_PRIVACY_MODE"])) { ?> +
-
+
in active">
@@ -294,7 +301,7 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
-
+
in active"> -
+
in active">
@@ -847,7 +854,7 @@ if (isset($setupVars["API_PRIVACY_MODE"])) { } // Use $boxedlayout value determined in header.php ?> -
+
in active">
@@ -967,7 +974,7 @@ if (isset($setupVars["API_PRIVACY_MODE"])) {
-
+
in active">
-
+
in active">
From 84c1e1a9d986470d6ac6d9c688e55727a6648f7c Mon Sep 17 00:00:00 2001 From: TheME Date: Thu, 2 Nov 2017 20:40:46 +0100 Subject: [PATCH 02/10] Change "?tab=" parameter when switching tabs --- scripts/pi-hole/js/settings.js | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/scripts/pi-hole/js/settings.js b/scripts/pi-hole/js/settings.js index 4eee5c20..0edae1bc 100644 --- a/scripts/pi-hole/js/settings.js +++ b/scripts/pi-hole/js/settings.js @@ -186,17 +186,9 @@ $("button[id^='adlist-btn-']").on("click", function (e) { }); -// Javascript to go to specified tab on save or hyperlink -$(function () { - if(location.hash.length > 0) - { - var activeTab = $("[href=" + location.hash + "]"); - activeTab && activeTab.tab("show"); - } -}); -// Change hash for save and reload +// Change "?tab=" parameter in URL for save and reload $(".nav-tabs a").on("shown.bs.tab", function (e) { - window.location.hash = e.target.hash; + window.history.pushState("", "", "?tab=" + e.target.hash.substring(1)); window.scrollTo(0, 0); }); From 682227d64e26aef2cb1eecdd4550ac10d5d54a46 Mon Sep 17 00:00:00 2001 From: TheME Date: Thu, 2 Nov 2017 21:01:40 +0100 Subject: [PATCH 03/10] Tab 'Block Lists': allow Table to scroll horizontally for small screens --- settings.php | 60 +++++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/settings.php b/settings.php index 05c21a34..ce05f6b4 100644 --- a/settings.php +++ b/settings.php @@ -256,35 +256,37 @@ if (in_array($_GET['tab'], array("sysadmin", "blocklists", "dns", "piholedhcp",

Lists used to generate Pi-hole's Gravity

- - - - - - - - - - $value) { ?> -
-
- - - - - - - -
EnabledListDelete
- checked> - - - - - -
+
+ + + + + + + + + + $value) { ?> +
+
+ + + + + + + +
EnabledListDelete
+ checked> + + + + + +
+
From 36363ca2438b1fddc7d1a9370542f42646a4e627 Mon Sep 17 00:00:00 2001 From: TheME Date: Thu, 2 Nov 2017 21:24:41 +0100 Subject: [PATCH 04/10] Tab 'Block Lists': remove div element inside of table --- settings.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/settings.php b/settings.php index ce05f6b4..428a76bb 100644 --- a/settings.php +++ b/settings.php @@ -266,8 +266,7 @@ if (in_array($_GET['tab'], array("sysadmin", "blocklists", "dns", "piholedhcp", - $value) { ?> -
+ $value) { ?> checked> @@ -282,8 +281,7 @@ if (in_array($_GET['tab'], array("sysadmin", "blocklists", "dns", "piholedhcp", -
- +
From 598b61a9ce42aed6c8891fd0380c609c0bb8531d Mon Sep 17 00:00:00 2001 From: TheME Date: Thu, 2 Nov 2017 21:28:41 +0100 Subject: [PATCH 05/10] Tab 'Block Lists': shrink 'Delete'-column and center the buttons --- settings.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings.php b/settings.php index 428a76bb..6c73c78b 100644 --- a/settings.php +++ b/settings.php @@ -262,7 +262,7 @@ if (in_array($_GET['tab'], array("sysadmin", "blocklists", "dns", "piholedhcp", Enabled List - Delete + Delete @@ -274,7 +274,7 @@ if (in_array($_GET['tab'], array("sysadmin", "blocklists", "dns", "piholedhcp", - + From c3b054ab5d71dc8f3e7029d350eca55ea192f3f9 Mon Sep 17 00:00:00 2001 From: TheME Date: Thu, 2 Nov 2017 21:57:33 +0100 Subject: [PATCH 06/10] Adjust boxes grid for small screens --- settings.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/settings.php b/settings.php index 6c73c78b..5ef58899 100644 --- a/settings.php +++ b/settings.php @@ -378,7 +378,7 @@ if (in_array($_GET['tab'], array("sysadmin", "blocklists", "dns", "piholedhcp",
-
+
From
@@ -389,7 +389,7 @@ if (in_array($_GET['tab'], array("sysadmin", "blocklists", "dns", "piholedhcp",
-
+
To
@@ -637,14 +637,14 @@ if (in_array($_GET['tab'], array("sysadmin", "blocklists", "dns", "piholedhcp",
in active">
-
+

Upstream DNS Servers

-
+
@@ -692,7 +692,7 @@ if (in_array($_GET['tab'], array("sysadmin", "blocklists", "dns", "piholedhcp",
IPv4
-
+
@@ -745,7 +745,7 @@ if (in_array($_GET['tab'], array("sysadmin", "blocklists", "dns", "piholedhcp",
-
+

Interface listening behavior

@@ -856,7 +856,7 @@ if (in_array($_GET['tab'], array("sysadmin", "blocklists", "dns", "piholedhcp", ?>
in active">
-
+
@@ -870,7 +870,7 @@ if (in_array($_GET['tab'], array("sysadmin", "blocklists", "dns", "piholedhcp",
-
+
-
+
+
- +
@@ -880,17 +880,20 @@ if (in_array($_GET['tab'], array("sysadmin", "blocklists", "dns", "piholedhcp",
-
+
+ +
-
+
+ +
@@ -898,10 +901,11 @@ if (in_array($_GET['tab'], array("sysadmin", "blocklists", "dns", "piholedhcp",

Privacy mode

-
+
+ +
@@ -926,21 +930,28 @@ if (in_array($_GET['tab'], array("sysadmin", "blocklists", "dns", "piholedhcp",

Interface appearance

-
+
+ +

CPU Temperature Unit

-
+
+
-
+
+
-
+
+
From 8837ed75254655349cbc14c430ec1a6b5f81b71a Mon Sep 17 00:00:00 2001 From: TheME Date: Sat, 4 Nov 2017 23:39:33 +0100 Subject: [PATCH 10/10] clean up code in Sysadmin section --- settings.php | 76 +++++++++++++++++++++++----------------------------- 1 file changed, 33 insertions(+), 43 deletions(-) diff --git a/settings.php b/settings.php index fd995f12..41416e37 100644 --- a/settings.php +++ b/settings.php @@ -1103,41 +1103,36 @@ if (in_array($_GET['tab'], array("sysadmin", "blocklists", "dns", "piholedhcp",
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FTL version:
Process identifier (PID):
Time FTL started:
User / Group: - /
Total CPU utilization:%
Memory utilization: - % -
Used memory: - -
FTL version:
Process identifier (PID):
Time FTL started:
User / Group: /
Total CPU utilization:%
Memory utilization:%
+ Used memory: +
@@ -1178,20 +1173,16 @@ if (in_array($_GET['tab'], array("sysadmin", "blocklists", "dns", "piholedhcp",
- +
- +
- +
@@ -1211,7 +1202,6 @@ if (in_array($_GET['tab'], array("sysadmin", "blocklists", "dns", "piholedhcp",
-