From 5716e69767c418372d4fd6cd8227f39ca8563e38 Mon Sep 17 00:00:00 2001
From: Kevin Quick <kquick@galois.com>
Date: Sat, 15 Dec 2018 11:58:26 -0800
Subject: [PATCH 1/4] Add job status headers (web useability for red/green
 colorblindness).

---
 src/root/common.tt | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/root/common.tt b/src/root/common.tt
index 47b26e86..f9f725d9 100644
--- a/src/root/common.tt
+++ b/src/root/common.tt
@@ -414,7 +414,18 @@ BLOCK renderEvals %]
         [% END %]
         <th style="width: 10em">Date</th>
         <th>Input changes</th>
-        <th colspan='2' style="width: 25em">Success</th>
+        <th style="width: 2em">
+        Jobs<br>
+            <img src="[% c.uri_for("/static/images/emojione-check-2714.svg") %]" height="12" width="12" title="Succeeded" alt="Succeeded" class="build-status" />
+        </th>
+        <th style="width: 2em">
+            <img src="[% c.uri_for("/static/images/emojione-red-x-274c.svg") %]" height="12" width="12" title="Failed" alt="Failed" class="build-status" />
+        </th>
+        <th style="width: 2em">
+            <img src="[% c.uri_for("/static/images/emojione-question-2754.svg") %]" height="12" width="12" title="Queued" alt="Queued" class="build-status" />
+
+        </th>
+        <th>&Delta;</th>
       </tr>
     </thead>
     <tbody>
@@ -440,9 +451,13 @@ BLOCK renderEvals %]
           </td>
           <td align='right' class="nowrap">
             <span class="label label-success">[% e.nrSucceeded %]</span>
+          </td>
+          <td align='right' class="nowrap">
             [% IF e.nrFailed > 0 %]
             <span class="label label-important">[% e.nrFailed %]</span>
             [% END %]
+          </td>
+          <td align='right' class="nowrap">
             [% IF e.nrScheduled > 0 %]
             <span class="label">[% e.nrScheduled %]</span>
             [% END %]
@@ -509,7 +524,19 @@ BLOCK renderJobsetOverview %]
       <th>Name</th>
       <th>Description</th>
       <th>Last evaluated</th>
-      <th colspan="2">Success</th>
+      <th style="width: 2em">
+            Jobs
+      </th>
+      <th style="width: 2em">
+            <img src="[% c.uri_for("/static/images/emojione-check-2714.svg") %]" height="12" width="12" title="Succeeded" alt="Succeeded" class="build-status" />
+      </th>
+      <th style="width: 2em">
+            <img src="[% c.uri_for("/static/images/emojione-red-x-274c.svg") %]" height="12" width="12" title="Failed" alt="Failed" class="build-status" />
+      </th>
+      <th style="width: 2em">
+            <img src="[% c.uri_for("/static/images/emojione-question-2754.svg") %]" height="12" width="12" title="Queued" alt="Queued" class="build-status" />
+
+      </th>
     </tr>
   </thead>
   <tbody>
@@ -547,9 +574,13 @@ BLOCK renderJobsetOverview %]
           [% IF j.get_column('nrsucceeded') > 0 %]
             <span class="label label-success">[% j.get_column('nrsucceeded') %]</span>
           [% END %]
+        </td>
+        <td>
           [% IF j.get_column('nrfailed') > 0 %]
             <span class="label label-important">[% j.get_column('nrfailed') %]</span>
           [% END %]
+        </td>
+        <td>
           [% IF j.get_column('nrscheduled') > 0 %]
             <span class="label label">[% j.get_column('nrscheduled') %]</span>
           [% END %]

From 0e7593a4a1c7de8d103143446f1078ef0ad7046e Mon Sep 17 00:00:00 2001
From: Kevin Quick <kquick@galois.com>
Date: Sat, 15 Dec 2018 21:25:41 -0800
Subject: [PATCH 2/4] Remove blank lines, consistent attribute quoting, use svg
 for delta header, column sizes.

---
 src/root/common.tt               | 16 ++++++++--------
 src/root/static/images/delta.svg |  1 +
 2 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 src/root/static/images/delta.svg

diff --git a/src/root/common.tt b/src/root/common.tt
index f9f725d9..963c806d 100644
--- a/src/root/common.tt
+++ b/src/root/common.tt
@@ -414,18 +414,19 @@ BLOCK renderEvals %]
         [% END %]
         <th style="width: 10em">Date</th>
         <th>Input changes</th>
-        <th style="width: 2em">
+        <th style="width: 2.5em">
         Jobs<br>
             <img src="[% c.uri_for("/static/images/emojione-check-2714.svg") %]" height="12" width="12" title="Succeeded" alt="Succeeded" class="build-status" />
         </th>
-        <th style="width: 2em">
+        <th style="width: 2.5em">
             <img src="[% c.uri_for("/static/images/emojione-red-x-274c.svg") %]" height="12" width="12" title="Failed" alt="Failed" class="build-status" />
         </th>
-        <th style="width: 2em">
+        <th style="width: 2.5em">
             <img src="[% c.uri_for("/static/images/emojione-question-2754.svg") %]" height="12" width="12" title="Queued" alt="Queued" class="build-status" />
-
         </th>
