Make the web page look better, and the tables take up less space.

2 files changed, 34 insertions, 29 deletions

diff --git a/apt-panopticommon.lua b/apt-panopticommon.lua
index 24e6d08..71e9a9c 100644
--- a/apt-panopticommon.lua
+++ b/apt-panopticommon.lua
@@ -487,7 +487,7 @@ APT.plurals = function(e, w, t)
         end
         if ("" ~= result) and APT.html then result = "<font color='blue'><b>" .. result .. "</b></font>" end
     end
-    if "" ~= result then result = " (" .. result .. ")" end
+    if "" ~= result then result = "  " .. result end
     return result
 end
 
diff --git a/apt-panopticon-report-email-web.lua b/apt-panopticon-report-email-web.lua
index 60d1b49..079c4cc 100755
--- a/apt-panopticon-report-email-web.lua
+++ b/apt-panopticon-report-email-web.lua
@@ -81,13 +81,13 @@ local status = function(hosts, host, results, typ)
     end
 
     if to then
-        result = "[TIMEOUT"
+        result = "TIMEOUT"
         if not s then result = result .. "*" end
         if APT.html then
             if s then
-                result = "[<font color='blue'><b>TIMEOUT</b></font>"
+                result = "<font color='blue'><b>TIMEOUT</b></font>"
             else
-                result = "[<font color='darkblue'><b>TIMEOUT*</b></font>"
+                result = "<font color='darkblue'><b>TIMEOUT*</b></font>"
             end
         end
         if APT.html then
@@ -96,13 +96,13 @@ local status = function(hosts, host, results, typ)
             faulty = faulty .. host .. " (" .. typ .. ")\n"
         end
     elseif 0 < e then
-        result = "[FAILED"
+        result = "FAILED"
         if not s then result = result .. "*" end
         if APT.html then
             if s then
-                result = "[<font color='red'><b>FAILED</b></font>"
+                result = "<font color='red'><b>FAILED</b></font>"
             else
-                result = "[<font color='darkred'><b>FAILED*</b></font>"
+                result = "<font color='darkred'><b>FAILED*</b></font>"
             end
         end
         if APT.html then
@@ -111,17 +111,17 @@ local status = function(hosts, host, results, typ)
             faulty = faulty .. host .. " (" .. typ .. ")\n"
         end
     else
-        result = "[OK"
+        result = "OK"
         if not s then result = result .. "*" end
         if APT.html then
             if s then
-                result = "[<font color='lime'><b>OK</b></font>"
+                result = "<font color='lime'><b>OK</b></font>"
             else
-                result = "[<font color='darkgreen'><b>OK*</b></font>"
+                result = "<font color='darkgreen'><b>OK*</b></font>"
             end
         end
     end
-    return result .. APT.plurals(e, w, t) .. "]"
+    return result .. APT.plurals(e, w, t)
 end
 
 local m = {}
@@ -345,38 +345,41 @@ if nil == web then C("opening mirrors file - " .. e) else
                 "The links in the table and DNS list go to the detailed testing logs.</p>\n\n" ..
                 "<hr>\n<h2>==== package mirror status " .. os.date("!%F %H:%M") .. " GMT ====</h2>\n" ..
 
-                "<p>[<font color='red'><b>FAILED</b></font>] or [<font color='lime'><b>OK</b></font>]" ..
+                "<p><font color='red'><b>FAILED</b></font> or <font color='lime'><b>OK</b></font>" ..
                 " means the tested thing is supported for that mirror.</p>\n" ..
-                "<p>[<font color='darkred'><b>FAILED*</b></font>] or [<font color='darkgreen'><b>OK*</b></font>]" ..
+                "<p><font color='darkred'><b>FAILED*</b></font> or <font color='darkgreen'><b>OK*</b></font>" ..
                 " means the tested thing is unsupported for that mirror, but might have been tested anyway.</p>\n" ..
