From c6b6edae0589a4222afe2c1ba0ef55d7742e8167 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Thu, 16 Aug 2018 14:16:30 +0200
Subject: [PATCH 1/3] Change "Pi-holed" to "Blocked" on the Query Log. Also add
 a new "Blocked (external)" status that will be used by a future version of
 FTL. I also removed the addition of the dnssec status to the "Blocked
 (gravity)" status as requests answered from the blocking lists do not have a
 DNSSEC status.

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/queries.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index 0581efa4..704f5638 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -175,7 +175,7 @@ $(document).ready(function() {
             case "1":
                 blocked = true;
                 color = "red";
-                fieldtext = "Pi-holed"+dnssec_status;
+                fieldtext = "Blocked (gravity)";
                 buttontext = "<button style=\"color:green; white-space: nowrap;\"><i class=\"fa fa-pencil-square-o\"></i> Whitelist</button>";
                 break;
             case "2":
@@ -193,13 +193,19 @@ $(document).ready(function() {
             case "4":
                 blocked = true;
                 color = "red";
-                fieldtext = "Pi-holed <br class='hidden-lg'>(wildcard)";
+                fieldtext = "Blocked <br class='hidden-lg'>(regex/wildcard)";
                 buttontext = "";
                 break;
             case "5":
                 blocked = true;
                 color = "red";
-                fieldtext = "Pi-holed <br class='hidden-lg'>(blacklist)";
+                fieldtext = "Blocked <br class='hidden-lg'>(blacklist)";
+                buttontext = "<button style=\"color:green; white-space: nowrap;\"><i class=\"fa fa-pencil-square-o\"></i> Whitelist</button>" ;
+                break;
+            case "6":
+                blocked = true;
+                color = "red";
+                fieldtext = "Blocked <br class='hidden-lg'>(external)";
                 buttontext = "<button style=\"color:green; white-space: nowrap;\"><i class=\"fa fa-pencil-square-o\"></i> Whitelist</button>" ;
                 break;
             default:

From 96464680222ec2b8fb074a4a38e4e8aff01073e5 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Thu, 16 Aug 2018 14:23:58 +0200
Subject: [PATCH 2/3] +Show whitelisting button for regex blocked queries as
 pihole-FTL can actually whitelist regex filtered domains

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/queries.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index 704f5638..f72fccbd 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -194,7 +194,7 @@ $(document).ready(function() {
                 blocked = true;
                 color = "red";
                 fieldtext = "Blocked <br class='hidden-lg'>(regex/wildcard)";
-                buttontext = "";
+                buttontext = "<button style=\"color:green; white-space: nowrap;\"><i class=\"fa fa-pencil-square-o\"></i> Whitelist</button>" ;
                 break;
             case "5":
                 blocked = true;

From 511b42352a7e1e725986059b885248c661f05f5d Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Fri, 17 Aug 2018 18:26:21 +0200
Subject: [PATCH 3/3] Do not show whitelist button for externally blocked
 domains as whitelisting these domains has not yet been implemented

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/queries.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index f72fccbd..adaf8338 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -206,7 +206,7 @@ $(document).ready(function() {
                 blocked = true;
                 color = "red";
                 fieldtext = "Blocked <br class='hidden-lg'>(external)";
-                buttontext = "<button style=\"color:green; white-space: nowrap;\"><i class=\"fa fa-pencil-square-o\"></i> Whitelist</button>" ;
+                buttontext = "" ;
                 break;
             default:
                 blocked = false;