Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/hydra
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 88a92256e1fd
Choose a base ref
...
head repository: NixOS/hydra
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: baf828a56070
Choose a head ref
  • 6 commits
  • 3 files changed
  • 2 contributors

Commits on Dec 15, 2018

  1. Add job status headers (web useability for red/green colorblindness).

    @kquick
    kquick committed Dec 15, 2018
    Copy the full SHA
    5716e69 View commit details

Commits on Dec 16, 2018

  1. Remove blank lines, consistent attribute quoting, use svg for delta h… 

    …eader, column sizes.
    @kquick
    kquick committed Dec 16, 2018
    Copy the full SHA
    0e7593a View commit details

Commits on Dec 17, 2018

  1. Use rowspans to align Jobs reference in evaluations rendering

    @kquick
    kquick committed Dec 17, 2018
    Copy the full SHA
    dfce2ad View commit details

  2. Lighten delta mark to blend better with other column headers.

    @kquick
    kquick committed Dec 17, 2018
    Copy the full SHA
    8315e20 View commit details

Commits on Mar 17, 2019

  1. Merge branch 'master' into job_headers

    @grahamc
    grahamc authored Mar 17, 2019
    Copy the full SHA
    21a4433 View commit details

  2. Merge pull request #624 from kquick/job_headers 

    Add job status headers (web useability for red/green colorblindness).
    @grahamc
    grahamc authored Mar 17, 2019
    Copy the full SHA
    baf828a View commit details
Showing with 45 additions and 6 deletions.
  1. +39 −6 src/root/common.tt
  2. +5 −0 src/root/static/css/hydra.css
  3. +1 −0 src/root/static/images/delta.svg
45 changes: 39 additions & 6 deletions src/root/common.tt
View file
Original file line number Diff line number Diff line change
@@ -433,13 +433,27 @@ BLOCK renderEvals %]
<table class="table table-condensed table-striped clickable-rows">
<thead>
<tr>
<th>#</th>
<th rowspan="2">#</th>
[% IF !jobset && !build %]
<th>Jobset</th>
<th rowspan="2">Jobset</th>
[% END %]
<th style="width: 10em">Date</th>
<th>Input changes</th>
<th colspan='2' style="width: 25em">Success</th>
<th rowspan="2" style="width: 10em">Date</th>
<th rowspan="2">Input changes</th>
<th colspan="3">Jobs</th>
<th rowspan="2">
<img src="[% c.uri_for("/static/images/delta.svg") %]" height="12" width="12" title="Delta" alt="Delta" class="build-status" />
</th>
</tr>
<tr>
<th style="width: 2em">
<img src="[% c.uri_for("/static/images/emojione-check-2714.svg") %]" height="12" width="12" title="Succeeded" alt="Succeeded" class="build-status" />
</th>
<th style="width: 2em">
<img src="[% c.uri_for("/static/images/emojione-red-x-274c.svg") %]" height="12" width="12" title="Failed" alt="Failed" class="build-status" />
</th>
<th style="width: 2em">
<img src="[% c.uri_for("/static/images/emojione-question-2754.svg") %]" height="12" width="12" title="Queued" alt="Queued" class="build-status" />
</th>
</tr>
</thead>
<tbody>
@@ -465,9 +479,13 @@ BLOCK renderEvals %]
</td>
<td align='right' class="nowrap">
<span class="label label-success">[% e.nrSucceeded %]</span>
</td>
<td align="right" class="nowrap">
[% IF e.nrFailed > 0 %]
<span class="label label-important">[% e.nrFailed %]</span>
[% END %]
</td>
<td align="right" class="nowrap">
[% IF e.nrScheduled > 0 %]
<span class="label">[% e.nrScheduled %]</span>
[% END %]
@@ -534,7 +552,18 @@ BLOCK renderJobsetOverview %]
<th>Name</th>
<th>Description</th>
<th>Last evaluated</th>
<th colspan="2">Success</th>
<th style="width: 2em">
Jobs
</th>
<th style="width: 2em">
<img src="[% c.uri_for("/static/images/emojione-check-2714.svg") %]" height="12" width="12" title="Succeeded" alt="Succeeded" class="build-status" />
</th>
<th style="width: 2em">
<img src="[% c.uri_for("/static/images/emojione-red-x-274c.svg") %]" height="12" width="12" title="Failed" alt="Failed" class="build-status" />
</th>
<th style="width: 2em">
<img src="[% c.uri_for("/static/images/emojione-question-2754.svg") %]" height="12" width="12" title="Queued" alt="Queued" class="build-status" />
</th>
</tr>
</thead>
<tbody>
@@ -572,9 +601,13 @@ BLOCK renderJobsetOverview %]
[% IF j.get_column('nrsucceeded') > 0 %]
<span class="label label-success">[% j.get_column('nrsucceeded') %]</span>
[% END %]
</td>
<td>
[% IF j.get_column('nrfailed') > 0 %]
<span class="label label-important">[% j.get_column('nrfailed') %]</span>
[% END %]
</td>
<td>
[% IF j.get_column('nrscheduled') > 0 %]
<span class="label label">[% j.get_column('nrscheduled') %]</span>
[% END %]
5 changes: 5 additions & 0 deletions src/root/static/css/hydra.css
View file
Original file line number Diff line number Diff line change
@@ -143,6 +143,11 @@ td.step-status span.warn {
font-weight: bold;
}

/* Assumes borders are never desired in multi-row table heads */
.table thead th {
border-top: 0;
}

.date {
cursor: help;
border-bottom: 1px dotted #999;
1 change: 1 addition & 0 deletions src/root/static/images/delta.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.