-                "<p>[<font color='blue'><b>timeout</b></font>] or [<font color='darkblue'><b>timeout</b></font>]" ..
+                "<p><font color='blue'><b>timeout</b></font> or <font color='darkblue'><b>timeout</b></font>" ..
                 " means the mirror had some timeouts, and tests where not yet aborted.  The darker colour means unsupported by the mirror, but tested anyway.</p>" ..
-                "<p>[<font color='blue'><b>TIMEOUT</b></font>] or [<font color='darkblue'><b>TIMEOUT</b></font>]" ..
+                "<p><font color='blue'><b>TIMEOUT</b></font> or <font color='darkblue'><b>TIMEOUT</b></font>" ..
                 " means the mirror had too many timeouts, and tests where aborted, so there is no result for this test.</p>" ..
                 "<p>NOTE: timeouts may be due to a problem on the testing computer.</p>" ..
-                "<p>The DNS round robin (DNS-RR) column shows the IPs for that mirror, or [<font color='grey'><b>no</b></font>] if it isn't part of the DNS-RR. &nbsp; " ..
+                "<p>The DNS round robin (DNS-RR) column shows the IPs for that mirror, or <font color='grey'><b>no</b></font> if it isn't part of the DNS-RR. &nbsp; " ..
                 "The IPs link to the testing log for that IP accessed via the DNS-RR. &nbsp; " ..
                 "deb.devuan.org is the DNS-RR itself, so it doesn't get tested directly.</p>\n" ..
                 "<p>The time in the Updated column is how often the mirror updates itself.</p>" ..
                 "<p>Mirrors with a <font style='background-color:dimgrey'>grey background</font> are not active (though may be usable as part of the DNS-RR).</p>\n" ..
-                "<p>[<font color='grey'><b>skip</b></font>] means that the test hasn't been written yet.</p>\n" ..
+                "<p><font color='grey'><b>skip</b></font> means that the test hasn't been written yet.</p>\n" ..
                 "<table>\n<tr><th></th><th>" .. lnk('FTP') .. "</th><th>" .. lnk('HTTP') .. "</th><th>" .. lnk('HTTPS') .. "</th><th>" .. lnk('RSYNC') .. "</th>" .. 
                 "<th>" .. lnk('DNS round robin', 'DNS-RR') .. "</th><th>" .. lnk('Protocol') .. "</th><th>" .. lnk('URL sanity', 'URL-Sanity') .. "</th><th>" .. lnk('Integrity') .. "</th>" ..
                 "<th>" .. lnk('Updated') .. "</th><th colspan='2'>" .. lnk('Speed range', 'Speed') .. "</th></tr>\n"
                 )
+
+    local bg = ''
     for k, v in APT.orderedPairs(APT.mirrors) do
         local results = APT.collateAll(APT.mirrors, 'results', k)
+        if '' == bg then bg = " style='background-color:#111111'" else bg = '' end
         local active = ""
         if "yes" == v.Active then
-            web:write("     <tr><th>" .. k .. "</th> ")
+            web:write("     <tr" .. bg .. "><th>" .. k .. "</th> ")
         else
             if nil == v.Active then active = 'nil' else active = v.Active end
             web:write("     <tr style='background-color:dimgrey'><th>" .. k .. "</th> ")
         end
-        local ftp       = "[<font color='grey'><b>skip</b></font>]"
+        local ftp       = "<font color='grey'><b>skip</b></font>"
         local http      = status(APT.mirrors, k, results, "http")
         local https     = status(APT.mirrors, k, results, "https")
-        local rsync     = "[<font color='grey'><b>skip</b></font>]"
+        local rsync     = "<font color='grey'><b>skip</b></font>"
         local dns       = ""
         local protocol  = status(APT.mirrors, k, results, "Protocol")
         local sanity    = status(APT.mirrors, k, results, "URLSanity")
@@ -386,7 +389,7 @@ if nil == web then C("opening mirrors file - " .. e) else
         if nil ~= rate then updated = updated .. ' ' .. rate end
         local min       = tonumber(results.speed.min)
         local max       = tonumber(results.speed.max)
