snaakey/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests 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
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/root/common.tt
View file

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

8
src/root/jobset.tt
View file

@ -90,7 +90,7 @@
</ul> </ul>
<div id="tabs-information"> <div id="tabs-information">
[% IF jobset.errormsg && !edit -%] [% 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"> <script type="text/javascript">
$('#error-link').click(function() { $('#error-link').click(function() {
$("#generic-tabs").tabs('select', 1); $("#generic-tabs").tabs('select', 1);
@ -119,11 +119,7 @@
<td class="centered"> <td class="centered">
[% IF systemStatus != undef %] [% IF systemStatus != undef %]
<a href="[% c.uri_for('/build' j.get_column(system _ '-build') ) %]"> <a href="[% c.uri_for('/build' j.get_column(system _ '-build') ) %]">
[% IF systemStatus == 0 %] [% INCLUDE renderBuildStatusIcon buildstatus=systemStatus size=16 %]
<img src="/static/images/success.gif" alt="Succeeded" />
[% ELSE %]
<img src="/static/images/failure.gif" alt="Failed" />
[% END %]
</a> </a>
[% END %] [% END %]
</td> </td>

9
src/root/project.tt
View file

@ -40,17 +40,18 @@
</thead> </thead>
<tbody> <tbody>
[% FOREACH j IN jobsets %] [% FOREACH j IN jobsets %]
[% successrate = 0 %]
<tr class="clickable [% IF odd %] odd [% END; odd = !odd %]" <tr class="clickable [% IF odd %] odd [% END; odd = !odd %]"
onclick="window.location = '[% c.uri_for('/jobset' project.name j.name) %]'"> onclick="window.location = '[% c.uri_for('/jobset' project.name j.name) %]'">
<td> <td>
[% IF j.get_column('nrscheduled') > 0 %] [% 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 %] [% 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 %] [% 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 %] [% ELSE %]
<img src="/static/images/failure.gif" alt="All Failed" /> <img src="/static/images/error_16.png" alt="All Failed" />
[% END %] [% END %]
</td> </td>
<td>[% INCLUDE renderJobsetName project = project.name jobset = j.name %]</td> <td>[% INCLUDE renderJobsetName project = project.name jobset = j.name %]</td>

10
src/root/view.tt
View file

@ -30,11 +30,11 @@
<tr class="clickable" onclick="window.location = '[% link %]'"> <tr class="clickable" onclick="window.location = '[% link %]'">
<td> <td>
[% IF result.status == 0 %] [% IF result.status == 0 %]
<img src="/static/images/success.gif" /> <img src="/static/images/checkmark_16.png" />
[% ELSIF result.status == 1 %] [% ELSIF result.status == 1 %]
<img src="/static/images/failure.gif" /> <img src="/static/images/error_16.png" />
[% ELSIF result.status == 2 %] [% ELSIF result.status == 2 %]
<img src="/static/images/question-mark.png" /> <img src="/static/images/help_16.png" />
[% END %] [% END %]
</td> </td>
<td><a href="[% link %]">[% result.id %]</a></td> <td><a href="[% link %]">[% result.id %]</a></td>
@ -51,9 +51,9 @@
[% IF j.build %] [% IF j.build %]
<a href="[% c.uri_for('/build' j.build.id) %]"> <a href="[% c.uri_for('/build' j.build.id) %]">
[% IF j.build.get_column('buildstatus') == 0 %] [% IF j.build.get_column('buildstatus') == 0 %]
<img src="/static/images/success.gif" /> <img src="/static/images/checkmark_16.png" />
[% ELSE %] [% ELSE %]
<img src="/static/images/failure.gif" /> <img src="/static/images/error_16.png" />
[% END %] [% END %]
</a> </a>
[% END %] [% END %]