From 36032e4bed82c81bd1bdde30aa66541caa046dac Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 21 Feb 2013 13:42:44 +0100
Subject: [PATCH] Make the info tables less compressed

---
 src/root/build.tt             | 10 +++++-----
 src/root/change-password.tt   |  2 +-
 src/root/common.tt            | 34 ++--------------------------------
 src/root/jobset.tt            |  7 ++-----
 src/root/product-list.tt      |  2 +-
 src/root/project.tt           |  2 +-
 src/root/static/css/hydra.css |  5 +++++
 7 files changed, 17 insertions(+), 45 deletions(-)

diff --git a/src/root/build.tt b/src/root/build.tt
index 116d0dd2..2c800f03 100644
--- a/src/root/build.tt
+++ b/src/root/build.tt
@@ -64,7 +64,7 @@
 
 <ul class="nav nav-tabs">
   <li class="active"><a href="#tabs-summary" data-toggle="tab">Summary</a></li>
-  <li><a href="#tabs-information" data-toggle="tab">Details</a></li>
+  <li><a href="#tabs-details" data-toggle="tab">Details</a></li>
   <li><a href="#tabs-buildinputs" data-toggle="tab">Build inputs</a></li>
   [% IF relatedbuilds %]<li><a href="#tabs-relatedbuilds" data-toggle="tab">Related builds</a></li>[% END %]
   [% IF build.buildsteps %]<li><a href="#tabs-buildsteps" data-toggle="tab">Build steps</a></li>[% END %]
@@ -78,13 +78,13 @@
 
   <div id="tabs-summary" class="tab-pane active">
 
-    <table class="layoutTable">
+    <table>
       <tr>
         <td>
           [% INCLUDE renderBuildStatusIcon size=128, build=build %]
         </td>
         <td>
-          <table class="layoutTable">
+          <table class="info-table">
             <tr>
               <th>Build ID:</th>
               <td>[% build.id %]</td>
@@ -212,9 +212,9 @@
 
   </div>
 
-  <div id="tabs-information" class="tab-pane">
+  <div id="tabs-details" class="tab-pane">
 
-    <table class="layoutTable">
+    <table class="info-table">
       [% IF build.nixexprinput %]
         <tr>
           <th>Nix expression:</th>
diff --git a/src/root/change-password.tt b/src/root/change-password.tt
index 4a5c359c..d6b8d5da 100644
--- a/src/root/change-password.tt
+++ b/src/root/change-password.tt
@@ -5,7 +5,7 @@
 
 <h2>Change password</h2>
 
-<table class="layoutTable">
+<table class="info-table">
   <tr>
     <th>Enter password:</th>
     <td><input type="password" class="string" id="password" name="password" /></td>
diff --git a/src/root/common.tt b/src/root/common.tt
index ede0f0a8..64536ed7 100644
--- a/src/root/common.tt
+++ b/src/root/common.tt
@@ -156,36 +156,6 @@ END;
 BLOCK renderLink %]<a href="[% uri %]">[% title %]</a>[% END;
 
 
-BLOCK showBuildStats %]
-  <table class="layoutTable">
-    <tr>
-      <th>Finished builds:</th>
-      <td>[% finishedBuilds %]</td>
-    </tr>
-    <tr>
-      <th><img src="/static/images/checkmark_16.png" alt="Succeeded" /> Succeeded builds:</th>
-      <td>[% succeededBuilds %]</td>
-    </tr>
-    <tr>
-      <th><img src="/static/images/error_16.png" alt="Failed" /> Failed builds:</th>
-      <td>[% finishedBuilds - succeededBuilds %]</td>
-    </tr>
-    <tr>
-      <th>Total build time:</th>
-      <td>[% INCLUDE renderDuration duration = totalBuildTime %]</td>
-    </tr>
-    <tr>
-      <th>Scheduled builds:</th>
-      <td>[% scheduledBuilds %]</td>
-    </tr>
-    <tr>
-      <th>Currently executing builds:</th>
-      <td>[% busyBuilds %]</td>
-    </tr>
-  </table>
-[% END;
-
-
 BLOCK renderViewJobName;
   IF job.description; HTML.escape(job.description); ELSE %]<tt>[% job.job %]</tt> ([% job.attrs %])[% END;
 END;
@@ -224,7 +194,7 @@ END;
 
 BLOCK editString; %]
   <input type="text" class="string" [% HTML.attributes(id => param, name => param, value => value) %] />
