From 0aae52bfcc4153cee7a0645fe3ead527655e5715 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 2 Apr 2012 13:12:39 +0200
Subject: [PATCH] In build tables, hide the project, jobset and/or job name if
 they're constant

---
 src/root/all.tt       |  5 +----
 src/root/build.tt     |  3 +--
 src/root/common.tt    | 10 ++++++----
 src/root/errors.tt    |  2 +-
 src/root/job.tt       |  3 ++-
 src/root/jobset.tt    |  2 +-
 src/root/jobstatus.tt |  5 +++--
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/root/all.tt b/src/root/all.tt
index 4503facc8..746b16c8b 100644
--- a/src/root/all.tt
+++ b/src/root/all.tt
@@ -22,11 +22,8 @@ out of [% totalBuilds %] in order of descending timestamp.</p>
 </p>
 [% END %]
 
-
 [% INCLUDE renderNav %]
-[% INCLUDE renderBuildList %]
+[% INCLUDE renderBuildList hideProjectName=project hideJobsetName=jobset hideJobName=job %]
 [% INCLUDE renderNav %]
 
-
-
 [% END %]
diff --git a/src/root/build.tt b/src/root/build.tt
index 3a9fdd35c..0abc96f59 100644
--- a/src/root/build.tt
+++ b/src/root/build.tt
@@ -436,10 +436,9 @@
 
         [% IF relatedbuilds %]
 	<div id="tabs-relatedbuilds">
-		
 		<h2>Related builds</h2>
 		<p>The following builds are part of the same jobset evaluation that produced this build.</p>
-		[% INCLUDE renderBuildList builds=relatedbuilds%]
+		[% INCLUDE renderBuildList builds=relatedbuilds hideProjectName=1 hideJobsetName=1 %]
 	</div>
         [% END %]
 
diff --git a/src/root/common.tt b/src/root/common.tt
index 4ed948cff..48fd4e3ac 100644
--- a/src/root/common.tt
+++ b/src/root/common.tt
@@ -45,10 +45,8 @@
 
 
 [%- BLOCK renderFullJobName -%]
-  <tt>
-  [% INCLUDE renderProjectName %]:[% INCLUDE renderJobsetName %]:[% INCLUDE renderJobName %]
-  </tt>
-[% END %]
+<tt>[% IF !hideProjectName; INCLUDE renderProjectName %]:[% END; IF !hideJobsetName; INCLUDE renderJobsetName %]:[% END; INCLUDE renderJobName %]</tt>
+[%- END %]
 
 
 [%- BLOCK renderFullJobNameOfBuild -%]
@@ -76,7 +74,9 @@
           <th></th>
           <th>P</th>
         [%- END -%]
+        [%- IF !hideJobName -%]
         <th>Job</th>
+        [%- END -%]
         <th>Release Name</th>
         <th>System</th>
         <th>Timestamp</th>
@@ -108,7 +108,9 @@
             <td>[% IF build.busy %]<img src="/static/images/running.gif" alt="Running" />[% ELSIF build.disabled == 1 || build.get_column('enabled') == 0 %]Disabled[% END %]</td>
             <td>[% build.priority %]</td>
           [%- END -%]
+          [%- IF !hideJobName -%]
           <td>[%- INCLUDE renderFullJobNameOfBuild -%]</td>
+          [%- END -%]
           <td>[% !showSchedulingInfo and build.get_column('releasename') ? build.get_column('releasename') : build.nixname %]</td>
           <td><tt>[% build.system %]</tt></td>
           <td>[% date.format(build.timestamp, '%Y-%m-%d %H:%M:%S') %]</td>
diff --git a/src/root/errors.tt b/src/root/errors.tt
index abf14a3fc..0a145213e 100644
--- a/src/root/errors.tt
+++ b/src/root/errors.tt
@@ -67,7 +67,7 @@ that don’t build.</p>
 
 <h2>Broken builds</h2>
 
-[% INCLUDE renderBuildList builds=brokenBuilds showStatusChange=1 %]
+[% INCLUDE renderBuildList builds=brokenBuilds showStatusChange=1 hideProjectName=project hideJobsetName=jobset hideJobName=job %]
 
 [% END %]
 
diff --git a/src/root/job.tt b/src/root/job.tt
index 38bec904e..dee036023 100644
--- a/src/root/job.tt
+++ b/src/root/job.tt
@@ -1,5 +1,6 @@
 [% WRAPPER layout.tt title="Job ‘$project.name:$jobset.name:$job.name’" %]
 [% PROCESS common.tt %]
+[% hideProjectName=1 hideJobsetName=1 hideJobName=1 %]
 
 
 <h1>Job <tt>[% INCLUDE renderLink
@@ -17,7 +18,7 @@
 		<!-- <li><a href="#tabs-statistics">Statistics</a></li> -->
 	</ul>
 	<div id="tabs-status">
-            [% IF currentBuilds.size == 0 %]
+            [% IF currentBuilds.size != 0 %]
 	        <h2>Latest builds (latest evaluation)</h2>
   	        [% INCLUDE renderBuildList builds=currentBuilds showStatusChange=0 %]
             [% END %]
diff --git a/src/root/jobset.tt b/src/root/jobset.tt
index acfbf3a67..c1af79929 100644
--- a/src/root/jobset.tt
+++ b/src/root/jobset.tt
@@ -101,7 +101,7 @@
 	    
 	    [% IF lastBuilds %]
 	    	<h2>Most recent builds</h2>
-	    	[% INCLUDE renderBuildList builds=lastBuilds %]
+	    	[% INCLUDE renderBuildList builds=lastBuilds hideProjectName=1 hideJobsetName=1 %]
 	    [% END %]
 	
 		[% IF !edit && activeJobsStatus -%]
diff --git a/src/root/jobstatus.tt b/src/root/jobstatus.tt
index 98881d9f6..e39447e19 100644
--- a/src/root/jobstatus.tt
+++ b/src/root/jobstatus.tt
@@ -1,13 +1,14 @@
 [% WRAPPER layout.tt title="Job Status" %]
 [% PROCESS common.tt %]
 
-<h1>Job Status[% IF project %] of Project <tt>[% project.name %][% IF jobset %]:[% jobset.name%][% END %]</tt>[% END %]</h1>
+<h1>Job Status[% IF project %] of <tt>[% project.name %][% IF jobset %]:[% jobset.name%][% END %][% IF job %]:[% job.name%][% END %]</tt>[% END %]</h1>
 
 <p>Below are the latest builds for each job.  It is ordered by the status
 change time (the timestamp of the last build that had a different
 build result status).  That is, it shows the jobs that most recently
 changed from failed to successful or vice versa first.</p>
 
-[% INCLUDE renderBuildList builds=latestBuilds showStatusChange=1 %]
+[% INCLUDE renderBuildList builds=latestBuilds showStatusChange=1
+     hideProjectName=project hideJobsetName=jobset hideJobName=job %]
 
 [% END %]