diff --git a/src/lib/Hydra/Controller/Job.pm b/src/lib/Hydra/Controller/Job.pm index 4587f750..a6a9c0f2 100644 --- a/src/lib/Hydra/Controller/Job.pm +++ b/src/lib/Hydra/Controller/Job.pm @@ -29,9 +29,9 @@ sub overview : Chained('job') PathPart('') Args(0) { [ $c->stash->{job}->builds->search({ finished => 1 }, { order_by => 'timestamp DESC', rows => 10, columns => [@buildListColumns] }) ]; - $c->stash->{runningBuilds} = [ + $c->stash->{queuedBuilds} = [ $c->stash->{job}->builds->search( - { busy => 1 }, + { finished => 0 }, { join => ['project'] , order_by => ["priority DESC", "timestamp"] , '+select' => ['project.enabled'] diff --git a/src/root/job.tt b/src/root/job.tt index 3b30b7d2..4e81159b 100644 --- a/src/root/job.tt +++ b/src/root/job.tt @@ -11,15 +11,15 @@
[% IF currentBuilds.size != 0 %] -

Latest builds (latest evaluation)

+

Latest builds (latest evaluation)

[% INCLUDE renderBuildList builds=currentBuilds showStatusChange=0 %] [% END %] - [% IF runningBuilds.size != 0 %] -

Running builds

- [% INCLUDE renderBuildList builds=runningBuilds showSchedulingInfo=1 hideResultInfo=1 %] + [% IF queuedBuilds.size != 0 %] +

Queued builds

+ [% INCLUDE renderBuildList builds=queuedBuilds showSchedulingInfo=1 hideResultInfo=1 %] [% END %] [% IF lastBuilds.size != 0 %] -

Last 10 builds

+

Last 10 builds

[% INCLUDE renderBuildList builds=lastBuilds showStatusChange=0 %] [% END %]
diff --git a/src/root/static/css/hydra.css b/src/root/static/css/hydra.css index a7fefe93..0866ef08 100644 --- a/src/root/static/css/hydra.css +++ b/src/root/static/css/hydra.css @@ -15,10 +15,6 @@ th { display: none; } -h3 { - margin-top: 1em; -} - table.productList { border-collapse: separate; border-spacing: 0em 1em;