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

use newer icons consistently

Browse Source
This commit is contained in:
Rob Vermaas
2011-11-16 13:29:40 -05:00
parent 98fadb53e4
commit c8127b887f
4 changed files with 36 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/root/common.tt
View File

@ -100,12 +100,8 @@
onclick="window.location = '[% c.uri_for('/build' build.id) %]'">
[% IF !hideResultInfo %]
<td>
[% IF build.get_column('buildstatus') == 0 %]
<img src="/static/images/success.gif" alt="Succeeded" />
[% ELSE %]
<img src="/static/images/failure.gif" alt="Failed" />
[% END %]
</td>
[% INCLUDE renderBuildStatusIcon size=16 %]
</td>
[% END %]
<td><a href="[% c.uri_for('/build' build.id) %]">[% build.id %]</a></td>
[% IF showSchedulingInfo %]
@ -148,11 +144,11 @@
<td>[% finishedBuilds %]</td>
</tr>
<tr>
<th><img src="/static/images/success.gif" alt="Succeeded" /> Succeeded builds:</th>
<th><img src="/static/images/checkmark_16.png" alt="Succeeded" /> Succeeded builds:</th>
<td>[% succeededBuilds %]</td>
</tr>
<tr>
<th><img src="/static/images/failure.gif" alt="Failed" /> Failed builds:</th>
<th><img src="/static/images/error_16.png" alt="Failed" /> Failed builds:</th>
<td>[% finishedBuilds - succeededBuilds %]</td>
</tr>
<tr>
@ -208,24 +204,27 @@
[% END %]
[% BLOCK renderBuildStatusIcon; %]
[% IF build.finished %]
[% IF build.resultInfo.buildstatus == 0 %]
[% finished = build != undef ? build.finished : 1 %]
[% busy = build != undef ? build.schedulingInfo.busy : 0 %]
[% buildstatus = buildstatus != undef ? buildstatus : build.resultInfo.buildstatus %]
[% IF finished %]
[% IF buildstatus == 0 %]
<img src="/static/images/checkmark_[% size %].png" alt="Succeeded" />
[% ELSIF build.resultInfo.buildstatus == 1 %]
[% ELSIF buildstatus == 1 %]
<img src="/static/images/error_[% size %].png" alt="Failed" />
[% ELSIF build.resultInfo.buildstatus == 2 %]
[% ELSIF buildstatus == 2 %]
<img src="/static/images/dependency_[% size %].png" alt="Dependency failed" />
[% ELSIF buildstatus == 4 %]
<img src="/static/images/error_[% size %].png" alt="Failed" />
[% ELSIF build.resultInfo.buildstatus == 4 %]
[% ELSIF buildstatus == 5 %]
<img src="/static/images/error_[% size %].png" alt="Failed" />
[% ELSIF build.resultInfo.buildstatus == 5 %]
<img src="/static/images/error_[% size %].png" alt="Failed" />
[% ELSIF build.resultInfo.buildstatus == 6 %]
[% ELSIF buildstatus == 6 %]
<img src="/static/images/error_[% size %].png" alt="Failed (with result)" />
[% ELSE %]
<img src="/static/images/error_[% size %].png" alt="Failed" />
[% END %]
[% ELSIF build.schedulingInfo.busy %]
<img src="/static/images/help_[% size %].png" alt="Budy" />
[% ELSIF busy %]
<img src="/static/images/help_[% size %].png" alt="Busy" />
[% ELSE %]
<img src="/static/images/help_[% size %].png" alt="Scheduled" />
[% END %]
@ -234,27 +233,27 @@
[% BLOCK renderStatus; %]
[% IF build.finished %]
[% IF build.resultInfo.buildstatus == 0 %]
<img src="/static/images/success.gif" alt="Succeeded" />
[% INCLUDE renderBuildStatusIcon size=16 %]
<strong>Success</strong>
[% ELSIF build.resultInfo.buildstatus == 1 %]
<img src="/static/images/failure.gif" alt="Failed" />
[% INCLUDE renderBuildStatusIcon size=16 %]
<span class="error">Build returned a non-zero exit code</span>
[% ELSIF build.resultInfo.buildstatus == 2 %]
<img src="/static/images/failure.gif" alt="Failed" />
[% INCLUDE renderBuildStatusIcon size=16 %]
<span class="error">A dependency of the build failed</span>
[% ELSIF build.resultInfo.buildstatus == 4 %]
<img src="/static/images/failure.gif" alt="Failed" />
[% INCLUDE renderBuildStatusIcon size=16 %]
<span class="error">Cancelled by user</span>
[% ELSIF build.resultInfo.buildstatus == 5 %]
<img src="/static/images/failure.gif" alt="Failed" />
[% INCLUDE renderBuildStatusIcon size=16 %]
<span class="error">Build inhibited because a dependency previously failed to build</span>
[% failedDep = build.resultInfo.failedDep %]
(namely, <a href="[% c.uri_for('/build' failedDep.build.id 'nixlog' failedDep.stepnr) %]"><tt>[% failedDep.outpath %]</tt></a>)
[% ELSIF build.resultInfo.buildstatus == 6 %]
<img src="/static/images/failure.gif" alt="Failed (with result)" />
[% INCLUDE renderBuildStatusIcon size=16 %]
<span class="error">Build failed (with result)</span>
[% ELSE %]
<img src="/static/images/failure.gif" alt="Failed" />
[% INCLUDE renderBuildStatusIcon size=16 %]
<span class="error">Build failed</span>
(see <a href="#nix-error">below</a>)
[% END %]