Fix indentation and get rid of some unnecessary whitespace in the output
This commit is contained in:
Eelco Dolstra
parent
2fa1a7efa7
commit
5620e3c386
|
|
@ -1,9 +1,10 @@
|
|||
[% USE date %]
|
||||
[% USE String %]
|
||||
[% USE HTML %]
|
||||
[%
|
||||
USE date;
|
||||
USE String;
|
||||
USE HTML;
|
||||
|
||||
|
||||
[% inputTypes =
|
||||
inputTypes =
|
||||
{ "svn" = "Subversion export"
|
||||
, "svn-checkout" = "Subversion checkout"
|
||||
, "bzr" = "Bazaar export"
|
||||
|
|
@ -15,51 +16,52 @@
|
|||
, "path" = "Local path"
|
||||
, "build" = "Build output"
|
||||
, "sysbuild" = "Build output (same system)"
|
||||
}
|
||||
%]
|
||||
};
|
||||
|
||||
BLOCK renderDateTime;
|
||||
date.format(timestamp, '%Y-%m-%d %H:%M:%S');
|
||||
END;
|
||||
|
||||
|
||||
[% BLOCK renderDateTime %]
|
||||
[% date.format(timestamp, '%Y-%m-%d %H:%M:%S') %]
|
||||
[% END %]
|
||||
BLOCK renderProjectName %]
|
||||
<a href="[% c.uri_for('/project' project) %]"><tt>[% project %]</tt></a>
|
||||
[% END;
|
||||
|
||||
|
||||
[% BLOCK renderProjectName %]
|
||||
<a href="[% c.uri_for('/project' project) %]"><tt>[% project %]</tt></a>[% END %]
|
||||
BLOCK renderJobsetName %]
|
||||
<a href="[% c.uri_for('/jobset' project jobset) %]"><tt>[% jobset %]</tt></a>
|
||||
[% END;
|
||||
|
||||
|
||||
[% BLOCK renderJobsetName %]
|
||||
<a href="[% c.uri_for('/jobset' project jobset) %]"><tt>[% jobset %]</tt></a>[% END %]
|
||||
BLOCK renderJobName %]
|
||||
<a href="[% c.uri_for('/job' project jobset job) %]"><tt>[% job %]</tt></a>
|
||||
[% END;
|
||||
|
||||
|
||||
[% BLOCK renderJobName %]
|
||||
<a href="[% c.uri_for('/job' project jobset job) %]"><tt>[% job %]</tt></a>[% END %]
|
||||
|
||||
|
||||
[% BLOCK renderFullJobsetName %]
|
||||
BLOCK renderFullJobsetName %]
|
||||
<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>
|
||||
[% END %]
|
||||
[% END;
|
||||
|
||||
|
||||
[% BLOCK renderFullJobNameOfBuild %]
|
||||
[% INCLUDE renderFullJobName project=build.get_column("project") jobset = build.get_column("jobset") job = build.get_column("job") %]
|
||||
[% END %]
|
||||
BLOCK renderFullJobNameOfBuild;
|
||||
INCLUDE renderFullJobName project=build.get_column("project") jobset = build.get_column("jobset") job = build.get_column("job");
|
||||
END;
|
||||
|
||||
|
||||
[% BLOCK renderDuration %]
|
||||
[% 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 %][% duration div 60 % 60 %]m[% END %]
|
||||
[% duration % 60 %]s
|
||||
[% END %]
|
||||
BLOCK renderDuration;
|
||||
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; duration div 60 % 60 %]m[% END;
|
||||
duration % 60 %]s[%
|
||||
END;
|
||||
|
||||
|
||||
[% BLOCK renderBuildListHeader %]
|
||||
BLOCK renderBuildListHeader %]
|
||||
<table class="buildList table table-striped table-condensed [% IF !unsortable %]tablesorter[% END %] [% IF !showSchedulingInfo %] clean[% END %]">
|
||||
<thead>
|
||||
<tr>
|
||||
|
|
@ -88,11 +90,12 @@
|
|||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
[% END %]
|
||||
[% END;
|
||||
|
||||
[% BLOCK renderBuildListBody %]
|
||||
[% odd = 0 %]
|
||||
[% FOREACH build IN builds %]
|
||||
|
||||
BLOCK renderBuildListBody;
|
||||
odd = 0;
|
||||
FOREACH build IN builds; %]
|
||||
<tr class="clickable
|
||||
[% IF showSchedulingInfo %]
|
||||
[% IF build.busy %]runningBuild[% ELSIF build.disabled == 1 || build.get_column('enabled') == 0 %]disabledBuild[% END %]
|
||||
|
|
@ -133,25 +136,27 @@
|
|||
<td>[% build.description %]</td>
|
||||
[% END %]
|
||||
</tr>
|
||||
[% END %]
|
||||
[% END %]
|
||||
[% END;
|
||||
END;
|
||||
|
||||
[% BLOCK renderBuildListFooter %]
|
||||
|
||||
BLOCK renderBuildListFooter %]
|
||||
</tbody>
|
||||
</table>
|
||||
[% END %]
|
||||
|
||||
[% BLOCK renderBuildList %]
|
||||
[% INCLUDE renderBuildListHeader %]
|
||||
[% INCLUDE renderBuildListBody %]
|
||||
[% INCLUDE renderBuildListFooter %]
|
||||
[% END %]
|
||||
[% 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">
|
||||
<tr>
|
||||
<th>Finished builds:</th>
|
||||
|
|
@ -178,26 +183,27 @@
|
|||
<td>[% busyBuilds %]</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
[% END %]
|
||||
[% END;
|
||||
|
||||
|
||||
[% BLOCK renderViewJobName %]
|
||||
[% IF job.description; HTML.escape(job.description); ELSE %]<tt>[% job.job %]</tt> ([% job.attrs %])[% END %]
|
||||
[% END %]
|
||||
BLOCK renderViewJobName;
|
||||
IF job.description; HTML.escape(job.description); ELSE %]<tt>[% job.job %]</tt> ([% job.attrs %])[% END;
|
||||
END;
|
||||
|
||||
|
||||
[% BLOCK maybeLink %]
|
||||
[% IF uri %]<a [% HTML.attributes(href => uri, class => class) %][% IF confirmmsg %]onclick="javascript:return confirm('[% confirmmsg %]')"[% END %]>[% content %]</a>[% ELSE; content; END %]
|
||||
[% END %]
|
||||
BLOCK maybeLink;
|
||||
IF uri %]<a [% HTML.attributes(href => uri, class => class) %][% IF confirmmsg %]onclick="javascript:return confirm('[% confirmmsg %]')"[% END %]>[% content %]</a>[% ELSE; content; 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 %]
|
||||
[% IF edit %]
|
||||
[% IF radiobuttons %]
|
||||
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;
|
||||
IF edit;
|
||||
IF radiobuttons; %]
|
||||
<div class="controls">
|
||||
[% FOREACH name IN options.keys.sort %]
|
||||
<label class="radio inline">
|
||||
|
|
@ -214,31 +220,33 @@
|
|||
<option [% HTML.attributes(value => name) %] [% IF name == curValue; "selected='selected'"; END %]>[% options.$name %]</option>
|
||||
[% END %]
|
||||
</select>
|
||||
[% END %]
|
||||
[% ELSE %]
|
||||
[% options.$curValue %]
|
||||
[% END %]
|
||||
[% END %]
|
||||
[% END;
|
||||
ELSE;
|
||||
options.$curValue;
|
||||
END;
|
||||
END;
|
||||
|
||||
|
||||
[% BLOCK maybeEditString;
|
||||
BLOCK maybeEditString;
|
||||
IF edit %]
|
||||
<input type="text" class="string [% extraClass %]" [% HTML.attributes(id => param, name => param, value => value) %] />
|
||||
[% ELSE;
|
||||
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 %]
|
||||
[% finished = build != undef ? build.finished : 1 %]
|
||||
[% busy = busy != undef ? busy : build.busy %]
|
||||
[% buildstatus = buildstatus != undef ? buildstatus : build.buildstatus %]
|
||||
[% IF finished %]
|
||||
[% IF buildstatus == 0 %]
|
||||
BLOCK renderFullBuildLink;
|
||||
INCLUDE renderFullJobNameOfBuild build=build %] <a href="[% c.uri_for('/build' build.id) %]">build [% build.id %]</a>[%
|
||||
END;
|
||||
|
||||
|
||||
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" />
|
||||
[% ELSIF buildstatus == 1 %]
|
||||
<img src="/static/images/error_[% size %].png" alt="Failed" />
|
||||
|
|
@ -252,19 +260,20 @@
|
|||
<img src="/static/images/error_[% size %].png" alt="Failed (with result)" />
|
||||
[% ELSE %]
|
||||
<img src="/static/images/error_[% size %].png" alt="Failed" />
|
||||
[% END %]
|
||||
[% ELSIF busy %]
|
||||
[% END;
|
||||
ELSIF busy %]
|
||||
<img src="/static/images/help_[% size %].png" alt="Busy" />
|
||||
[% ELSE %]
|
||||
<img src="/static/images/help_[% size %].png" alt="Scheduled" />
|
||||
[% END %]
|
||||
[% END %]
|
||||
[% END;
|
||||
END;
|
||||
|
||||
[% BLOCK renderStatus %]
|
||||
[% IF build.finished %]
|
||||
[% buildstatus = build.buildstatus %]
|
||||
[% IF icon; INCLUDE renderBuildStatusIcon size=16; END %]
|
||||
[% IF buildstatus == 0 %]
|
||||
|
||||
BLOCK renderStatus;
|
||||
IF build.finished;
|
||||
buildstatus = build.buildstatus;
|
||||
IF icon; INCLUDE renderBuildStatusIcon size=16; END;
|
||||
IF buildstatus == 0 %]
|
||||
<strong>Success</strong>
|
||||
[% ELSIF buildstatus == 1 %]
|
||||
<span class="error">Build returned a non-zero exit code</span>
|
||||
|
|
@ -279,74 +288,78 @@
|
|||
[% ELSE %]
|
||||
<span class="error">Build failed</span>
|
||||
(see <a href="#nix-error">below</a>)
|
||||
[% END %]
|
||||
[% ELSIF build.busy %]
|
||||
[% END;
|
||||
ELSIF build.busy %]
|
||||
<strong>Build in progress</strong>
|
||||
since [% INCLUDE renderDateTime timestamp = build.starttime %]
|
||||
[% ELSE %]
|
||||
since [% INCLUDE renderDateTime timestamp = build.starttime;
|
||||
ELSE %]
|
||||
<strong>Scheduled to be built</strong>
|
||||
[% END %]
|
||||
[% END %]
|
||||
[% END;
|
||||
END;
|
||||
|
||||
[% BLOCK renderInputValue %]
|
||||
[% IF input.type == "build" || input.type == "sysbuild" %]
|
||||
[% INCLUDE renderFullBuildLink build=input.dependency %]</a>
|
||||
[% ELSIF input.type == "string" || input.type == "boolean" %]
|
||||
|
||||
BLOCK renderInputValue;
|
||||
IF input.type == "build" || input.type == "sysbuild";
|
||||
INCLUDE renderFullBuildLink build=input.dependency;
|
||||
ELSIF input.type == "string" || input.type == "boolean" %]
|
||||
<tt>"[% input.value %]"</tt>
|
||||
[% ELSE %]
|
||||
<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>
|
||||
[% ELSIF input.type == "string" || input.type == "boolean" %]
|
||||
<tt>"[% input.value %]"</tt>
|
||||
[% ELSE %]
|
||||
<tt>[% input.uri %][% IF input.revision %] (r[% input.revision %])[% END %]</tt>
|
||||
[% END %]
|
||||
[% END %]
|
||||
[% END;
|
||||
|
||||
[% BLOCK renderDiffUri; %]
|
||||
[% nouri = 1 %]
|
||||
[% FOREACH m IN mappers %]
|
||||
[% base = m.baseuri %]
|
||||
[% url = bi1.uri %]
|
||||
[% path = url.replace(base, '') %]
|
||||
[% IF url.match(base) %]
|
||||
|
||||
BLOCK renderDiffUri;
|
||||
nouri = 1;
|
||||
FOREACH m IN mappers;
|
||||
base = m.baseuri;
|
||||
url = bi1.uri;
|
||||
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>
|
||||
[% nouri = 0 %]
|
||||
[% END %]
|
||||
[% END %]
|
||||
[% IF nouri %]
|
||||
[% res = bi1.uri.split(' ') %]
|
||||
[% url = res.0 %]
|
||||
[% branch = res.1 %]
|
||||
[% IF bi1.type == "hg" || bi1.type == "git" %]
|
||||
[% nouri = 0;
|
||||
END;
|
||||
END;
|
||||
IF nouri;
|
||||
res = bi1.uri.split(' ');
|
||||
url = res.0;
|
||||
branch = res.1;
|
||||
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>
|
||||
[% ELSE %]
|
||||
[% contents %]
|
||||
[% END %]
|
||||
[% END %]
|
||||
[% END %]
|
||||
[% ELSE;
|
||||
contents;
|
||||
END;
|
||||
END;
|
||||
END;
|
||||
|
||||
[% BLOCK renderInputDiff; %]
|
||||
|
||||
BLOCK renderInputDiff; %]
|
||||
<table class="table table-striped table-condensed">
|
||||
[% IF !nestedDiff %]
|
||||
<tr><th>Input</th><th>Changes</th></tr>
|
||||
[% END %]
|
||||
[% IF !nestLevel %]
|
||||
[% nestLevel = 0 %]
|
||||
[% END %]
|
||||
[% END;
|
||||
IF !nestLevel;
|
||||
nestLevel = 0;
|
||||
END;
|
||||
|
||||
[% IF nestLevel <= 3 %]
|
||||
[% FOREACH bi1 IN build1.inputs %]
|
||||
[% deletedInput = 1 %]
|
||||
[% FOREACH bi2 IN build2.inputs %]
|
||||
[% IF bi1.name == bi2.name %]
|
||||
[% IF bi1.type == bi2.type %]
|
||||
[% IF bi1.value != bi2.value || bi1.uri != bi2.uri %]
|
||||
IF nestLevel <= 3;
|
||||
FOREACH bi1 IN build1.inputs;
|
||||
deletedInput = 1;
|
||||
FOREACH bi2 IN build2.inputs;
|
||||
IF bi1.name == bi2.name;
|
||||
IF bi1.type == bi2.type;
|
||||
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>
|
||||
[% ELSIF bi1.uri == bi2.uri && bi1.revision != bi2.revision %]
|
||||
[% IF bi1.type == "git" %]
|
||||
|
|
@ -368,21 +381,20 @@
|
|||
[% END %]
|
||||
[% 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>
|
||||
[% END %]
|
||||
|
||||
[% deletedInput = 0 %]
|
||||
[% END %]
|
||||
[% END %]
|
||||
[% IF deletedInput == 1 %]
|
||||
[% END;
|
||||
deletedInput = 0;
|
||||
END;
|
||||
END;
|
||||
IF deletedInput == 1 %]
|
||||
<tr><td><b>[% bi1.name %]</b></td><td>Input not present in this build.</td></tr>
|
||||
[% END %]
|
||||
[% END %]
|
||||
[% END %]
|
||||
[% END;
|
||||
END;
|
||||
END %]
|
||||
</table>
|
||||
[% END;
|
||||
|
||||
[% END %]
|
||||
|
||||
[% BLOCK hydraStatus %]
|
||||
BLOCK hydraStatus %]
|
||||
<table class="tablesorter table table-striped table-condensed">
|
||||
<thead>
|
||||
<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 %]
|
||||
</tbody>
|
||||
</table>
|
||||
[% END %]
|
||||
[% END;
|
||||
|
||||
|
||||
[% BLOCK renderPager %]
|
||||
BLOCK renderPager %]
|
||||
<ul class="pagination">
|
||||
<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 * 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>
|
||||
</ul>
|
||||
[% END %]
|
||||
[% END;
|
||||
|
||||
|
||||
[% BLOCK renderShortEvalInput %]
|
||||
[% IF input.type == "svn" || input.type == "svn-checkout" || input.type == "bzr" || input.type == "bzr-checkout" %]
|
||||
BLOCK renderShortEvalInput;
|
||||
IF input.type == "svn" || input.type == "svn-checkout" || input.type == "bzr" || input.type == "bzr-checkout" %]
|
||||
r[% input.revision %]
|
||||
[% ELSIF input.type == "git" %]
|
||||
<tt>[% input.revision.substr(0, 7) %]</tt>
|
||||
|
|
@ -424,11 +435,11 @@
|
|||
<tt>[% input.dependency.id %]</tt>
|
||||
[% ELSE %]
|
||||
<tt>[% input.revision %]</tt>
|
||||
[% END %]
|
||||
[% END %]
|
||||
[% END;
|
||||
END;
|
||||
|
||||
|
||||
[% BLOCK renderEvals %]
|
||||
BLOCK renderEvals %]
|
||||
<table class="tablesorter table table-condensed table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
|
|
@ -439,17 +450,20 @@
|
|||
</tr>
|
||||
</thead>
|
||||
<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]) %]
|
||||
<tr class="clickable" onclick="window.location = '[% link %]'">
|
||||
<td><a href="[% link %]">[% eval.id %]</a> </td>
|
||||
<td>[% INCLUDE renderDateTime timestamp = eval.timestamp %] </td>
|
||||
<td>
|
||||
[% IF e.changedInputs.size > 0 %]
|
||||
[% sep=''; FOREACH input IN e.changedInputs %]
|
||||
[% sep %] [% input.name %] → [% INCLUDE renderShortEvalInput input=input %]
|
||||
[% sep=','; END %]
|
||||
[% ELSE %]
|
||||
[% IF e.changedInputs.size > 0;
|
||||
sep='';
|
||||
FOREACH input IN e.changedInputs;
|
||||
sep; %] [% input.name %] → [% INCLUDE renderShortEvalInput input=input;
|
||||
sep=',';
|
||||
END;
|
||||
ELSE %]
|
||||
-
|
||||
[% END %]
|
||||
</td>
|
||||
|
|
@ -468,15 +482,15 @@
|
|||
[% END %]
|
||||
</td>
|
||||
</tr>
|
||||
[% END %]
|
||||
[% IF linkToAll %]
|
||||
[% END;
|
||||
IF linkToAll %]
|
||||
<tr><td class="centered" colspan=54"><a href="[% linkToAll %]"><em>More...</em></a></td></tr>
|
||||
[% END %]
|
||||
</tbody>
|
||||
</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>)
|
||||
[% END %]
|
||||
|
|
|
|||
Loading…
Reference in a new issue