In build tables, hide the project, jobset and/or job name if they're constant

This commit is contained in:
Eelco Dolstra 2012-04-02 13:12:39 +02:00
parent 1904f82f06
commit 0aae52bfcc
7 changed files with 15 additions and 15 deletions

View file

@ -22,11 +22,8 @@ out of [% totalBuilds %] in order of descending timestamp.</p>
</p> </p>
[% END %] [% END %]
[% INCLUDE renderNav %] [% INCLUDE renderNav %]
[% INCLUDE renderBuildList %] [% INCLUDE renderBuildList hideProjectName=project hideJobsetName=jobset hideJobName=job %]
[% INCLUDE renderNav %] [% INCLUDE renderNav %]
[% END %] [% END %]

View file

@ -436,10 +436,9 @@
[% IF relatedbuilds %] [% IF relatedbuilds %]
<div id="tabs-relatedbuilds"> <div id="tabs-relatedbuilds">
<h2>Related builds</h2> <h2>Related builds</h2>
<p>The following builds are part of the same jobset evaluation that produced this build.</p> <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> </div>
[% END %] [% END %]

View file

@ -45,10 +45,8 @@
[%- BLOCK renderFullJobName -%] [%- BLOCK renderFullJobName -%]
<tt> <tt>[% IF !hideProjectName; INCLUDE renderProjectName %]:[% END; IF !hideJobsetName; INCLUDE renderJobsetName %]:[% END; INCLUDE renderJobName %]</tt>
[% INCLUDE renderProjectName %]:[% INCLUDE renderJobsetName %]:[% INCLUDE renderJobName %] [%- END %]
</tt>
[% END %]
[%- BLOCK renderFullJobNameOfBuild -%] [%- BLOCK renderFullJobNameOfBuild -%]
@ -76,7 +74,9 @@
<th></th> <th></th>
<th>P</th> <th>P</th>
[%- END -%] [%- END -%]
[%- IF !hideJobName -%]
<th>Job</th> <th>Job</th>
[%- END -%]
<th>Release Name</th> <th>Release Name</th>
<th>System</th> <th>System</th>
<th>Timestamp</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>[% 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> <td>[% build.priority %]</td>
[%- END -%] [%- END -%]
[%- IF !hideJobName -%]
<td>[%- INCLUDE renderFullJobNameOfBuild -%]</td> <td>[%- INCLUDE renderFullJobNameOfBuild -%]</td>
[%- END -%]
<td>[% !showSchedulingInfo and build.get_column('releasename') ? build.get_column('releasename') : build.nixname %]</td> <td>[% !showSchedulingInfo and build.get_column('releasename') ? build.get_column('releasename') : build.nixname %]</td>
<td><tt>[% build.system %]</tt></td> <td><tt>[% build.system %]</tt></td>
<td>[% date.format(build.timestamp, '%Y-%m-%d %H:%M:%S') %]</td> <td>[% date.format(build.timestamp, '%Y-%m-%d %H:%M:%S') %]</td>

View file

@ -67,7 +67,7 @@ that dont build.</p>
<h2>Broken builds</h2> <h2>Broken builds</h2>
[% INCLUDE renderBuildList builds=brokenBuilds showStatusChange=1 %] [% INCLUDE renderBuildList builds=brokenBuilds showStatusChange=1 hideProjectName=project hideJobsetName=jobset hideJobName=job %]
[% END %] [% END %]

View file

@ -1,5 +1,6 @@
[% WRAPPER layout.tt title="Job $project.name:$jobset.name:$job.name" %] [% WRAPPER layout.tt title="Job $project.name:$jobset.name:$job.name" %]
[% PROCESS common.tt %] [% PROCESS common.tt %]
[% hideProjectName=1 hideJobsetName=1 hideJobName=1 %]
<h1>Job <tt>[% INCLUDE renderLink <h1>Job <tt>[% INCLUDE renderLink
@ -17,7 +18,7 @@
<!-- <li><a href="#tabs-statistics">Statistics</a></li> --> <!-- <li><a href="#tabs-statistics">Statistics</a></li> -->
</ul> </ul>
<div id="tabs-status"> <div id="tabs-status">
[% IF currentBuilds.size == 0 %] [% IF currentBuilds.size != 0 %]
<h2>Latest builds (latest evaluation)</h2> <h2>Latest builds (latest evaluation)</h2>
[% INCLUDE renderBuildList builds=currentBuilds showStatusChange=0 %] [% INCLUDE renderBuildList builds=currentBuilds showStatusChange=0 %]
[% END %] [% END %]

View file

@ -101,7 +101,7 @@
[% IF lastBuilds %] [% IF lastBuilds %]
<h2>Most recent builds</h2> <h2>Most recent builds</h2>
[% INCLUDE renderBuildList builds=lastBuilds %] [% INCLUDE renderBuildList builds=lastBuilds hideProjectName=1 hideJobsetName=1 %]
[% END %] [% END %]
[% IF !edit && activeJobsStatus -%] [% IF !edit && activeJobsStatus -%]

View file

@ -1,13 +1,14 @@
[% WRAPPER layout.tt title="Job Status" %] [% WRAPPER layout.tt title="Job Status" %]
[% PROCESS common.tt %] [% 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 <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 change time (the timestamp of the last build that had a different
build result status). That is, it shows the jobs that most recently build result status). That is, it shows the jobs that most recently
changed from failed to successful or vice versa first.</p> 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 %] [% END %]