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

Fix indentation and get rid of some unnecessary whitespace in the output

Browse source
This commit is contained in:
Eelco Dolstra 2013-02-14 17:51:09 +01:00
parent 2fa1a7efa7
commit 5620e3c386
1 changed files with 319 additions and 305 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

342
src/root/common.tt
View file

@ -1,9 +1,10 @@
[% USE date %] [%
[% USE String %] USE date;
[% USE HTML %] USE String;
USE HTML;
[% inputTypes = inputTypes =
{ "svn" = "Subversion export" { "svn" = "Subversion export"
, "svn-checkout" = "Subversion checkout" , "svn-checkout" = "Subversion checkout"
, "bzr" = "Bazaar export" , "bzr" = "Bazaar export"
@ -15,51 +16,52 @@
, "path" = "Local path" , "path" = "Local path"
, "build" = "Build output" , "build" = "Build output"
, "sysbuild" = "Build output (same system)" , "sysbuild" = "Build output (same system)"
} };
%]
BLOCK renderDateTime;
date.format(timestamp, '%Y-%m-%d %H:%M:%S');
END;
[% BLOCK renderDateTime %] BLOCK renderProjectName %]
[% date.format(timestamp, '%Y-%m-%d %H:%M:%S') %] <a href="[% c.uri_for('/project' project) %]"><tt>[% project %]</tt></a>
[% END %] [% END;
[% BLOCK renderProjectName %] BLOCK renderJobsetName %]
<a href="[% c.uri_for('/project' project) %]"><tt>[% project %]</tt></a>[% END %] <a href="[% c.uri_for('/jobset' project jobset) %]"><tt>[% jobset %]</tt></a>
[% END;
[% BLOCK renderJobsetName %] BLOCK renderJobName %]
<a href="[% c.uri_for('/jobset' project jobset) %]"><tt>[% jobset %]</tt></a>[% END %] <a href="[% c.uri_for('/job' project jobset job) %]"><tt>[% job %]</tt></a>
[% END;
[% BLOCK renderJobName %] BLOCK renderFullJobsetName %]
<a href="[% c.uri_for('/job' project jobset job) %]"><tt>[% job %]</tt></a>[% END %]
[% BLOCK renderFullJobsetName %]
<tt>[% INCLUDE renderProjectName %]:[% INCLUDE renderJobsetName %]</tt> <tt>[% INCLUDE renderProjectName %]:[% INCLUDE renderJobsetName %]</tt>
[% END %] [% END;
[% BLOCK renderFullJobName %] BLOCK renderFullJobName %]
<tt>[% IF !hideProjectName; INCLUDE renderProjectName %]:[% END; IF !hideJobsetName; INCLUDE renderJobsetName %]:[% END; INCLUDE renderJobName %]</tt> <tt>[% IF !hideProjectName; INCLUDE renderProjectName %]:[% END; IF !hideJobsetName; INCLUDE renderJobsetName %]:[% END; INCLUDE renderJobName %]</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;
[% duration % 60 %]s duration % 60 %]s[%
[% END %] END;
[% BLOCK renderBuildListHeader %] BLOCK renderBuildListHeader %]
<table class="buildList table table-striped table-condensed [% IF !unsortable %]tablesorter[% END %] [% IF !showSchedulingInfo %] clean[% END %]"> <table class="buildList table table-striped table-condensed [% IF !unsortable %]tablesorter[% END %] [% IF !showSchedulingInfo %] clean[% END %]">
<thead> <thead>
<tr> <tr>
@ -88,11 +90,12 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
[% END %] [% END;
[% BLOCK renderBuildListBody %]
[% odd = 0 %] BLOCK renderBuildListBody;
[% FOREACH build IN builds %] odd = 0;
FOREACH build IN builds; %]
<tr class="clickable <tr class="clickable
[% IF showSchedulingInfo %] [% IF showSchedulingInfo %]
[% IF build.busy %]runningBuild[% ELSIF build.disabled == 1 || build.get_column('enabled') == 0 %]disabledBuild[% END %] [% IF build.busy %]runningBuild[% ELSIF build.disabled == 1 || build.get_column('enabled') == 0 %]disabledBuild[% END %]
@ -133,25 +136,27 @@
<td>[% build.description %]</td> <td>[% build.description %]</td>
[% END %] [% END %]
</tr> </tr>
[% END %] [% END;
[% END %] END;
[% BLOCK renderBuildListFooter %]
BLOCK renderBuildListFooter %]
</tbody> </tbody>
</table> </table>
[% END %] [% END;
[% BLOCK renderBuildList %]
[% INCLUDE renderBuildListHeader %]
[% INCLUDE renderBuildListBody %]
[% INCLUDE renderBuildListFooter %]
[% END %]
[% BLOCK renderLink %]<a href="[% uri %]">[% title %]</a>[% END %] BLOCK renderBuildList;
INCLUDE renderBuildListHeader;
INCLUDE renderBuildListBody;
INCLUDE renderBuildListFooter;
END;
[% BLOCK showBuildStats %]
BLOCK renderLink %]<a href="[% uri %]">[% title %]</a>[% END;
BLOCK showBuildStats %]
<table class="layoutTable"> <table class="layoutTable">
<tr> <tr>
<th>Finished builds:</th> <th>Finished builds:</th>
@ -178,26 +183,27 @@
<td>[% busyBuilds %]</td> <td>[% busyBuilds %]</td>
</tr> </tr>
</table> </table>
[% END;
[% END %]
[% BLOCK renderViewJobName %] BLOCK renderViewJobName;
[% IF job.description; HTML.escape(job.description); ELSE %]<tt>[% job.job %]</tt> ([% job.attrs %])[% END %] IF job.description; HTML.escape(job.description); ELSE %]<tt>[% job.job %]</tt> ([% job.attrs %])[% END;
[% END %] END;
[% BLOCK maybeLink %] BLOCK maybeLink;
[% IF uri %]<a [% HTML.attributes(href => uri, class => class) %][% IF confirmmsg %]onclick="javascript:return confirm('[% confirmmsg %]')"[% END %]>[% content %]</a>[% ELSE; content; END %] IF uri %]<a [% HTML.attributes(href => uri, class => class) %][% IF confirmmsg %]onclick="javascript:return confirm('[% confirmmsg %]')"[% END %]>[% content %]</a>[% ELSE; content; END;
[% END %] END;
[% BLOCK maybeButton %]
[% IF uri %]<a class="btn btn-mini" [% HTML.attributes(href => uri) %][% IF confirmmsg %]onclick="javascript:return confirm('[% confirmmsg %]')"[% END %]>[% content %]</a>[% ELSE; content; END %]
[% END %]
[% BLOCK renderSelection %] BLOCK maybeButton;
[% IF edit %] IF uri %]<a class="btn btn-mini" [% HTML.attributes(href => uri); IF confirmmsg %]onclick="javascript:return confirm('[% confirmmsg %]')"[% END; content %]</a>[% ELSE; content; END;
[% IF radiobuttons %] END;
BLOCK renderSelection;
IF edit;
IF radiobuttons; %]
<div class="controls"> <div class="controls">
[% FOREACH name IN options.keys.sort %] [% FOREACH name IN options.keys.sort %]
<label class="radio inline"> <label class="radio inline">
@ -214,31 +220,33 @@
<option [% HTML.attributes(value => name) %] [% IF name == curValue; "selected='selected'"; END %]>[% options.$name %]</option> <option [% HTML.attributes(value => name) %] [% IF name == curValue; "selected='selected'"; END %]>[% options.$name %]</option>
[% END %] [% END %]
</select> </select>
[% END %] [% END;
[% ELSE %] ELSE;
[% options.$curValue %] options.$curValue;
[% END %] END;
[% END %] END;
[% BLOCK maybeEditString; BLOCK maybeEditString;
IF edit %] IF edit %]
<input type="text" class="string [% extraClass %]" [% HTML.attributes(id => param, name => param, value => value) %] /> <input type="text" class="string [% extraClass %]" [% HTML.attributes(id => param, name => param, value => value) %] />
[% ELSE; [% ELSE;
HTML.escape(value); HTML.escape(value);
END %] END;
[% END %] END;
[% BLOCK renderFullBuildLink %]
[% INCLUDE renderFullJobNameOfBuild build=build %] <a href="[% c.uri_for('/build' build.id) %]">build [% build.id %]</a>[% %]
[% END %]
[% BLOCK renderBuildStatusIcon %] BLOCK renderFullBuildLink;
[% finished = build != undef ? build.finished : 1 %] INCLUDE renderFullJobNameOfBuild build=build %] <a href="[% c.uri_for('/build' build.id) %]">build [% build.id %]</a>[%
[% busy = busy != undef ? busy : build.busy %] END;
[% buildstatus = buildstatus != undef ? buildstatus : build.buildstatus %]
[% IF finished %]
[% IF buildstatus == 0 %] BLOCK renderBuildStatusIcon;
finished = build != undef ? build.finished : 1;
busy = busy != undef ? busy : build.busy;
buildstatus = buildstatus != undef ? buildstatus : build.buildstatus;
IF finished;
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" />
@ -252,19 +260,20 @@
<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 %]
[% IF build.finished %] BLOCK renderStatus;
[% buildstatus = build.buildstatus %] IF build.finished;
[% IF icon; INCLUDE renderBuildStatusIcon size=16; END %] buildstatus = build.buildstatus;
[% IF buildstatus == 0 %] IF icon; INCLUDE renderBuildStatusIcon size=16; END;
IF buildstatus == 0 %]
<strong>Success</strong> <strong>Success</strong>
[% ELSIF buildstatus == 1 %] [% ELSIF buildstatus == 1 %]
<span class="error">Build returned a non-zero exit code</span> <span class="error">Build returned a non-zero exit code</span>
@ -279,74 +288,78 @@
[% ELSE %] [% ELSE %]
<span class="error">Build failed</span> <span class="error">Build failed</span>
(see <a href="#nix-error">below</a>) (see <a href="#nix-error">below</a>)
[% END %] [% END;
[% ELSIF build.busy %] ELSIF build.busy %]
<strong>Build in progress</strong> <strong>Build in progress</strong>
since [% INCLUDE renderDateTime timestamp = build.starttime %] since [% INCLUDE renderDateTime timestamp = build.starttime;
[% ELSE %] ELSE %]
<strong>Scheduled to be built</strong> <strong>Scheduled to be built</strong>
[% END %] [% END;
[% END %] END;
[% BLOCK renderInputValue %]
[% IF input.type == "build" || input.type == "sysbuild" %] BLOCK renderInputValue;
[% INCLUDE renderFullBuildLink build=input.dependency %]</a> IF input.type == "build" || input.type == "sysbuild";
[% ELSIF input.type == "string" || input.type == "boolean" %] INCLUDE renderFullBuildLink build=input.dependency;
ELSIF input.type == "string" || input.type == "boolean" %]
<tt>"[% input.value %]"</tt> <tt>"[% input.value %]"</tt>
[% ELSE %] [% ELSE %]
<tt>[% input.uri %][% IF input.revision %] (r[% input.revision %])[% END %]</tt> <tt>[% input.uri %][% IF input.revision %] (r[% input.revision %])[% END %]</tt>
[% END %] [% END;
[% END %] END;
[% BLOCK renderShortInputValue %]
[% IF input.type == "build" || input.type == "sysbuild" %] BLOCK renderShortInputValue;
IF input.type == "build" || input.type == "sysbuild" %]
<a href="[% c.uri_for('/build' input.dependency.id) %]">[% input.dependency.id %]</a> <a href="[% c.uri_for('/build' input.dependency.id) %]">[% input.dependency.id %]</a>
[% ELSIF input.type == "string" || input.type == "boolean" %] [% ELSIF input.type == "string" || input.type == "boolean" %]
<tt>"[% input.value %]"</tt> <tt>"[% input.value %]"</tt>
[% ELSE %] [% ELSE %]
<tt>[% input.uri %][% IF input.revision %] (r[% input.revision %])[% END %]</tt> <tt>[% input.uri %][% IF input.revision %] (r[% input.revision %])[% END %]</tt>
[% END %] [% END %]
[% END %] [% END;
[% BLOCK renderDiffUri; %]
[% nouri = 1 %] BLOCK renderDiffUri;
[% FOREACH m IN mappers %] nouri = 1;
[% base = m.baseuri %] FOREACH m IN mappers;
[% url = bi1.uri %] base = m.baseuri;
[% path = url.replace(base, '') %] url = bi1.uri;
[% IF url.match(base) %] path = url.replace(base, '');
IF url.match(base) %]
<a target="_new" href="[% m.uri.replace('_path_', path).replace('_1_', bi1.revision).replace('_2_', bi2.revision) %]">[% contents %]</a> <a target="_new" href="[% m.uri.replace('_path_', path).replace('_1_', bi1.revision).replace('_2_', bi2.revision) %]">[% contents %]</a>
[% nouri = 0 %] [% nouri = 0;
[% END %] END;
[% END %] END;
[% IF nouri %] IF nouri;
[% res = bi1.uri.split(' ') %] res = bi1.uri.split(' ');
[% url = res.0 %] url = res.0;
[% branch = res.1 %] branch = res.1;
[% IF bi1.type == "hg" || bi1.type == "git" %] IF bi1.type == "hg" || bi1.type == "git" %]
<a target="_new" href="/api/scmdiff?uri=[% url %]&rev1=[% bi1.revision %]&rev2=[% bi2.revision %]&type=[% bi1.type %]&branch=[% branch %]">[% contents %]</a> <a target="_new" href="/api/scmdiff?uri=[% url %]&rev1=[% bi1.revision %]&rev2=[% bi2.revision %]&type=[% bi1.type %]&branch=[% branch %]">[% contents %]</a>
[% ELSE %] [% ELSE;
[% contents %] contents;
[% END %] END;
[% END %] END;
[% END %] END;
[% BLOCK renderInputDiff; %]
BLOCK renderInputDiff; %]
<table class="table table-striped table-condensed"> <table class="table table-striped table-condensed">
[% IF !nestedDiff %] [% IF !nestedDiff %]
<tr><th>Input</th><th>Changes</th></tr> <tr><th>Input</th><th>Changes</th></tr>
[% END %] [% END;
[% IF !nestLevel %] IF !nestLevel;
[% nestLevel = 0 %] nestLevel = 0;
[% END %] END;
[% IF nestLevel <= 3 %] IF nestLevel <= 3;
[% FOREACH bi1 IN build1.inputs %] FOREACH bi1 IN build1.inputs;
[% deletedInput = 1 %] deletedInput = 1;
[% FOREACH bi2 IN build2.inputs %] FOREACH bi2 IN build2.inputs;
[% IF bi1.name == bi2.name %] IF bi1.name == bi2.name;
[% IF bi1.type == bi2.type %] IF bi1.type == bi2.type;
[% IF bi1.value != bi2.value || bi1.uri != bi2.uri %] IF bi1.value != bi2.value || bi1.uri != bi2.uri %]
<tr><td><b>[% bi1.name %]</b></td><td><tt>[% INCLUDE renderShortInputValue input=bi1 %]</tt> to <tt>[% INCLUDE renderShortInputValue input=bi2 %]</tt></td></tr> <tr><td><b>[% bi1.name %]</b></td><td><tt>[% INCLUDE renderShortInputValue input=bi1 %]</tt> to <tt>[% INCLUDE renderShortInputValue input=bi2 %]</tt></td></tr>
[% ELSIF bi1.uri == bi2.uri && bi1.revision != bi2.revision %] [% ELSIF bi1.uri == bi2.uri && bi1.revision != bi2.revision %]
[% IF bi1.type == "git" %] [% IF bi1.type == "git" %]
@ -368,21 +381,20 @@
[% END %] [% END %]
[% ELSE %] [% ELSE %]
<tr><td><b>[% bi1.name %]</b></td><td>Changed input type from '[% type = bi1.type; inputTypes.$type %]' to '[% type = bi2.type; inputTypes.$type %]'</td></tr> <tr><td><b>[% bi1.name %]</b></td><td>Changed input type from '[% type = bi1.type; inputTypes.$type %]' to '[% type = bi2.type; inputTypes.$type %]'</td></tr>
[% END %] [% END;
deletedInput = 0;
[% deletedInput = 0 %] END;
[% END %] END;
[% END %] IF deletedInput == 1 %]
[% IF deletedInput == 1 %]
<tr><td><b>[% bi1.name %]</b></td><td>Input not present in this build.</td></tr> <tr><td><b>[% bi1.name %]</b></td><td>Input not present in this build.</td></tr>
[% END %] [% END;
[% END %] END;
[% END %] END %]
</table> </table>
[% END;
[% END %]
[% BLOCK hydraStatus %] BLOCK hydraStatus %]
<table class="tablesorter table table-striped table-condensed"> <table class="tablesorter table table-striped table-condensed">
<thead> <thead>
<tr><th>Machine</th><th>Job</th><th>Type</th><th>Build</th><th>Step</th><th>What</th><th>Since</th></tr> <tr><th>Machine</th><th>Job</th><th>Type</th><th>Build</th><th>Step</th><th>What</th><th>Since</th></tr>
@ -401,22 +413,21 @@
[% END %] [% END %]
</tbody> </tbody>
</table> </table>
[% END %] [% END;
[% BLOCK renderPager %] BLOCK renderPager %]
<ul class="pagination"> <ul class="pagination">
<li><a href="[% "$baseUri?page=1" %]">First</a></li> <li><a href="[% "$baseUri?page=1" %]">First</a></li>
<li [% IF page == 1 %]class="disabled"[% END %]><a href="[% "$baseUri?page="; (page - 1) %]">Previous</a></li> <li [% IF page == 1 %]class="disabled"[% END %]><a href="[% "$baseUri?page="; (page - 1) %]">Previous</a></li>
<li [% IF page * resultsPerPage >= total %]class="disabled"[% END %]><a href="[% "$baseUri?page="; (page + 1) %]">Next</a></li> <li [% IF page * resultsPerPage >= total %]class="disabled"[% END %]><a href="[% "$baseUri?page="; (page + 1) %]">Next</a></li>
<li><a href="[% "$baseUri?page="; (total - 1) div resultsPerPage + 1 %]">Last</a></li> <li><a href="[% "$baseUri?page="; (total - 1) div resultsPerPage + 1 %]">Last</a></li>
</ul> </ul>
[% END %] [% END;
[% BLOCK renderShortEvalInput %] BLOCK renderShortEvalInput;
[% IF input.type == "svn" || input.type == "svn-checkout" || input.type == "bzr" || input.type == "bzr-checkout" %] IF input.type == "svn" || input.type == "svn-checkout" || input.type == "bzr" || input.type == "bzr-checkout" %]
r[% input.revision %] r[% input.revision %]
[% ELSIF input.type == "git" %] [% ELSIF input.type == "git" %]
<tt>[% input.revision.substr(0, 7) %]</tt> <tt>[% input.revision.substr(0, 7) %]</tt>
@ -424,11 +435,11 @@
<tt>[% input.dependency.id %]</tt> <tt>[% input.dependency.id %]</tt>
[% ELSE %] [% ELSE %]
<tt>[% input.revision %]</tt> <tt>[% input.revision %]</tt>
[% END %] [% END;
[% END %] END;
[% BLOCK renderEvals %] BLOCK renderEvals %]
<table class="tablesorter table table-condensed table-striped"> <table class="tablesorter table table-condensed table-striped">
<thead> <thead>
<tr> <tr>
@ -439,17 +450,20 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
[% FOREACH e IN evals; eval = e.eval; [% FOREACH e IN evals
eval = e.eval;
link = c.uri_for(c.controller('JobsetEval').action_for('view'), [eval.id]) %] link = c.uri_for(c.controller('JobsetEval').action_for('view'), [eval.id]) %]
<tr class="clickable" onclick="window.location = '[% link %]'"> <tr class="clickable" onclick="window.location = '[% link %]'">
<td><a href="[% link %]">[% eval.id %]</a>&nbsp;</td> <td><a href="[% link %]">[% eval.id %]</a>&nbsp;</td>
<td>[% INCLUDE renderDateTime timestamp = eval.timestamp %]&nbsp;</td> <td>[% INCLUDE renderDateTime timestamp = eval.timestamp %]&nbsp;</td>
<td> <td>
[% IF e.changedInputs.size > 0 %] [% IF e.changedInputs.size > 0;
[% sep=''; FOREACH input IN e.changedInputs %] sep='';
[% sep %] [% input.name %] → [% INCLUDE renderShortEvalInput input=input %] FOREACH input IN e.changedInputs;
[% sep=','; END %] sep; %] [% input.name %] → [% INCLUDE renderShortEvalInput input=input;
[% ELSE %] sep=',';
END;
ELSE %]
- -
[% END %] [% END %]
</td> </td>
@ -468,15 +482,15 @@
[% END %] [% END %]
</td> </td>
</tr> </tr>
[% END %] [% END;
[% IF linkToAll %] IF linkToAll %]
<tr><td class="centered" colspan=54"><a href="[% linkToAll %]"><em>More...</em></a></td></tr> <tr><td class="centered" colspan=54"><a href="[% linkToAll %]"><em>More...</em></a></td></tr>
[% END %] [% END %]
</tbody> </tbody>
</table> </table>
[% END %] [% END;
[% BLOCK renderLogLinks %] BLOCK renderLogLinks %]
(<a href="[% url %]">log</a>, <a href="[% "$url/raw" %]">raw</a>, <a href="[% "$url/tail-reload" %]">tail</a>) (<a href="[% url %]">log</a>, <a href="[% "$url/raw" %]">raw</a>, <a href="[% "$url/tail-reload" %]">tail</a>)
[% END %] [% END %]