ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

* Put actions related to builds under /build (e.g. /log/<buildid>

Browse Source 
becomes /build/<buildid>/log).
This commit is contained in:
Eelco Dolstra
2009-02-25 10:52:41 +00:00
parent f8e162cb18
commit 16acb2754c
4 changed files with 70 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Hydra/root/build.tt
View File

@ -121,7 +121,7 @@
<tr>
<th>Logfile:</th>
<td>
<a href="[% c.uri_for('/log' build.id) %]"><strong>Available</strong></a>
<a href="[% c.uri_for('build' build.id 'log') %]"><strong>Available</strong></a>
</td>
</tr>
[% END %]
@ -178,8 +178,9 @@
</thead>
<tbody>
[% FOREACH step IN build.buildsteps -%]
[% log = c.uri_for('build' build.id 'nixlog' step.stepnr) %]
<tr class="[% IF step.logfile %]clickable[% END %]"
[% IF step.logfile %] onclick="window.location = '[% c.uri_for('/nixlog' build.id step.stepnr) %]'" [% END %]>
[% IF step.logfile %] onclick="window.location = '[% log %]'" [% END %]>
<td>[% step.stepnr %]</td>
<td>
[% IF step.type == 0 %]
@ -212,7 +213,7 @@
<span class="error">Failed: [% HTML.escape(step.errormsg) %]</span>
[% END %]
[% IF step.logfile %]
(<a href="[% c.uri_for('/nixlog' build.id step.stepnr) %]">log</a>)
(<a href="[% log %]">log</a>)
[% END %]
</td>
</tr>

2
src/Hydra/root/error.tt
View File

@ -3,6 +3,6 @@
<h1>Error</h1>
<p>I'm very sorry, but an error occurred: <span class="error-msg">[% HTML.escape(error) %]</span></p>
<p>I'm very sorry, but an error occurred: <span class="error-msg">[% FOREACH error IN errors %] [% HTML.escape(error) %] [% END %]</span></p>
[% END %]

19
src/Hydra/root/product-list.tt
View File

@ -5,13 +5,16 @@
<ul class="productList">
[% FOREACH product IN build.buildproducts -%]
[% uri = c.uri_for('build' build.id 'download' product.productnr product.name) %]
[% SWITCH product.type %]
[% CASE "nix-build" %]
<li class="product">
<a href="[% c.uri_for('/nixpkg' build.id) %]">
[% uri = c.uri_for('nixpkg' build.id) %]
<a href="[% uri %]">
<img src="/static/images/nix-build.png" alt="Source" />
One-click install of Nix package <tt>[% build.nixname %]</tt>
</a>
@ -25,7 +28,7 @@
browser. Alternatively, you can install it from the
command-line:
<pre>$ nix-install-package --non-interactive --url [% c.uri_for('/nixpkg' build.id) %]</pre>
<pre>$ nix-install-package --non-interactive --url [% uri %]</pre>
</p>
@ -76,7 +79,7 @@
[% CASE "file" %]
<li class="product">
<a href="[% c.uri_for('/download' build.id product.productnr product.name) %]">
<a href="[% uri %]">
[% SWITCH product.subtype %]
[% CASE "source-dist" %]
<img src="/static/images/source-dist.png" alt="Source" /> Source distribution <tt>[% product.name %]</tt>
@ -96,8 +99,8 @@
<tr>
<th>URL:</th>
<td>
<a href="[% c.uri_for('/download' build.id product.productnr product.name) %]">
<tt>[% c.uri_for('/download' build.id product.productnr product.name) %]</tt>
<a href="[% uri %]">
<tt>[% uri %]</tt>
</a>
</td>
</tr>
@ -112,7 +115,7 @@
[% CASE "report" %]
<li class="product">
<a href="[% c.uri_for('/download' build.id product.productnr product.name) %]">
<a href="[% uri %]">
<img src="/static/images/report.png" alt="Report" />
[% SWITCH product.subtype %]
[% CASE "coverage" %]
@ -126,7 +129,7 @@
[% CASE "doc" %]
<li class="product">
<a href="[% c.uri_for('/download' build.id product.productnr product.name) %]">
<a href="[% uri %]">
<img src="/static/images/document.png" alt="Document" />
[% SWITCH product.subtype %]
[% CASE "readme" %]