-        local spd       = ''
+        local spd       = '<td></td><td></td>'
 
         -- DNS-RR test.
         if ("deb.devuan.org" ~= k) and (nil ~= APT.mirrors["deb.devuan.org"]) then
@@ -417,12 +420,12 @@ if nil == web then C("opening mirrors file - " .. e) else
                     end
                 end
             end
-            if "" == dns then dns = "[<font color='grey'><b>no</b></font>]" end
+            if "" == dns then dns = "<font color='grey'><b>no</b></font>" end
 
             if 0 == max then
                 spd = '<td></td><td></td>'
             else
-                spd = string.format('<td align="right">%d -></td><td align="right">%d</td>', min, max)
+                spd = string.format('<td align="right">%d -</td><td align="right">%d</td>', min, max)
             end
         end
 
@@ -476,6 +479,7 @@ if nil == web then C("opening mirrors file - " .. e) else
     results = {}
     m = {}
     faulty = ""
+    bg = ''
     web:write(  "<hr>\n<h2>==== Debian mirror status ====</h2>\n" ..
                 "<p>NOTE - This is not fully probing the Debian mirrors, we just collect some data from any redirects to other servers. &nbsp; " ..
                 "So this isn't a full set of tests. &nbsp Basically we don't know the shape of the Debian mirror infrastructure.</p>\n" ..
@@ -485,18 +489,19 @@ if nil == web then C("opening mirrors file - " .. e) else
                 "<th>" .. lnk('DNS round robin', 'DNS-RR') .. "</th><th>" .. lnk('Protocol') .. "</th><th>" .. lnk('URL sanity', 'URL-Sanity') .. "</th><th>" .. lnk('Integrity') .. "</th>" ..
                 "<th>" .. lnk('Updated') .. "</th><th colspan='2'>" .. lnk('Speed range', 'Speed') .. "</th></tr>\n")
     for k, v in APT.orderedPairs(APT.debians) do
+        if '' == bg then bg = " style='background-color:#111111'" else bg = '' end
         local results = APT.collateAll(APT.debians, 'results', k)
         local active = ""
         if "yes" == v.Active then
-            web:write("     <tr><th>" .. k .. "</th> ")
+            web:write("     <tr " .. bg .. "><th>" .. k .. "</th> ")
         else
             if nil == v.Active then active = 'nil' else active = v.Active end
             web:write("     <tr style='background-color:dimgrey'><th>" .. k .. "</th> ")
         end
-        local ftp       = "[<font color='grey'><b>skip</b></font>]"
+        local ftp       = "<font color='grey'><b>skip</b></font>"
         local http      = status(APT.debians, k, results, "http")
         local https     = status(APT.debians, k, results, "https")
-        local rsync     = "[<font color='grey'><b>skip</b></font>]"
+        local rsync     = "<font color='grey'><b>skip</b></font>"
         local dns       = ""
         local protocol  = status(APT.debians, k, results, "Protocol")
         local sanity    = status(APT.debians, k, results, "URLSanity")
@@ -506,7 +511,7 @@ if nil == web then C("opening mirrors file - " .. e) else
         if nil ~= rate then updated = updated .. ' ' .. rate end
         local min       = tonumber(results.speed.min)
         local max       = tonumber(results.speed.max)
-        local spd       = ''
+        local spd       = '<td></td><td></td>'
 
         -- DNS-RR test.
         if ("deb.devuan.org" ~= k) and (nil ~= APT.debians["deb.devuan.org"]) then
@@ -537,12 +542,12 @@ if nil == web then C("opening mirrors file - " .. e) else
                     end
                 end
             end
-            if "" == dns then dns = "[<font color='grey'><b>no</b></font>]" end
+            if "" == dns then dns = "<font color='grey'><b>no</b></font>" end
 
             if 0 == max then
                 spd = '<td></td><td></td>'
             else
-                spd = string.format('<td align="right">%d -></td><td align="right">%d</td>', min, max)
+                spd = string.format('<td align="right">%d -</td><td align="right">%d</td>', min, max)
             end
         end