Skip to content

Commit

Permalink
In build tables, hide the project, jobset and/or job name if they're …
Browse files Browse the repository at this point in the history
…constant
  • Loading branch information
edolstra committed Apr 2, 2012
1 parent 1904f82 commit 0aae52b
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 15 deletions.
5 changes: 1 addition & 4 deletions src/root/all.tt
Expand Up @@ -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 %]
3 changes: 1 addition & 2 deletions src/root/build.tt
Expand Up @@ -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 %]

Expand Down
10 changes: 6 additions & 4 deletions src/root/common.tt
Expand Up @@ -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 -%]
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/root/errors.tt
Expand Up @@ -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 %]

Expand Down
3 changes: 2 additions & 1 deletion 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
Expand All @@ -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 %]
Expand Down
2 changes: 1 addition & 1 deletion src/root/jobset.tt
Expand Up @@ -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 -%]
Expand Down
5 changes: 3 additions & 2 deletions 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 %]

0 comments on commit 0aae52b

Please sign in to comment.