From 2fa1a7efa70526afde225e1eb777b90f054cf383 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 14 Feb 2013 16:51:42 +0100 Subject: [PATCH] Get rid of unnecessary [%- and -%] tags --- src/root/build.tt | 12 +- src/root/channel-contents.tt | 8 +- src/root/clone-build.tt | 4 +- src/root/common.tt | 250 +++++++++++++++++------------------ src/root/contextbar.tt | 4 +- src/root/jobset-eval.tt | 10 +- src/root/jobset.tt | 26 ++-- src/root/layout.tt | 4 +- src/root/log.tt | 2 +- src/root/plain-reload.tt | 2 +- src/root/plain.tt | 2 +- src/root/product-list.tt | 6 +- src/root/timeline.tt | 2 +- src/root/topbar.tt | 8 +- src/root/view-result.tt | 2 +- 15 files changed, 171 insertions(+), 171 deletions(-) diff --git a/src/root/build.tt b/src/root/build.tt index 3f1ae08d..86ae4b2d 100644 --- a/src/root/build.tt +++ b/src/root/build.tt @@ -207,13 +207,13 @@

Nix error output

- 
[% HTML.escape(build.errormsg) -%]
+ 
[% HTML.escape(build.errormsg) %]
[% END %] [% END %] [% IF logtext %]

Log

- 
[% HTML.escape(logtext) -%]
+ 
[% HTML.escape(logtext) %]
[% END %]
@@ -320,7 +320,7 @@ NameTypeValueRevisionStore path - [% FOREACH input IN build.inputs -%] + [% FOREACH input IN build.inputs %] [% input.name %] [% type = input.type; inputTypes.$type %] @@ -336,7 +336,7 @@ [% IF input.revision %][% input.revision %][% END %] [% input.path %] - [% END -%] + [% END %] @@ -375,14 +375,14 @@ BuildInput nameSystemTimestamp - [% FOREACH input IN build.dependents -%] + [% FOREACH input IN build.dependents %] [% INCLUDE renderFullBuildLink build=input.build %] [% input.name %] [% input.build.system %] [% INCLUDE renderDateTime timestamp = input.build.timestamp %] - [% END -%] + [% END %]
diff --git a/src/root/channel-contents.tt b/src/root/channel-contents.tt index fd3f7228..0c5a899b 100644 --- a/src/root/channel-contents.tt +++ b/src/root/channel-contents.tt @@ -59,11 +59,11 @@ install the package simply by clicking on the packages below.

