Transpose the aggregate constituents table
This way, it grows vertically rather than horizontally. Horizontal may be more "logical", but this is more practical.
This commit is contained in:
@@ -28,51 +28,34 @@
|
||||
|
||||
<div id="tabs-constituents" class="tab-pane">
|
||||
|
||||
<table class="table table-striped table-condensed">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>#</th>
|
||||
[% FOREACH j IN constituentJobs %]
|
||||
<th>[% HTML.escape(j) %]</th>
|
||||
[% END %]
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
[% FOREACH agg IN aggregates.keys.nsort.reverse %]
|
||||
<tr>
|
||||
<td><a class="row-link" href="[% c.uri_for('/build' agg) %]">[% agg %]</a></td>
|
||||
[% FOREACH j IN constituentJobs %]
|
||||
<td>
|
||||
[% r = aggregates.$agg.$j; IF r.id %]
|
||||
<a href="[% c.uri_for('/build' r.id) %]">
|
||||
[% INCLUDE renderBuildStatusIcon size=16 build=r %]
|
||||
</a>
|
||||
[% END %]
|
||||
</td>
|
||||
[% END %]
|
||||
</tr>
|
||||
[% END %]
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<hr/>
|
||||
<div class="well well-small">This is an <em>aggregate job</em>:
|
||||
its success or failure is determined entirely by the result of
|
||||
building its <em>constituent jobs</em>. The table below shows
|
||||
the status of each constituent job for the [%
|
||||
aggregates.keys.size %] most recent builds of the
|
||||
aggregate.</div>
|
||||
|
||||
<table class="table table-striped table-condensed">
|
||||
[% aggs = aggregates.keys.nsort.reverse %]
|
||||
<table class="table table-striped table-condensed table-header-rotated">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>#</th>
|
||||
[% FOREACH j IN constituentJobs %]
|
||||
<th>[% HTML.escape(j) %]</th>
|
||||
<th>Job</th>
|
||||
[% FOREACH agg IN aggs %]
|
||||
<th class="rotate-45">
|
||||
[% agg_ = aggregates.$agg %]
|
||||
<div><span class="[% agg_.build.finished == 0 ? "text-info" : (agg_.build.buildstatus == 0 ? "text-success" : "text-warning") %] override-link">
|
||||
<a href="[% c.uri_for('/build' agg) %]">[% agg %]</a>
|
||||
</span></div></th>
|
||||
[% END %]
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
[% FOREACH agg IN aggregates.keys.nsort.reverse %]
|
||||
[% FOREACH j IN constituentJobs %]
|
||||
<tr>
|
||||
<td><a class="row-link" href="[% c.uri_for('/build' agg) %]">[% agg %]</a></td>
|
||||
[% FOREACH j IN constituentJobs %]
|
||||
<td>
|
||||
[% r = aggregates.$agg.$j; IF r.id %]
|
||||
<th style="width: 1em;">[% INCLUDE renderJobName project=project.name jobset=jobset.name job=j %]</th>
|
||||
[% FOREACH agg IN aggs %]
|
||||
<td>
|
||||
[% r = aggregates.$agg.constituents.$j; IF r.id %]
|
||||
<a href="[% c.uri_for('/build' r.id) %]">
|
||||
[% INCLUDE renderBuildStatusIcon size=16 build=r %]
|
||||
</a>
|
||||
@@ -84,7 +67,6 @@
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
[% END %]
|
||||
|
Reference in New Issue
Block a user