use newer icons consistently
This commit is contained in:
Rob Vermaas
parent
98fadb53e4
commit
c8127b887f
|
|
@ -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 %]
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@
|
|||
</ul>
|
||||
<div id="tabs-information">
|
||||
[% IF jobset.errormsg && !edit -%]
|
||||
<table class="layoutTable"><tr><td><img src="/static/images/failure.gif" /></td><td><a href="#tabs-errors" id="error-link">There are evaluation errors!</a></td></tr></table>
|
||||
<table class="layoutTable"><tr><td><img src="/static/images/error_16.png" /></td><td><a href="#tabs-errors" id="error-link">There are evaluation errors!</a></td></tr></table>
|
||||
<script type="text/javascript">
|
||||
$('#error-link').click(function() {
|
||||
$("#generic-tabs").tabs('select', 1);
|
||||
|
|
@ -119,11 +119,7 @@
|
|||
<td class="centered">
|
||||
[% IF systemStatus != undef %]
|
||||
<a href="[% c.uri_for('/build' j.get_column(system _ '-build') ) %]">
|
||||
[% IF systemStatus == 0 %]
|
||||
<img src="/static/images/success.gif" alt="Succeeded" />
|
||||
[% ELSE %]
|
||||
<img src="/static/images/failure.gif" alt="Failed" />
|
||||
[% END %]
|
||||
[% INCLUDE renderBuildStatusIcon buildstatus=systemStatus size=16 %]
|
||||
</a>
|
||||
[% END %]
|
||||
</td>
|
||||
|
|
|
|||
|
|
@ -40,17 +40,18 @@
|
|||
</thead>
|
||||
<tbody>
|
||||
[% FOREACH j IN jobsets %]
|
||||
[% successrate = 0 %]
|
||||
<tr class="clickable [% IF odd %] odd [% END; odd = !odd %]"
|
||||
onclick="window.location = '[% c.uri_for('/jobset' project.name j.name) %]'">
|
||||
<td>
|
||||
[% IF j.get_column('nrscheduled') > 0 %]
|
||||
<img src="/static/images/question-mark.png" alt="Scheduled" />
|
||||
<img src="/static/images/help_16.png" alt="Scheduled" />
|
||||
[% ELSIF j.get_column('nrfailed') == 0 %]
|
||||
<img src="/static/images/success.gif" alt="Succeeded" />
|
||||
<img src="/static/images/checkmark_16.png" alt="Succeeded" />
|
||||
[% ELSIF j.get_column('nrfailed') > 0 && j.get_column('nrsucceeded') > 0 %]
|
||||
<img src="/static/images/failure-some.gif" alt="Some Failed" />
|
||||
<img src="/static/images/error_some_16.png" alt="Some Failed" />
|
||||
[% ELSE %]
|
||||
<img src="/static/images/failure.gif" alt="All Failed" />
|
||||
<img src="/static/images/error_16.png" alt="All Failed" />
|
||||
[% END %]
|
||||
</td>
|
||||
<td>[% INCLUDE renderJobsetName project = project.name jobset = j.name %]</td>
|
||||
|
|
|
|||
|
|
@ -30,11 +30,11 @@
|
|||
<tr class="clickable" onclick="window.location = '[% link %]'">
|
||||
<td>
|
||||
[% IF result.status == 0 %]
|
||||
<img src="/static/images/success.gif" />
|
||||
<img src="/static/images/checkmark_16.png" />
|
||||
[% ELSIF result.status == 1 %]
|
||||
<img src="/static/images/failure.gif" />
|
||||
<img src="/static/images/error_16.png" />
|
||||
[% ELSIF result.status == 2 %]
|
||||
<img src="/static/images/question-mark.png" />
|
||||
<img src="/static/images/help_16.png" />
|
||||
[% END %]
|
||||
</td>
|
||||
<td><a href="[% link %]">[% result.id %]</a></td>
|
||||
|
|
@ -51,9 +51,9 @@
|
|||
[% IF j.build %]
|
||||
<a href="[% c.uri_for('/build' j.build.id) %]">
|
||||
[% IF j.build.get_column('buildstatus') == 0 %]
|
||||
<img src="/static/images/success.gif" />
|
||||
<img src="/static/images/checkmark_16.png" />
|
||||
[% ELSE %]
|
||||
<img src="/static/images/failure.gif" />
|
||||
<img src="/static/images/error_16.png" />
|
||||
[% END %]
|
||||
</a>
|
||||
[% END %]
|
||||
|
|
|
|||
Loading…
Reference in a new issue