[% build.get_column('releasename') || build.nixname %] [% build.system %] - [% IF build.homepage -%] + [% IF build.homepage %] build.homepage) %]>[% HTML.escape(build.description) %] - [% ELSE -%] - [% HTML.escape(build.description) -%] - [% END -%] + [% ELSE %] + [% HTML.escape(build.description) %] + [% END %] [% IF pkg.outName != 'out' %] [[% pkg.outName %]][% END %] diff --git a/src/root/clone-build.tt b/src/root/clone-build.tt index 7dde7a49..95dede4f 100644 --- a/src/root/clone-build.tt +++ b/src/root/clone-build.tt @@ -26,7 +26,7 @@ NameTypeValue - [% FOREACH input IN build.inputs -%] + [% FOREACH input IN build.inputs %] [% input.name %] "input-$input.name-name" value => input.name) %] /> @@ -42,7 +42,7 @@ [% END %] /> - [% END -%] + [% END %] diff --git a/src/root/common.tt b/src/root/common.tt index 65a6c016..5473b2a2 100644 --- a/src/root/common.tt +++ b/src/root/common.tt @@ -1,9 +1,9 @@ -[%- USE date -%] -[%- USE String -%] -[%- USE HTML -%] +[% USE date %] +[% USE String %] +[% USE HTML %] -[%- inputTypes = +[% inputTypes = { "svn" = "Subversion export" , "svn-checkout" = "Subversion checkout" , "bzr" = "Bazaar export" @@ -16,42 +16,42 @@ , "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 -%] -[% project %][% END -%] +[% BLOCK renderProjectName %] +[% project %][% END %] -[%- BLOCK renderJobsetName -%] -[% jobset %][% END -%] +[% BLOCK renderJobsetName %] +[% jobset %][% END %] -[%- BLOCK renderJobName -%] -[% job %][% END -%] +[% BLOCK renderJobName %] +[% job %][% END %] -[%- BLOCK renderFullJobsetName -%] +[% BLOCK renderFullJobsetName %] [% INCLUDE renderProjectName %]:[% INCLUDE renderJobsetName %] -[%- END -%] +[% END %] -[%- BLOCK renderFullJobName -%] +[% BLOCK renderFullJobName %] [% IF !hideProjectName; INCLUDE renderProjectName %]:[% END; IF !hideJobsetName; INCLUDE renderJobsetName %]:[% END; INCLUDE renderJobName %] -[%- END %] +[% END %] -[%- BLOCK renderFullJobNameOfBuild -%] +[% BLOCK renderFullJobNameOfBuild %] [% INCLUDE renderFullJobName project=build.get_column("project") jobset = build.get_column("jobset") job = build.get_column("job") %] [% END %] -[%- BLOCK renderDuration -%] +[% 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 %] @@ -59,98 +59,98 @@ [% END %] -[%- BLOCK renderBuildListHeader -%] +[% BLOCK renderBuildListHeader %] - [%- IF !hideResultInfo -%] + [% IF !hideResultInfo %] [% END %] - [%- IF showSchedulingInfo -%] + [% IF showSchedulingInfo %] - [%- END -%] + [% END %] - [%- IF showSchedulingInfo -%] + [% IF showSchedulingInfo %] - [%- END -%] - [%- IF !hideJobName -%] + [% END %] + [% IF !hideJobName %] - [%- END -%] + [% END %] - [%- IF showStatusChange -%] + [% IF showStatusChange %] - [%- END -%] - [%- IF showDescription -%] + [% END %] + [% IF showDescription %] - [%- END -%] + [% END %] -[%- END -%] +[% END %] -[%- BLOCK renderBuildListBody -%] - [%- odd = 0 -%] - [%- FOREACH build IN builds -%] +[% BLOCK renderBuildListBody %] + [% odd = 0 %] + [% FOREACH build IN builds %] - [%- IF !hideResultInfo -%] + [% IF !hideResultInfo %] - [%- END -%] + [% END %] [% IF showSchedulingInfo %] - + [% END %] - [%- IF showSchedulingInfo -%] + [% IF showSchedulingInfo %] - [%- END -%] - [%- IF !hideJobName -%] - - [%- END -%] + [% END %] + [% IF !hideJobName %] + + [% END %] - [%- IF showStatusChange -%] + [% IF showStatusChange %] - [%- END -%] - [%- IF showDescription -%] + [% END %] + [% IF showDescription %] - [%- END -%] + [% END %] - [%- END -%] -[%- END -%] + [% END %] +[% END %] -[%- BLOCK renderBuildListFooter -%] +[% BLOCK renderBuildListFooter %]
#PJobRelease Name System TimestampLast status changeDescription
- [%- INCLUDE renderBuildStatusIcon size=16 busy=(showSchedulingInfo ? 1 : 0) buildstatus=build.buildstatus -%] + [% INCLUDE renderBuildStatusIcon size=16 busy=(showSchedulingInfo ? 1 : 0) buildstatus=build.buildstatus %] [%- IF build.busy %]Started[% ELSE %]Queued[% END %][% IF build.busy %]Started[% ELSE %]Queued[% END %][% build.id %][% build.priority %][%- INCLUDE renderFullJobNameOfBuild -%][% INCLUDE renderFullJobNameOfBuild %][% !showSchedulingInfo and build.get_column('releasename') ? build.get_column('releasename') : build.nixname %] [% build.system %] [% date.format(build.timestamp, '%Y-%m-%d %H:%M:%S') %] - [%- IF build.get_column('statusChangeTime') -%] + [% IF build.get_column('statusChangeTime') %] [% date.format(build.get_column('statusChangeTime'), '%Y-%m-%d %H:%M:%S') %] - [%- ELSE -%] + [% ELSE %] never - [%- END -%] + [% END %] [% build.description %]
-[%- END -%] +[% END %] -[%- BLOCK renderBuildList -%] -[%- INCLUDE renderBuildListHeader -%] -[%- INCLUDE renderBuildListBody -%] -[%- INCLUDE renderBuildListFooter -%] -[%- END -%] +[% BLOCK renderBuildList %] +[% INCLUDE renderBuildListHeader %] +[% INCLUDE renderBuildListBody %] +[% INCLUDE renderBuildListFooter %] +[% END %] -[%- BLOCK renderLink -%][% title %][%- END -%] +[% BLOCK renderLink %][% title %][% END %] -[%- BLOCK showBuildStats -%] +[% BLOCK showBuildStats %] @@ -179,21 +179,21 @@
-[%- END -%] +[% END %] -[% BLOCK renderViewJobName -%] -[% IF job.description; HTML.escape(job.description); ELSE %][% job.job %] ([% job.attrs %])[% END -%] -[% END -%] +[% BLOCK renderViewJobName %] +[% IF job.description; HTML.escape(job.description); ELSE %][% job.job %] ([% job.attrs %])[% END %] +[% END %] -[% BLOCK maybeLink -%] - [% IF uri %] uri, class => class) %][% IF confirmmsg %]onclick="javascript:return confirm('[% confirmmsg %]')"[% END %]>[% content %][% ELSE; content; END -%] -[% END -%] +[% BLOCK maybeLink %] + [% IF uri %] uri, class => class) %][% IF confirmmsg %]onclick="javascript:return confirm('[% confirmmsg %]')"[% END %]>[% content %][% ELSE; content; END %] +[% END %] -[% BLOCK maybeButton -%] - [% IF uri %] uri) %][% IF confirmmsg %]onclick="javascript:return confirm('[% confirmmsg %]')"[% END %]>[% content %][% ELSE; content; END -%] -[% END -%] +[% BLOCK maybeButton %] + [% IF uri %] uri) %][% IF confirmmsg %]onclick="javascript:return confirm('[% confirmmsg %]')"[% END %]>[% content %][% ELSE; content; END %] +[% END %] [% BLOCK renderSelection %] [% IF edit %] @@ -222,43 +222,43 @@ [% BLOCK maybeEditString; - IF edit -%] + IF edit %] param, name => param, value => value) %] /> [% ELSE; HTML.escape(value); - END -%] -[% END -%] - -[% BLOCK renderFullBuildLink %] -[% INCLUDE renderFullJobNameOfBuild build=build %] build [% build.id %][% -%] + END %] [% 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 %] build [% build.id %][% %] +[% 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 %] Succeeded - [%- ELSIF buildstatus == 1 -%] + [% ELSIF buildstatus == 1 %] Failed - [%- ELSIF buildstatus == 2 -%] + [% ELSIF buildstatus == 2 %] Dependency failed - [%- ELSIF buildstatus == 4 -%] + [% ELSIF buildstatus == 4 %] Cancelled - [%- ELSIF buildstatus == 5 -%] + [% ELSIF buildstatus == 5 %] Failed - [%- ELSIF buildstatus == 6 -%] + [% ELSIF buildstatus == 6 %] Failed (with result) - [%- ELSE -%] + [% ELSE %] Failed - [%- END -%] - [%- ELSIF busy -%] + [% END %] + [% ELSIF busy %] Busy - [%- ELSE -%] + [% ELSE %] Scheduled - [%- END -%] -[%- END -%] + [% END %] +[% END %] [% BLOCK renderStatus %] [% IF build.finished %] @@ -286,7 +286,7 @@ [% ELSE %] Scheduled to be built [% END %] -[% END -%] +[% END %] [% BLOCK renderInputValue %] [% IF input.type == "build" || input.type == "sysbuild" %] @@ -415,17 +415,17 @@ [% END %] -[% BLOCK renderShortEvalInput -%] - [%- IF input.type == "svn" || input.type == "svn-checkout" || input.type == "bzr" || input.type == "bzr-checkout" -%] - r[%- input.revision -%] - [%- ELSIF input.type == "git" -%] +[% BLOCK renderShortEvalInput %] + [% IF input.type == "svn" || input.type == "svn-checkout" || input.type == "bzr" || input.type == "bzr-checkout" %] + r[% input.revision %] + [% ELSIF input.type == "git" %] [% input.revision.substr(0, 7) %] - [%- ELSIF input.type == "build" || input.type == "sysbuild" -%] + [% ELSIF input.type == "build" || input.type == "sysbuild" %] [% input.dependency.id %] - [%- ELSE -%] - [%- input.revision -%] - [%- END -%] -[%- END %] + [% ELSE %] + [% input.revision %] + [% END %] +[% END %] [% BLOCK renderEvals %] @@ -439,19 +439,19 @@ - [%- FOREACH e IN evals; eval = e.eval; - link = c.uri_for(c.controller('JobsetEval').action_for('view'), [eval.id]) -%] + [% FOREACH e IN evals; eval = e.eval; + link = c.uri_for(c.controller('JobsetEval').action_for('view'), [eval.id]) %] [% eval.id %]  [% INCLUDE renderDateTime timestamp = eval.timestamp %]  - [%- 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 -%] + [% END %] [% e.nrSucceeded %] @@ -461,17 +461,17 @@ [% END %] - [%- IF e.diff > 0 -%] + [% IF e.diff > 0 %] +[% e.diff %] - [%- ELSIF e.diff < 0 && e.nrScheduled == 0 -%] + [% ELSIF e.diff < 0 && e.nrScheduled == 0 %] [% e.diff %] - [%- END -%] + [% END %] - [%- END -%] - [%- IF linkToAll -%] + [% END %] + [% IF linkToAll %] More... - [%- END -%] + [% END %] [% END %] diff --git a/src/root/contextbar.tt b/src/root/contextbar.tt index e1524bf4..352fc1e4 100644 --- a/src/root/contextbar.tt +++ b/src/root/contextbar.tt @@ -5,8 +5,8 @@ [% END %] -[% BLOCK makeLink -%] -[% INCLUDE makeLinkWrapped content="" -%] +[% BLOCK makeLink %] +[% INCLUDE makeLinkWrapped content="" %] [% END %] [% BLOCK makeSubMenu %] diff --git a/src/root/jobset-eval.tt b/src/root/jobset-eval.tt index 65f2c24a..0a80ca32 100644 --- a/src/root/jobset-eval.tt +++ b/src/root/jobset-eval.tt @@ -3,15 +3,15 @@

