From 2bee3260b45b559eb3bc75c6421dc7e573571cdb Mon Sep 17 00:00:00 2001 From: hackademix Date: Mon, 8 Apr 2019 21:37:35 +0200 Subject: Fixed UI inconsistencies when whitelisting/blacklisting through wide wildcard matching. --- html/display_panel/content/display-panel.html | 1 + html/display_panel/content/main_panel.js | 13 +++++++++++-- html/display_panel/content/panel-styles.css | 7 +++++-- 3 files changed, 17 insertions(+), 4 deletions(-) (limited to 'html/display_panel') diff --git a/html/display_panel/content/display-panel.html b/html/display_panel/content/display-panel.html index 5b9f99f..2e705ab 100644 --- a/html/display_panel/content/display-panel.html +++ b/html/display_panel/content/display-panel.html @@ -60,6 +60,7 @@

This whole site

+
diff --git a/html/display_panel/content/main_panel.js b/html/display_panel/content/main_panel.js index 9172265..75de6aa 100644 --- a/html/display_panel/content/main_panel.js +++ b/html/display_panel/content/main_panel.js @@ -173,8 +173,8 @@ function createList(data, group){ */ function refreshUI(report) { currentReport = report; - - document.querySelector("#site").className = report.siteStatus || ""; + let {siteStatus, listedSite} = report; + document.querySelector("#site").className = siteStatus || ""; document.querySelector("#site h2").textContent = `This site ${report.site}`; @@ -198,6 +198,15 @@ function refreshUI(report) { b.disabled = true; } + if (siteStatus && siteStatus !== "unknown") { + let statusLabel = siteStatus; + if (listedSite && listedSite !== report.site) statusLabel += ` via ${listedSite}`; + let status = document.querySelector("#site .status"); + status.classList.add(siteStatus); + document.querySelector("#site .status").textContent = statusLabel; + document.querySelector("#site .forget").disabled = true; + } + let noscript = scriptsCount === 0; document.body.classList.toggle("empty", noscript); } diff --git a/html/display_panel/content/panel-styles.css b/html/display_panel/content/panel-styles.css index 502323f..3257192 100644 --- a/html/display_panel/content/panel-styles.css +++ b/html/display_panel/content/panel-styles.css @@ -94,11 +94,14 @@ ul { display: initial; } +.status { + margin: .2em; +} -button.whitelist { +button.whitelist, .status.whitelisted { color: #080; } -button.blacklist { +button.blacklist, .status.blacklisted { color: #800; } button.forget { -- cgit v1.2.3