-        <th>&Delta;</th>
+        <th>
+            <img src="[% c.uri_for("/static/images/delta.svg") %]" height="12" width="12" title="Delta" alt="Delta" class="build-status" />
+        </th>
       </tr>
     </thead>
     <tbody>
@@ -452,12 +453,12 @@ BLOCK renderEvals %]
           <td align='right' class="nowrap">
             <span class="label label-success">[% e.nrSucceeded %]</span>
           </td>
-          <td align='right' class="nowrap">
+          <td align="right" class="nowrap">
             [% IF e.nrFailed > 0 %]
             <span class="label label-important">[% e.nrFailed %]</span>
             [% END %]
           </td>
-          <td align='right' class="nowrap">
+          <td align="right" class="nowrap">
             [% IF e.nrScheduled > 0 %]
             <span class="label">[% e.nrScheduled %]</span>
             [% END %]
@@ -535,7 +536,6 @@ BLOCK renderJobsetOverview %]
       </th>
       <th style="width: 2em">
             <img src="[% c.uri_for("/static/images/emojione-question-2754.svg") %]" height="12" width="12" title="Queued" alt="Queued" class="build-status" />
-
       </th>
     </tr>
   </thead>
diff --git a/src/root/static/images/delta.svg b/src/root/static/images/delta.svg
new file mode 100644
index 00000000..408b0d0f
--- /dev/null
+++ b/src/root/static/images/delta.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" enable-background="new 0 0 64 64"><path stroke="#4d5357" stroke-width="12" fill="none" d="m32 2l-20 60h40z"/></svg>

From dfce2ad69a72c4c23aa423869fbe01562d7a3a4e Mon Sep 17 00:00:00 2001
From: Kevin Quick <kquick@galois.com>
Date: Sun, 16 Dec 2018 22:26:44 -0800
Subject: [PATCH 3/4] Use rowspans to align Jobs reference in evaluations
 rendering

---
 src/root/common.tt            | 24 +++++++++++++-----------
 src/root/static/css/hydra.css |  5 +++++
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/root/common.tt b/src/root/common.tt
index 963c806d..6ebeb217 100644
--- a/src/root/common.tt
+++ b/src/root/common.tt
@@ -408,25 +408,27 @@ BLOCK renderEvals %]
   <table class="table table-condensed table-striped clickable-rows">
     <thead>
       <tr>
-        <th>#</th>
+        <th rowspan="2">#</th>
         [% IF !jobset && !build %]
-          <th>Jobset</th>
+          <th rowspan="2">Jobset</th>
         [% END %]
-        <th style="width: 10em">Date</th>
-        <th>Input changes</th>
-        <th style="width: 2.5em">
-        Jobs<br>
+        <th rowspan="2" style="width: 10em">Date</th>
+        <th rowspan="2">Input changes</th>
+        <th colspan="3">Jobs</th>
+        <th rowspan="2">
+            <img src="[% c.uri_for("/static/images/delta.svg") %]" height="12" width="12" title="Delta" alt="Delta" class="build-status" />
+        </th>
+      </tr>
+      <tr>
+        <th style="width: 2em">
             <img src="[% c.uri_for("/static/images/emojione-check-2714.svg") %]" height="12" width="12" title="Succeeded" alt="Succeeded" class="build-status" />
         </th>
-        <th style="width: 2.5em">
+        <th style="width: 2em">
             <img src="[% c.uri_for("/static/images/emojione-red-x-274c.svg") %]" height="12" width="12" title="Failed" alt="Failed" class="build-status" />
         </th>
-        <th style="width: 2.5em">
+        <th style="width: 2em">
             <img src="[% c.uri_for("/static/images/emojione-question-2754.svg") %]" height="12" width="12" title="Queued" alt="Queued" class="build-status" />
         </th>
-        <th>
-            <img src="[% c.uri_for("/static/images/delta.svg") %]" height="12" width="12" title="Delta" alt="Delta" class="build-status" />
-        </th>
       </tr>
     </thead>
     <tbody>
diff --git a/src/root/static/css/hydra.css b/src/root/static/css/hydra.css
index a871485e..d2c09bc4 100644
--- a/src/root/static/css/hydra.css
+++ b/src/root/static/css/hydra.css
@@ -142,3 +142,8 @@ td.step-status span.warn {
     color: #aaaa00;
     font-weight: bold;
 }
+
+/* Assumes borders are never desired in multi-row table heads */
+.table thead th {
+    border-top: 0;
+}

From 8315e20ab502a6aa1b94010d7223a10060f93ca8 Mon Sep 17 00:00:00 2001
From: Kevin Quick <kquick@galois.com>
Date: Sun, 16 Dec 2018 22:34:22 -0800
Subject: [PATCH 4/4] Lighten delta mark to blend better with other column
 headers.

---
 src/root/static/images/delta.svg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/root/static/images/delta.svg b/src/root/static/images/delta.svg
index 408b0d0f..37161bec 100644
--- a/src/root/static/images/delta.svg
+++ b/src/root/static/images/delta.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" enable-background="new 0 0 64 64"><path stroke="#4d5357" stroke-width="12" fill="none" d="m32 2l-20 60h40z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" enable-background="new 0 0 64 64"><path stroke="#8d8397" stroke-width="12" fill="none" d="m32 2l-20 60h40z"/></svg>