Jobset [% project.name %]:[% jobset.name %] evaluation [% eval.id %]

-[%- IF otherEval -%] +[% IF otherEval %]

Comparisons are relative to [% INCLUDE renderFullJobsetName project=otherEval.jobset.project.name jobset=otherEval.jobset.name %] evaluation [% otherEval.id %].

-[%- END -%] +[% END %] -[%- BLOCK renderSome -%] +[% BLOCK renderSome %] [% size = builds.size; max = full ? size : 30; %] [% INCLUDE renderBuildListBody builds=builds.slice(0, (size > max ? max : size) - 1) hideProjectName=1 hideJobsetName=1 %] @@ -35,13 +35,13 @@ c.uri_for(c.controller('JobsetEval').action_for('view'), [% IF removed.size > 0 %] Removed jobs [% size = removed.size; max = full ? size : 30; %] - [%- FOREACH j IN removed.slice(0,(size > max ? max : size) - 1) -%] + [% FOREACH j IN removed.slice(0,(size > max ? max : size) - 1) %] [% INCLUDE renderJobName project=project.name jobset=jobset.name job=j.job %] [% j.system %] - [%- END -%] + [% END %] [% IF size > max; params = c.req.params; params.full = 1 %] ([% size - max %] more jobs omitted) [% END %] diff --git a/src/root/jobset.tt b/src/root/jobset.tt index 5128844c..07d88355 100644 --- a/src/root/jobset.tt +++ b/src/root/jobset.tt @@ -26,14 +26,14 @@ - [% IF edit %][% END -%] + [% IF edit %][% END %] [% INCLUDE maybeEditString param="$baseName-name" value=input.name extraClass="shortString" %] [% INCLUDE renderSelection curValue=input.type param="$baseName-type" options=inputTypes %] - [% FOREACH alt IN input.jobsetinputalts -%] + [% FOREACH alt IN input.jobsetinputalts %] [% IF input.type == "string" && !edit %] "[% HTML.escape(alt.value) %]" @@ -57,7 +57,7 @@ Input nameTypeValues - [% FOREACH input IN jobset.jobsetinputs -%] + [% FOREACH input IN jobset.jobsetinputs %] [% INCLUDE renderInput input=input baseName="input-$input.name" %] [% END %] [% IF edit %] @@ -72,9 +72,9 @@