lix-project/hydra
3
0
Fork 6
Code Issues 2 Pull requests 1 Packages Projects Releases Wiki Activity

Remove unnecessary whitespace in the HTML output

Browse source
This commit is contained in:
Eelco Dolstra 2011-11-29 20:15:42 +01:00
parent 69e9a91bcb
commit d37c4cfe86
1 changed files with 66 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

130
src/root/common.tt
View file

@ -1,9 +1,9 @@
[% USE date %] [%- USE date -%]
[% USE String %] [%- USE String -%]
[% USE HTML %] [%- USE HTML -%]
[% inputTypes = [%- inputTypes =
{ "svn" = "Subversion export" { "svn" = "Subversion export"
, "svn-checkout" = "Subversion checkout" , "svn-checkout" = "Subversion checkout"
, "bzr" = "Bazaar export" , "bzr" = "Bazaar export"
@ -17,46 +17,46 @@
, "build" = "Build output" , "build" = "Build output"
, "sysbuild" = "Build output (same system)" , "sysbuild" = "Build output (same system)"
} }
%] -%]
[% BLOCK renderDateTime %] [%- BLOCK renderDateTime -%]
[% date.format(timestamp, '%Y-%m-%d %H:%M:%S') -%] [% date.format(timestamp, '%Y-%m-%d %H:%M:%S') -%]
[% END %] [%- END -%]
[% BLOCK renderProjectName -%] [%- BLOCK renderProjectName -%]
<a href="[% c.uri_for('/project' project) %]"><tt>[% project %]</tt></a>[% END -%] <a href="[% c.uri_for('/project' project) %]"><tt>[% project %]</tt></a>[% END -%]
[% BLOCK renderJobsetName -%] [%- BLOCK renderJobsetName -%]
<a href="[% c.uri_for('/jobset' project jobset) %]"><tt>[% jobset %]</tt></a>[% END -%] <a href="[% c.uri_for('/jobset' project jobset) %]"><tt>[% jobset %]</tt></a>[% END -%]
[% BLOCK renderJobName -%] [%- BLOCK renderJobName -%]
<a href="[% c.uri_for('/job' project jobset job) %]"><tt>[% job %]</tt></a>[% END -%] <a href="[% c.uri_for('/job' project jobset job) %]"><tt>[% job %]</tt></a>[% END -%]
[% BLOCK renderFullJobsetName %] [%- BLOCK renderFullJobsetName -%]
<tt> <tt>
[% INCLUDE renderProjectName %]:[% INCLUDE renderJobsetName %] [% INCLUDE renderProjectName %]:[% INCLUDE renderJobsetName %]
</tt> </tt>
[% END %] [% END %]
[% BLOCK renderFullJobName %] [%- BLOCK renderFullJobName -%]
<tt> <tt>
[% INCLUDE renderProjectName %]:[% INCLUDE renderJobsetName %]:[% INCLUDE renderJobName %] [% INCLUDE renderProjectName %]:[% INCLUDE renderJobsetName %]:[% INCLUDE renderJobName %]
</tt> </tt>
[% END %] [% END %]
[% BLOCK renderFullJobNameOfBuild %] [%- BLOCK renderFullJobNameOfBuild -%]
[% INCLUDE renderFullJobName project=build.get_column("project") jobset = build.get_column("jobset") job = build.get_column("job") %] [% INCLUDE renderFullJobName project=build.get_column("project") jobset = build.get_column("jobset") job = build.get_column("job") %]
[% END %] [% END %]
[% BLOCK renderDuration -%] [%- BLOCK renderDuration -%]
[% IF duration >= 24 * 60 * 60 %][% duration div (24 * 60 * 60) %]d[% END %] [% IF duration >= 24 * 60 * 60 %][% duration div (24 * 60 * 60) %]d[% END %]
[% IF duration >= 60 * 60 %][% duration div (60 * 60) % 24 %]h[% END %] [% IF duration >= 60 * 60 %][% duration div (60 * 60) % 24 %]h[% END %]
[% IF duration >= 60 %][% duration div 60 % 60 %]m[% END %] [% IF duration >= 60 %][% duration div 60 % 60 %]m[% END %]
@ -64,79 +64,77 @@
[% END %] [% END %]
[% BLOCK renderBuildList %] [%- BLOCK renderBuildList -%]
<table class="buildList tablesorter[% IF !showSchedulingInfo %] clean[% END %]"> <table class="buildList tablesorter[% IF !showSchedulingInfo %] clean[% END %]">
<thead> <thead>
<tr> <tr>
[% IF !hideResultInfo %] [%- IF !hideResultInfo -%]
<th></th> <th></th>
[% END %] [% END %]
<th>#</th> <th>#</th>
[% IF showSchedulingInfo %] [%- IF showSchedulingInfo -%]
<th></th> <th></th>
<th>P</th> <th>P</th>
[% END %] [%- END -%]
<th>Job</th> <th>Job</th>
<th>Release Name</th> <th>Release Name</th>
<th>System</th> <th>System</th>
<th>Timestamp</th> <th>Timestamp</th>
[% IF showStatusChange %] [%- IF showStatusChange -%]
<th class="headerSortUp">Last status change</th> <th class="headerSortUp">Last status change</th>
[% END %] [%- END -%]
[% IF showDescription %] [%- IF showDescription -%]
<th>Description</th> <th>Description</th>
[% END %] [%- END -%]
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
[% odd = 0 %] [%- odd = 0 -%]
[% FOREACH build IN builds -%] [%- FOREACH build IN builds -%]
<tr class="clickable <tr class="clickable
[% IF showSchedulingInfo -%] [%- IF showSchedulingInfo -%]
[% IF build.get_column('busy') %]runningBuild[% ELSIF build.get_column('disabled') == 1 || build.get_column('enabled') == 0 %]disabledBuild[% END %] [%- IF build.get_column('busy') %]runningBuild[% ELSIF build.get_column('disabled') == 1 || build.get_column('enabled') == 0 %]disabledBuild[% END -%]
[% ELSE -%] [%- ELSE -%]
[% IF odd %] odd [% END; odd = !odd -%] [%- IF odd %] odd [% END; odd = !odd -%]
[% END %]" [%- END %]"
onclick="if(event.which == 2) return true; window.location = '[% c.uri_for('/build' build.id) %]'"> onclick="if(event.which == 2) return true; window.location = '[% c.uri_for('/build' build.id) %]'">
[% IF !hideResultInfo %] [%- IF !hideResultInfo -%]
<td> <td>
[% INCLUDE renderBuildStatusIcon size=16 busy=(showSchedulingInfo ? 1 : 0) buildstatus=build.get_column('buildStatus') %] [%- INCLUDE renderBuildStatusIcon size=16 busy=(showSchedulingInfo ? 1 : 0) buildstatus=build.get_column('buildStatus') -%]
</td> </td>
[% END %] [%- END -%]
<td><a href="[% c.uri_for('/build' build.id) %]">[% build.id %]</a></td> <td><a href="[% c.uri_for('/build' build.id) %]">[% build.id %]</a></td>
[% IF showSchedulingInfo %] [%- IF showSchedulingInfo -%]
<td>[% IF build.get_column('busy') %]<img src="/static/images/running.gif" alt="Running" />[% ELSIF build.get_column('disabled') == 1 || build.get_column('enabled') == 0 %]Disabled[% END %]</td> <td>[% IF build.get_column('busy') %]<img src="/static/images/running.gif" alt="Running" />[% ELSIF build.get_column('disabled') == 1 || build.get_column('enabled') == 0 %]Disabled[% END %]</td>
<td>[% build.get_column('priority') %]</td> <td>[% build.get_column('priority') %]</td>
[% END %] [%- END -%]
<td> <td>[%- INCLUDE renderFullJobNameOfBuild -%]</td>
[% INCLUDE renderFullJobNameOfBuild %]
</td>
<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>
[% IF showStatusChange %] [%- IF showStatusChange -%]
<td> <td>
[% IF build.get_column('statusChangeTime') %] [%- IF build.get_column('statusChangeTime') -%]
<a href="[% c.uri_for('/build' build.get_column('statusChangeId')) %]"> <a href="[% c.uri_for('/build' build.get_column('statusChangeId')) %]">
[% date.format(build.get_column('statusChangeTime'), '%Y-%m-%d %H:%M:%S') %] [% date.format(build.get_column('statusChangeTime'), '%Y-%m-%d %H:%M:%S') %]
</a> </a>
[% ELSE %] [%- ELSE -%]
<em>never</em> <em>never</em>
[% END %] [%- END -%]
</td> </td>
[% END %] [%- END -%]
[% IF showDescription %] [%- IF showDescription -%]
<td>[% build.description %]</td> <td>[% build.description %]</td>
[% END -%] [%- END -%]
</tr> </tr>
[% END -%] [%- END -%]
</tbody> </tbody>
</table> </table>
[% END %] [%- END -%]
[% BLOCK renderLink %]<a href="[% uri %]">[% title %]</a>[% END %] [%- BLOCK renderLink -%]<a href="[% uri %]">[% title %]</a>[%- END -%]
[% BLOCK showBuildStats %] [%- BLOCK showBuildStats -%]
<table class="layoutTable"> <table class="layoutTable">
<tr> <tr>
@ -165,7 +163,7 @@
</tr> </tr>
</table> </table>
[% END %] [%- END -%]
[% BLOCK renderViewJobName -%] [% BLOCK renderViewJobName -%]
@ -203,32 +201,32 @@
[% INCLUDE renderFullJobNameOfBuild build=build %] <a href="[% c.uri_for('/build' build.id) %]">build [% build.id %]</a>[% -%] [% INCLUDE renderFullJobNameOfBuild build=build %] <a href="[% c.uri_for('/build' build.id) %]">build [% build.id %]</a>[% -%]
[% END %] [% END %]
[% BLOCK renderBuildStatusIcon %] [%- BLOCK renderBuildStatusIcon -%]
[% finished = build != undef ? build.finished : 1 %] [%- finished = build != undef ? build.finished : 1 -%]
[% busy = busy != undef ? busy : build.schedulingInfo.busy %] [%- busy = busy != undef ? busy : build.schedulingInfo.busy -%]
[% buildstatus = buildstatus != undef ? buildstatus : build.resultInfo.buildstatus %] [%- buildstatus = buildstatus != undef ? buildstatus : build.resultInfo.buildstatus -%]
[% IF finished %] [%- IF finished -%]
[% IF buildstatus == 0 %] [%- IF buildstatus == 0 -%]
<img src="/static/images/checkmark_[% size %].png" alt="Succeeded" /> <img src="/static/images/checkmark_[% size %].png" alt="Succeeded" />
[% ELSIF buildstatus == 1 %] [%- ELSIF buildstatus == 1 -%]
<img src="/static/images/error_[% size %].png" alt="Failed" /> <img src="/static/images/error_[% size %].png" alt="Failed" />
[% ELSIF buildstatus == 2 %] [%- ELSIF buildstatus == 2 -%]
<img src="/static/images/dependency_[% size %].png" alt="Dependency failed" /> <img src="/static/images/dependency_[% size %].png" alt="Dependency failed" />
[% ELSIF buildstatus == 4 %] [%- ELSIF buildstatus == 4 -%]
<img src="/static/images/error_[% size %].png" alt="Failed" /> <img src="/static/images/error_[% size %].png" alt="Failed" />
[% ELSIF buildstatus == 5 %] [%- ELSIF buildstatus == 5 -%]
<img src="/static/images/error_[% size %].png" alt="Failed" /> <img src="/static/images/error_[% size %].png" alt="Failed" />
[% ELSIF buildstatus == 6 %] [%- ELSIF buildstatus == 6 -%]
<img src="/static/images/error_[% size %].png" alt="Failed (with result)" /> <img src="/static/images/error_[% size %].png" alt="Failed (with result)" />
[% ELSE %] [%- ELSE -%]
<img src="/static/images/error_[% size %].png" alt="Failed" /> <img src="/static/images/error_[% size %].png" alt="Failed" />
[% END %] [%- END -%]
[% ELSIF busy %] [%- ELSIF busy -%]
<img src="/static/images/help_[% size %].png" alt="Busy" /> <img src="/static/images/help_[% size %].png" alt="Busy" />
[% ELSE %] [%- ELSE -%]
<img src="/static/images/help_[% size %].png" alt="Scheduled" /> <img src="/static/images/help_[% size %].png" alt="Scheduled" />
[% END %] [%- END -%]
[% END %] [%- END -%]
[% BLOCK renderStatus %] [% BLOCK renderStatus %]
[% IF build.finished %] [% IF build.finished %]