From de71dd0fb587a788688a5cb4cbb7ce49e3678750 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sun, 24 May 2020 16:05:24 +0300 Subject: [PATCH 1/4] Clean up table classes. These are DataTables classes which we don't use since we use Bootstrap. Signed-off-by: XhmikosR --- db_queries.php | 2 +- dns_records.php | 2 +- groups-adlists.php | 2 +- groups-clients.php | 2 +- groups-domains.php | 2 +- groups.php | 2 +- messages.php | 2 +- network.php | 2 +- queries.php | 2 +- settings.php | 8 ++++---- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/db_queries.php b/db_queries.php index 450a5ed0..6221854e 100644 --- a/db_queries.php +++ b/db_queries.php @@ -139,7 +139,7 @@ $token = $_SESSION['token'];
- +
diff --git a/dns_records.php b/dns_records.php index 362329dc..d1380c4e 100644 --- a/dns_records.php +++ b/dns_records.php @@ -72,7 +72,7 @@
-
Time
+
diff --git a/groups-adlists.php b/groups-adlists.php index 16b11216..b6fc61d0 100644 --- a/groups-adlists.php +++ b/groups-adlists.php @@ -53,7 +53,7 @@
-
Domain
+
diff --git a/groups-clients.php b/groups-clients.php index 843b08f4..beec4ad0 100644 --- a/groups-clients.php +++ b/groups-clients.php @@ -55,7 +55,7 @@
-
ID
+
diff --git a/groups-domains.php b/groups-domains.php index 4914e125..8b76b1e3 100644 --- a/groups-domains.php +++ b/groups-domains.php @@ -118,7 +118,7 @@
-
ID
+
diff --git a/groups.php b/groups.php index 7c091015..27659d61 100644 --- a/groups.php +++ b/groups.php @@ -52,7 +52,7 @@
-
ID
+
diff --git a/messages.php b/messages.php index 4b3095e4..ac179b72 100644 --- a/messages.php +++ b/messages.php @@ -19,7 +19,7 @@
-
ID
+
diff --git a/network.php b/network.php index 1fc64187..c48426bc 100644 --- a/network.php +++ b/network.php @@ -29,7 +29,7 @@ $token = $_SESSION['token'];
-
ID
+
diff --git a/queries.php b/queries.php index 7404c0a6..22e7dd27 100644 --- a/queries.php +++ b/queries.php @@ -122,7 +122,7 @@ if(strlen($showing) > 0)
-
IP address
+
diff --git a/settings.php b/settings.php index 47d418b0..c4a5f1e7 100644 --- a/settings.php +++ b/settings.php @@ -262,7 +262,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "adlists", "
-
Time
+
@@ -305,7 +305,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "adlists", " $FTLversion = exec("/usr/bin/pihole-FTL version"); ?> -
Pi-hole Ethernet Interface:
+
@@ -699,7 +699,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "adlists", "
-
FTL version:
@@ -729,7 +729,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "adlists", "
-
From d3cd52b992ae65cdb3fc083200a5e97e0722f286 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sun, 24 May 2020 16:06:53 +0300 Subject: [PATCH 2/4] Remove the obsolete `cellspacing="0"` attribute. Signed-off-by: XhmikosR --- db_queries.php | 2 +- dns_records.php | 2 +- groups-adlists.php | 2 +- groups-clients.php | 2 +- groups-domains.php | 2 +- groups.php | 2 +- messages.php | 2 +- network.php | 2 +- queries.php | 2 +- settings.php | 6 ++---- 10 files changed, 11 insertions(+), 13 deletions(-) diff --git a/db_queries.php b/db_queries.php index 6221854e..73ee2def 100644 --- a/db_queries.php +++ b/db_queries.php @@ -139,7 +139,7 @@ $token = $_SESSION['token'];
-
+
diff --git a/dns_records.php b/dns_records.php index d1380c4e..4d429af4 100644 --- a/dns_records.php +++ b/dns_records.php @@ -72,7 +72,7 @@
-
Time
+
diff --git a/groups-adlists.php b/groups-adlists.php index b6fc61d0..ae5c98ed 100644 --- a/groups-adlists.php +++ b/groups-adlists.php @@ -53,7 +53,7 @@
-
Domain
+
diff --git a/groups-clients.php b/groups-clients.php index beec4ad0..e982fea0 100644 --- a/groups-clients.php +++ b/groups-clients.php @@ -55,7 +55,7 @@
-
ID
+
diff --git a/groups-domains.php b/groups-domains.php index 8b76b1e3..0c1c1ded 100644 --- a/groups-domains.php +++ b/groups-domains.php @@ -118,7 +118,7 @@
-
ID
+
diff --git a/groups.php b/groups.php index 27659d61..e7680cfa 100644 --- a/groups.php +++ b/groups.php @@ -52,7 +52,7 @@
-
ID
+
diff --git a/messages.php b/messages.php index ac179b72..d941e566 100644 --- a/messages.php +++ b/messages.php @@ -19,7 +19,7 @@
-
ID
+
diff --git a/network.php b/network.php index c48426bc..400eb6da 100644 --- a/network.php +++ b/network.php @@ -29,7 +29,7 @@ $token = $_SESSION['token'];
-
ID
+
diff --git a/queries.php b/queries.php index 22e7dd27..6152e135 100644 --- a/queries.php +++ b/queries.php @@ -122,7 +122,7 @@ if(strlen($showing) > 0)
-
IP address
+
diff --git a/settings.php b/settings.php index c4a5f1e7..6d76f02a 100644 --- a/settings.php +++ b/settings.php @@ -699,8 +699,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "adlists", "
-
Time
+
@@ -729,8 +728,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "adlists", "
-
MAC address
+
From 59ea121e07a1730be3021846907ea4616564f319 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sun, 24 May 2020 16:13:43 +0300 Subject: [PATCH 3/4] Remove the invalid `width="100%` attribute Also, add the missing `table` class in a network table. Signed-off-by: XhmikosR --- db_queries.php | 2 +- dns_records.php | 2 +- groups-adlists.php | 2 +- groups-clients.php | 16 ++++++++-------- groups-domains.php | 20 ++++++++++---------- groups.php | 2 +- messages.php | 24 ++++++++++++------------ network.php | 20 ++++++++++---------- queries.php | 2 +- settings.php | 16 ++++++++-------- 10 files changed, 53 insertions(+), 53 deletions(-) diff --git a/db_queries.php b/db_queries.php index 73ee2def..97aee76f 100644 --- a/db_queries.php +++ b/db_queries.php @@ -139,7 +139,7 @@ $token = $_SESSION['token'];
-
MAC address
+
diff --git a/dns_records.php b/dns_records.php index 4d429af4..214e429d 100644 --- a/dns_records.php +++ b/dns_records.php @@ -72,7 +72,7 @@
-
Time
+
diff --git a/groups-adlists.php b/groups-adlists.php index ae5c98ed..5df3aefc 100644 --- a/groups-adlists.php +++ b/groups-adlists.php @@ -53,7 +53,7 @@
-
Domain
+
diff --git a/groups-clients.php b/groups-clients.php index e982fea0..534ef3ae 100644 --- a/groups-clients.php +++ b/groups-clients.php @@ -55,15 +55,15 @@
-
ID
+
- - - - - - - + + + + + + +
IDIP addressCommentGroup assignmentAction
IDIP addressCommentGroup assignmentAction
diff --git a/groups-domains.php b/groups-domains.php index 0c1c1ded..4a9ba3f7 100644 --- a/groups-domains.php +++ b/groups-domains.php @@ -118,17 +118,17 @@
- +
- - - - - - - - - + + + + + + + + +
IDDomain/RegExTypeStatusCommentGroup assignmentAction
IDDomain/RegExTypeStatusCommentGroup assignmentAction
diff --git a/groups.php b/groups.php index e7680cfa..4b02e747 100644 --- a/groups.php +++ b/groups.php @@ -52,7 +52,7 @@
- +
diff --git a/messages.php b/messages.php index d941e566..3285d11b 100644 --- a/messages.php +++ b/messages.php @@ -19,19 +19,19 @@
-
ID
+
- - - - - - - - - - - + + + + + + + + + + +
IDTimeTypeMessageData1Data2Data3Data4Data5
IDTimeTypeMessageData1Data2Data3Data4Data5
diff --git a/network.php b/network.php index 400eb6da..2b4cb312 100644 --- a/network.php +++ b/network.php @@ -29,7 +29,7 @@ $token = $_SESSION['token'];
- +
@@ -56,15 +56,15 @@ $token = $_SESSION['token'];
IP address
- - - - - - - - -
just now... to ...24 hours ago> 24 hours agoDevice does not use Pi-hole
+ + + + + + + + +
just now... to ...24 hours ago> 24 hours agoDevice does not use Pi-hole
diff --git a/queries.php b/queries.php index 6152e135..5eb4e8f6 100644 --- a/queries.php +++ b/queries.php @@ -122,7 +122,7 @@ if(strlen($showing) > 0)
- +
diff --git a/settings.php b/settings.php index 6d76f02a..6c9f98d6 100644 --- a/settings.php +++ b/settings.php @@ -699,7 +699,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "adlists", "
-
Time
+
@@ -728,14 +728,14 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "adlists", "
-
MAC address
+
- - - - - - + + + + + + From b7540de7d01f24991466ad3ddd822ff87e8335d6 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sun, 24 May 2020 17:14:04 +0300 Subject: [PATCH 4/4] Revert "Remove the invalid `width="100%` attribute" This reverts commit 59ea121e07a1730be3021846907ea4616564f319. Apparently, we are doing something weird in the settings tables and this doesn't work. We should revisit this later. Signed-off-by: XhmikosR --- db_queries.php | 2 +- dns_records.php | 2 +- groups-adlists.php | 2 +- groups-clients.php | 16 ++++++++-------- groups-domains.php | 20 ++++++++++---------- groups.php | 2 +- messages.php | 24 ++++++++++++------------ network.php | 20 ++++++++++---------- queries.php | 2 +- settings.php | 16 ++++++++-------- 10 files changed, 53 insertions(+), 53 deletions(-) diff --git a/db_queries.php b/db_queries.php index 97aee76f..73ee2def 100644 --- a/db_queries.php +++ b/db_queries.php @@ -139,7 +139,7 @@ $token = $_SESSION['token'];
-
MAC addressIP addressHostname
MAC addressIP addressHostname
+
diff --git a/dns_records.php b/dns_records.php index 214e429d..4d429af4 100644 --- a/dns_records.php +++ b/dns_records.php @@ -72,7 +72,7 @@
-
Time
+
diff --git a/groups-adlists.php b/groups-adlists.php index 5df3aefc..ae5c98ed 100644 --- a/groups-adlists.php +++ b/groups-adlists.php @@ -53,7 +53,7 @@
-
Domain
+
diff --git a/groups-clients.php b/groups-clients.php index 534ef3ae..e982fea0 100644 --- a/groups-clients.php +++ b/groups-clients.php @@ -55,15 +55,15 @@
-
ID
+
- - - - - - - + + + + + + +
IDIP addressCommentGroup assignmentAction
IDIP addressCommentGroup assignmentAction
diff --git a/groups-domains.php b/groups-domains.php index 4a9ba3f7..0c1c1ded 100644 --- a/groups-domains.php +++ b/groups-domains.php @@ -118,17 +118,17 @@
- +
- - - - - - - - - + + + + + + + + +
IDDomain/RegExTypeStatusCommentGroup assignmentAction
IDDomain/RegExTypeStatusCommentGroup assignmentAction
diff --git a/groups.php b/groups.php index 4b02e747..e7680cfa 100644 --- a/groups.php +++ b/groups.php @@ -52,7 +52,7 @@
- +
diff --git a/messages.php b/messages.php index 3285d11b..d941e566 100644 --- a/messages.php +++ b/messages.php @@ -19,19 +19,19 @@
-
ID
+
- - - - - - - - - - - + + + + + + + + + + +
IDTimeTypeMessageData1Data2Data3Data4Data5
IDTimeTypeMessageData1Data2Data3Data4Data5
diff --git a/network.php b/network.php index 2b4cb312..400eb6da 100644 --- a/network.php +++ b/network.php @@ -29,7 +29,7 @@ $token = $_SESSION['token'];
- +
@@ -56,15 +56,15 @@ $token = $_SESSION['token'];
IP address
- - - - - - - - -
just now... to ...24 hours ago> 24 hours agoDevice does not use Pi-hole
+ + + + + + + + +
just now... to ...24 hours ago> 24 hours agoDevice does not use Pi-hole
diff --git a/queries.php b/queries.php index 5eb4e8f6..6152e135 100644 --- a/queries.php +++ b/queries.php @@ -122,7 +122,7 @@ if(strlen($showing) > 0)
- +
diff --git a/settings.php b/settings.php index 6c9f98d6..6d76f02a 100644 --- a/settings.php +++ b/settings.php @@ -699,7 +699,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "adlists", "
-
Time
+
@@ -728,14 +728,14 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "adlists", "
-
MAC address
+
- - - - - - + + + + + +
MAC addressIP addressHostname
MAC addressIP addressHostname