Fix some XML well-formedness problems

This commit is contained in:
Eelco Dolstra 2013-02-14 18:03:12 +01:00
parent 5620e3c386
commit 22ed3c4847
4 changed files with 9 additions and 10 deletions

View file

@ -326,7 +326,7 @@
<td><tt>[% type = input.type; inputTypes.$type %]</tt></td> <td><tt>[% type = input.type; inputTypes.$type %]</tt></td>
<td> <td>
[% IF input.type == "build" || input.type == "sysbuild" %] [% IF input.type == "build" || input.type == "sysbuild" %]
[% INCLUDE renderFullBuildLink build=input.dependency %]</a> [% INCLUDE renderFullBuildLink build=input.dependency %]
[% ELSIF input.type == "string" || input.type == "boolean" %] [% ELSIF input.type == "string" || input.type == "boolean" %]
<tt>"[% input.value %]"</tt> <tt>"[% input.value %]"</tt>
[% ELSE %] [% ELSE %]

View file

@ -336,7 +336,7 @@ BLOCK renderDiffUri;
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="[% HTML.escape("/api/scmdiff?uri=$url&rev1=$bi1.revision&rev2=$bi2.revision&type=$bi1.type&branch=$branch") %]">[% contents %]</a>
[% ELSE; [% ELSE;
contents; contents;
END; END;
@ -450,12 +450,12 @@ BLOCK renderEvals %]
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
[% FOREACH e IN evals [% FOREACH e IN evals;
eval = e.eval; 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></td>
<td>[% INCLUDE renderDateTime timestamp = eval.timestamp %]&nbsp;</td> <td>[% INCLUDE renderDateTime timestamp = eval.timestamp %]</td>
<td> <td>
[% IF e.changedInputs.size > 0; [% IF e.changedInputs.size > 0;
sep=''; sep='';
@ -484,7 +484,7 @@ BLOCK renderEvals %]
</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>

View file

@ -5,8 +5,7 @@
[% IF otherEval %] [% IF otherEval %]
<p>Comparisons are relative to [% INCLUDE renderFullJobsetName <p>Comparisons are relative to [% INCLUDE renderFullJobsetName
project=otherEval.jobset.project.name jobset=otherEval.jobset.name %] project=otherEval.jobset.project.name jobset=otherEval.jobset.name %] evaluation <a href="[%
evaluation <a href="[%
c.uri_for(c.controller('JobsetEval').action_for('view'), c.uri_for(c.controller('JobsetEval').action_for('view'),
[otherEval.id]) %]">[% otherEval.id %]</a>.</p> [otherEval.id]) %]">[% otherEval.id %]</a>.</p>
[% END %] [% END %]

View file

@ -158,10 +158,10 @@
[% END %] [% END %]
</p> </p>
[% END %]
</form> </form>
[% END %]
</div> </div>
[% IF !edit %] [% IF !edit %]