Get rid of unnecessary [%- and -%] tags
This commit is contained in:
@ -26,14 +26,14 @@
|
||||
|
||||
<tr class="input [% extraClass %]" [% IF id %]id="[% id %]"[% END %]>
|
||||
<td>
|
||||
[% IF edit %]<button type="button" class="btn btn-warning" onclick='$(this).parents(".input").remove()'><i class="icon-trash icon-white"></i></button>[% END -%]
|
||||
[% IF edit %]<button type="button" class="btn btn-warning" onclick='$(this).parents(".input").remove()'><i class="icon-trash icon-white"></i></button>[% END %]
|
||||
<tt>[% INCLUDE maybeEditString param="$baseName-name" value=input.name extraClass="shortString" %]</tt>
|
||||
</td>
|
||||
<td>
|
||||
[% INCLUDE renderSelection curValue=input.type param="$baseName-type" options=inputTypes %]
|
||||
</td>
|
||||
<td class="inputalts" id="[% baseName %]">
|
||||
[% FOREACH alt IN input.jobsetinputalts -%]
|
||||
[% FOREACH alt IN input.jobsetinputalts %]
|
||||
<tt class="inputalt">
|
||||
[% IF input.type == "string" && !edit %]
|
||||
"[% HTML.escape(alt.value) %]"
|
||||
@ -57,7 +57,7 @@
|
||||
<tr><th>Input name</th><th>Type</th><th>Values</th></tr>
|
||||
</thead>
|
||||
<tbody class="inputs">
|
||||
[% 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 @@
|
||||
|
||||
|
||||
<ul id="tab" class="nav nav-tabs">
|
||||
[% IF !edit -%]
|
||||
[% IF !edit %]
|
||||
<li><a href="#tabs-information" data-toggle="tab">Jobset</a></li>
|
||||
[% IF jobset.errormsg -%]<li><a href="#tabs-errors" data-toggle="tab"><img src="/static/images/error_16.png" /> Evaluation errors</a></li>[% END %]
|
||||
[% IF jobset.errormsg %]<li><a href="#tabs-errors" data-toggle="tab"><img src="/static/images/error_16.png" /> Evaluation errors</a></li>[% END %]
|
||||
<li><a href="#tabs-jobs" data-toggle="tab">Jobs ([% activeJobs.size %])</a></li>
|
||||
[% END %]
|
||||
<li><a href="#tabs-setup" data-toggle="tab">Setup</a></li>
|
||||
@ -82,18 +82,18 @@
|
||||
|
||||
<div id="generic-tabs" class="tab-content">
|
||||
<div id="tabs-information" class="tab-pane active">
|
||||
[% IF !edit && evals.size() > 0 -%]
|
||||
[% IF !edit && evals.size() > 0 %]
|
||||
<h2>Most recent evaluations</h2>
|
||||
[% INCLUDE renderEvals linkToAll=c.uri_for(c.controller('Jobset').action_for('evals'), [project.name, jobset.name]) %]
|
||||
[% END %]
|
||||
[% IF !edit && activeJobsStatus -%]
|
||||
[% IF !edit && activeJobsStatus %]
|
||||
<h2>Status</h2>
|
||||
<table class="table table-striped table-condensed">
|
||||
<thead><tr><th>Job</th>[% FOREACH s IN systems %]<th>[% s.system %]</th>[% END %]</tr></thead>
|
||||
<tbody>
|
||||
[% odd = 0 %]
|
||||
[% FOREACH j IN activeJobsStatus %]
|
||||
<tr class="[% IF odd %] odd [% END; odd = !odd -%]">
|
||||
<tr class="[% IF odd %] odd [% END; odd = !odd %]">
|
||||
<td>[% INCLUDE renderJobName project=project.name jobset = jobset.name job = j.get_column('job') %]</td>
|
||||
[% FOREACH s IN systems %]
|
||||
[% system = s.system %]
|
||||
@ -111,7 +111,7 @@
|
||||
</tbody>
|
||||
</table>
|
||||
[% END %]
|
||||
[% IF !edit && !activeJobsStatus -%]
|
||||
[% IF !edit && !activeJobsStatus %]
|
||||
<h2>Status</h2>
|
||||
<p>
|
||||
[ <a href="[% c.uri_for('/jobset' project.name jobset.name 'with-status' ) %]">Show status overview</a> ]
|
||||
@ -119,9 +119,9 @@
|
||||
[% END %]
|
||||
|
||||
</div>
|
||||
[% IF !edit -%]
|
||||
[% IF !edit %]
|
||||
|
||||
[% IF jobset.errormsg -%]
|
||||
[% IF jobset.errormsg %]
|
||||
<div id="tabs-errors" class="tab-pane">
|
||||
<h2>Evaluation errors</h2>
|
||||
<p>
|
||||
@ -181,7 +181,7 @@
|
||||
<th>Last checked:</th>
|
||||
<td>
|
||||
[% IF jobset.lastcheckedtime %]
|
||||
[% INCLUDE renderDateTime timestamp = jobset.lastcheckedtime -%][% IF jobset.errormsg -%]<em>, with errors!</em>
|
||||
[% INCLUDE renderDateTime timestamp = jobset.lastcheckedtime %][% IF jobset.errormsg %]<em>, with errors!</em>
|
||||
[% ELSE %], <em>no errors</em>
|
||||
[% END %]
|
||||
[% ELSE %]
|
||||
@ -195,7 +195,7 @@
|
||||
|
||||
[% INCLUDE renderInputs %]
|
||||
</div>
|
||||
[% IF !edit -%]
|
||||
[% IF !edit %]
|
||||
<div id="tabs-jobs" class="tab-pane">
|
||||
|
||||
<h2>Jobs</h2>
|
||||
|
Reference in New Issue
Block a user