* Merged the Build and Job tables.

src/HydraFrontend/root/build.tt

@@ -1,7 +1,12 @@
 [% WRAPPER layout.tt title="Hydra Overview" %]
 [% USE date %]
 
-<h1>Job <tt>[% build.project.name %]:[% build.attrname %]</tt> build [% id %]</h1>
+<h1>
+  Job <tt>[% build.project.name %]:[% build.attrname %]</tt> build [% id %]
+  [% IF !build.finished %]
+    (scheduled)
+  [% END %]
+</h1>
 
 
 <h2>Information</h2>
@@ -11,6 +16,10 @@
     <th>Build ID:</th>
     <td>[% build.id %]</td>
   </tr>
+  <tr>
+    <th>Time added:</th>
+    <td>[% date.format(build.timestamp, '%Y-%m-%d %H:%M:%S') %]</td>
+  </tr>
   <tr>
     <th>Project:</th>
     <td><a href="[% c.uri_for('/project' build.project.name) %]"><tt>[% build.project.name %]</tt></a></td>
@@ -28,26 +37,8 @@
     <td>[% build.description %]</td>
   </tr>
   <tr>
-    <th>Time added:</th>
-    <td>[% date.format(build.timestamp, '%Y-%m-%d %H:%M:%S') %]</td>
-  </tr>
-  <tr>
-    <th>Build started:</th>
-    <td>[% IF build.starttime %][% date.format(build.starttime, '%Y-%m-%d %H:%M:%S') %][% ELSE %]<em>(cached build)</em>[% END %]</td>
-  </tr>
-  <tr>
-    <th>Build finished:</th>
-    <td>[% IF build.stoptime %][% date.format(build.stoptime, '%Y-%m-%d %H:%M:%S') %][% ELSE %]<em>(cached build)</em>[% END %]</td>
-  </tr>
-  <tr>
-    <th>Duration (seconds):</th>
-    <td>
-      [% IF build.iscachedbuild %]
-        <em>(cached build)</em>
-      [% ELSE %]
-        [% build.stoptime - build.starttime %]
-      [% END %]
-    </td>
+    <th>System:</th>
+    <td><tt>[% build.system %]</tt></td>
   </tr>
   <tr>
     <th>Derivation store path:</th>
@@ -57,20 +48,41 @@
     <th>Output store path:</th>
     <td><tt>[% build.outpath %]</tt></td>
   </tr>
+  [% IF build.finished %]
   <tr>
-    <th>System:</th>
-    <td><tt>[% build.system %]</tt></td>
+    <th>Build started:</th>
+    <td>[% IF build.resultInfo.starttime %][% date.format(build.resultInfo.starttime, '%Y-%m-%d %H:%M:%S') %][% ELSE %]<em>(cached build)</em>[% END %]</td>
+  </tr>
+  <tr>
+    <th>Build finished:</th>
+    <td>[% IF build.resultInfo.stoptime %][% date.format(build.resultInfo.stoptime, '%Y-%m-%d %H:%M:%S') %][% ELSE %]<em>(cached build)</em>[% END %]</td>
+  </tr>
+  <tr>
+    <th>Duration (seconds):</th>
+    <td>
+      [% IF build.resultInfo.iscachedbuild %]
+        <em>(cached build)</em>
+      [% ELSE %]
+        [% build.resultInfo.stoptime - build.resultInfo.starttime %]
+      [% END %]
+    </td>
   </tr>
   <tr>
     <th>Status:</th>
     <td>
-      [% IF build.buildstatus == 0 %]
+      [% IF build.resultInfo.buildstatus == 0 %]
         <img src="/static/images/success.gif" />
       [% ELSE %]
         <img src="/static/images/failure.gif" />
       [% END %]
     </td>
   </tr>
+  [% ELSE %]
+  <tr>
+    <th>Priority:</th>
+    <td>[% build.schedulingInfo.priority %]</td>
+  </tr>
+  [% END %]
 </table>
 
 
@@ -101,6 +113,8 @@
 </table>
 
 
+[% IF build.finished %]
+
 <h2>Build products</h2>
 
 <ul class="productList">
@@ -167,3 +181,6 @@
 
 [% END %]
 
+
+[% END %]
+

src/HydraFrontend/root/index.tt

@@ -8,15 +8,15 @@
     <tr><th>#</th><th>Priority</th><th>Project</th><th>Job</th><th>System</th><th>Timestamp</th><th>Description</th></tr>
   </thead>
   <tbody>
-    [% FOREACH job IN jobs -%]
-      <tr [% IF job.busy %]class="runningJob"[% END %] >
-        <td>[% job.id %]</td>
-        <td>[% job.priority %]</td>
-        <td><tt>[% job.project.name %]</tt></td>
-        <td><tt>[% job.jobset.name %]</tt></td>
-        <td><tt>[% job.system %]</tt></td>
-        <td>[% date.format(job.timestamp, '%Y-%m-%d %H:%M:%S') %]</td>
-        <td>[% job.description %]</td>
+    [% FOREACH build IN scheduled -%]
+      <tr [% IF build.schedulingInfo.busy %]class="runningJob"[% END %] >
+        <td><a href="[% c.uri_for('/build' build.id) %]">[% build.id %]</a></td>
+        <td>[% build.schedulingInfo.priority %]</td>
+        <td><tt>[% build.project.name %]</tt></td>
+        <td><tt>[% build.jobset.name %]</tt></td>
+        <td><tt>[% build.system %]</tt></td>
+        <td>[% date.format(build.timestamp, '%Y-%m-%d %H:%M:%S') %]</td>
+        <td>[% build.description %]</td>
       </tr>
     [% END -%]
   </tbody>

src/HydraFrontend/root/short-build-info.tt

@@ -2,7 +2,7 @@
 
 <tr>
   <td>
-    [% IF build.buildstatus == 0 %]
+    [% IF build.resultInfo.buildstatus == 0 %]
       <img src="/static/images/success.gif" />
     [% ELSE %]
       <img src="/static/images/failure.gif" />