lix-project/hydra
3
0
Fork 6
Code Issues 2 Pull requests 1 Packages Projects Releases Wiki Activity

* hydra: ui bug

Browse source
This commit is contained in:
Rob Vermaas 2010-02-25 13:17:11 +00:00
parent 31f68756c5
commit 557805a21a
2 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/root/common.tt
View file

@ -278,38 +278,41 @@
[% END %] [% END %]
[% BLOCK renderInputDiff; %] [% BLOCK renderInputDiff; %]
<ul class="inputdiff"> <table class="tablesorter clean">
[% IF !nestedDiff %]
<tr><th>Input</th><th>Changes</th></tr>
[% END %]
[% FOREACH bi1 IN build1.inputs %] [% FOREACH bi1 IN build1.inputs %]
[% deletedInput = 1 %] [% deletedInput = 1 %]
[% FOREACH bi2 IN build2.inputs %] [% FOREACH bi2 IN build2.inputs %]
[% IF bi1.name == bi2.name %] [% IF bi1.name == bi2.name %]
[% IF bi1.type == bi2.type %] [% IF bi1.type == bi2.type %]
[% IF bi1.value != bi2.value || bi1.uri != bi2.uri %] [% IF bi1.value != bi2.value || bi1.uri != bi2.uri %]
<li><b>[% bi1.name %]</b>: [% INCLUDE renderInputValue input=bi1 %] to [% INCLUDE renderInputValue input=bi2 %]</li> <tr><td><b>[% bi1.name %]</b></td><td>[% INCLUDE renderInputValue input=bi1 %] to [% INCLUDE renderInputValue input=bi2 %]</td></tr>
[% ELSIF bi1.uri == bi2.uri && bi1.revision != bi2.revision %] [% ELSIF bi1.uri == bi2.uri && bi1.revision != bi2.revision %]
<li> <tr><td>
<b>[% bi1.name %]</b>: [% bi1.uri %] revision changed from [% bi1.revision %] to [% bi2.revision %]. <b>[% bi1.name %]</b></td><td>[% bi1.uri %] revision changed from [% bi1.revision %] to [% bi2.revision %].
</li> </td></tr>
[% ELSIF bi1.dependency.id != bi2.dependency.id || bi1.path != bi2.path %] [% ELSIF bi1.dependency.id != bi2.dependency.id || bi1.path != bi2.path %]
<li> <tr><td>
<b>[% bi1.name %]</b>: [% INCLUDE renderInputValue input=bi1 %] to [% INCLUDE renderInputValue input=bi2 %] <b>[% bi1.name %]</b></td><td>[% INCLUDE renderInputValue input=bi1 %] to [% INCLUDE renderInputValue input=bi2 %]
<br/> <br/>
<br/> <br/>
[% INCLUDE renderInputDiff build1=bi1.dependency, build2=bi2.dependency %] [% INCLUDE renderInputDiff build1=bi1.dependency, build2=bi2.dependency, nestedDiff=1 %]
</li> </td></tr>
[% END %] [% END %]
[% ELSE %] [% ELSE %]
<li><b>[% bi1.name %]</b>: Changed input type from '[% type = bi1.type; inputTypes.$type %]' to '[% type = bi2.type; inputTypes.$type %]'</li> <tr><td><b>[% bi1.name %]</b></td><td>Changed input type from '[% type = bi1.type; inputTypes.$type %]' to '[% type = bi2.type; inputTypes.$type %]'</td></tr>
[% END %] [% END %]
[% deletedInput = 0 %] [% deletedInput = 0 %]
[% END %] [% END %]
[% END %] [% END %]
[% IF deletedInput == 1 %] [% IF deletedInput == 1 %]
<li><b>[% bi1.name %]</b>: Input not present in this build.</li> <tr><td><b>[% bi1.name %]</b></td><td>Input not present in this build.</td></tr>
[% END %] [% END %]
[% END %] [% END %]
</ul> </table>
[% END %] [% END %]

5
src/root/static/css/hydra.css
View file

@ -34,6 +34,7 @@ table {
th, td { th, td {
border: 1px solid #dddddd; border: 1px solid #dddddd;
vertical-align: top;
} }
th { th {
@ -44,6 +45,10 @@ table.tablesorter tr:nth-child(even) {
background-color: #efefef; background-color: #efefef;
} }
table.tablesorter tr:nth-child(odd) {
background-color: #ffffff;
}
tr.clickable:hover { tr.clickable:hover {
background-color: #E6EEFF; background-color: #E6EEFF;
cursor: pointer; cursor: pointer;