-END;
+[% END;
 
 
 BLOCK renderFullBuildLink;
@@ -455,7 +425,7 @@ BLOCK renderEvals %]
         </tr>
       [% END;
       IF linkToAll %]
-        <tr><td class="centered" colspan="54"><a href="[% linkToAll %]"><em>More...</em></a></td></tr>
+        <tr><td class="centered" colspan="54"><a href="[% linkToAll %]"><em>All evaluations...</em></a></td></tr>
       [% END %]
     </tbody>
   </table>
diff --git a/src/root/jobset.tt b/src/root/jobset.tt
index 222b8a6f..8b3fedcd 100644
--- a/src/root/jobset.tt
+++ b/src/root/jobset.tt
@@ -54,7 +54,7 @@
 
   <div id="tabs-evaluations" class="tab-pane active">
 
-    <table class="layoutTable">
+    <table class="info-table">
       <tr>
         <th>Last checked:</th>
         <td>
@@ -78,7 +78,6 @@
   <div id="tabs-status" class="tab-pane">
 
     [% IF activeJobsStatus %]
-      <h2>Status</h2>
       <table class="table table-striped table-condensed">
         <thead><tr><th>Job</th>[% FOREACH s IN systems %]<th>[% s.system %]</th>[% END %]</tr></thead>
         <tbody>
@@ -122,7 +121,7 @@
 
   <div id="tabs-setup" class="tab-pane">
 
-    <table class="layoutTable">
+    <table class="info-table">
       <tr>
         <th>Description:</th>
         <td>[% HTML.escape(jobset.description) %]</td>
@@ -158,7 +157,6 @@
   <div id="tabs-jobs" class="tab-pane">
 
     <p>This jobset currently contains the following [% activeJobs.size %] jobs:
-
       <blockquote>
         [% IF activeJobs.size == 0 %]<em>(none)</em>[% END %]
         [% FOREACH j IN activeJobs %][% INCLUDE renderJobName project=project.name jobset=jobset.name job=j %]<br/>[% END %]
@@ -166,7 +164,6 @@
     </p>
 
     <p>This jobset used to contain the following [% inactiveJobs.size %] jobs:
-
       <blockquote>
         [% IF inactiveJobs.size == 0 %]<em>(none)</em>[% END %]
         [% FOREACH j IN inactiveJobs %][% INCLUDE renderJobName project=project.name jobset=jobset.name job=j %]<br/>[% END %]
diff --git a/src/root/product-list.tt b/src/root/product-list.tt
index 61b7c4de..cb12969f 100644
--- a/src/root/product-list.tt
+++ b/src/root/product-list.tt
@@ -2,7 +2,7 @@
 
 [% BLOCK renderProductList %]
 
-  <table class="productList layoutTable">
+  <table class="productList">
 
     [% FOREACH product IN build.buildproducts %]
 
diff --git a/src/root/project.tt b/src/root/project.tt
index dc955d56..4c04e83d 100644
--- a/src/root/project.tt
+++ b/src/root/project.tt
@@ -79,7 +79,7 @@
   </div>
 
   <div id="tabs-settings" class="tab-pane">
-    <table class="layoutTable">
+    <table class="info-table">
       <tr>
         <th>Display name:</th>
         <td>[% HTML.escape(project.displayname) %]</td>
diff --git a/src/root/static/css/hydra.css b/src/root/static/css/hydra.css
index e8d2758f..a7fefe93 100644
--- a/src/root/static/css/hydra.css
+++ b/src/root/static/css/hydra.css
@@ -42,3 +42,8 @@ span.disabled-project, span.disabled-jobset {
 span.hidden-project a, span.hidden-jobset a {
     color: gray;
 }
+
+table.info-table th {
+    padding-right: 1.0em;
+    padding-bottom: 0.2em;
+}