diff --git a/src/root/admin.tt b/src/root/admin.tt index c1f4f641..01aafc3d 100644 --- a/src/root/admin.tt +++ b/src/root/admin.tt @@ -1,8 +1,6 @@ -[% WRAPPER layout.tt title="Admin" %] +[% WRAPPER layout.tt title="Machine status" %] [% PROCESS common.tt %] -

Machine status

- [% FOREACH m IN machines %] diff --git a/src/root/all.tt b/src/root/all.tt index 43377ca4..5a568028 100644 --- a/src/root/all.tt +++ b/src/root/all.tt @@ -1,11 +1,9 @@ -[% WRAPPER layout.tt title="All builds" %] +[% WRAPPER layout.tt title="All builds" _ + (job ? " for job $project.name:$jobset.name:$job.name" : + jobset ? " for jobset $project.name:$jobset.name" : + project ? " for project $project.name" : "") %] [% PROCESS common.tt %] -

All builds - [% IF job %]for Job [% project.name %]:[% jobset.name %]:[% job.name %] - [% ELSIF jobset %]for Jobset [% project.name %]:[% jobset.name %] - [% ELSIF project %] for Project [% project.name %][% END %]

-

Showing builds [% (page - 1) * resultsPerPage + 1 %] - [% (page - 1) * resultsPerPage + builds.size %] out of [% total %] in order of descending timestamp.

[% INCLUDE renderPager %] diff --git a/src/root/build.tt b/src/root/build.tt index deb455ae..fbfcb913 100644 --- a/src/root/build.tt +++ b/src/root/build.tt @@ -1,4 +1,4 @@ -[% WRAPPER layout.tt title="Job ‘$project.name:$jobset.name:$job.name’ build $id" %] +[% WRAPPER layout.tt title="Build $id of job $project.name:$jobset.name:$job.name" %] [% PROCESS common.tt %] [% PROCESS "product-list.tt" %] [% USE HTML %] @@ -96,6 +96,10 @@ [% INCLUDE renderStatus build=build icon=0 %] + + + + [% IF build.releasename %] @@ -107,10 +111,6 @@ [% END %] - - - - [% IF build.iscachedbuild %] @@ -142,6 +142,7 @@
System:[% build.system %]
Release name:[% build.nixname %]
System:[% build.system %]
Cached from:
[% IF c.user_exists && available %] +
@@ -276,12 +277,6 @@ [% INCLUDE renderDateTime timestamp = build.timestamp %] [% IF build.finished && build.buildstatus != 4 %] - [% IF build.iscachedbuild && cachedBuild %] - - Cached build: - [% INCLUDE renderFullBuildLink build=cachedBuild %] - - [% END %] Build started: [% IF build.starttime %][% INCLUDE renderDateTime timestamp = build.starttime %][% ELSE %](cached build)[% END %] diff --git a/src/root/channel-contents.tt b/src/root/channel-contents.tt index 0c5a899b..90449ef9 100644 --- a/src/root/channel-contents.tt +++ b/src/root/channel-contents.tt @@ -2,8 +2,6 @@ [% PROCESS common.tt %] [% USE HTML %] -

Channel [% channelName %]

-

This page provides a channel for the Nix package manager. If you have Nix installed, you can subscribe to this channel by once executing

@@ -51,18 +49,18 @@ install the package simply by clicking on the packages below.

[% FOREACH pkg IN nixPkgs %] - [% build = pkg.build %] + [% b = pkg.build %] [% uri = "${curUri}/pkg/${pkg.name}.nixpkg" %] - [% build.id %] - [% build.get_column('releasename') || build.nixname %] - [% build.system %] + [% b.id %] + [% b.get_column('releasename') || b.nixname %] + [% b.system %] - [% IF build.homepage %] - build.homepage) %]>[% HTML.escape(build.description) %] + [% IF b.homepage %] + b.homepage) %]>[% HTML.escape(b.description) %] [% ELSE %] - [% HTML.escape(build.description) %] + [% HTML.escape(b.description) %] [% END %] [% IF pkg.outName != 'out' %] [[% pkg.outName %]][% END %] @@ -70,7 +68,6 @@ install the package simply by clicking on the packages below.

[% END %] - diff --git a/src/root/clone-build.tt b/src/root/clone-build.tt index 95dede4f..cf2ba569 100644 --- a/src/root/clone-build.tt +++ b/src/root/clone-build.tt @@ -1,10 +1,8 @@ -[% WRAPPER layout.tt title="Clone Build" %] +[% WRAPPER layout.tt title="Clone build ${build.id}" %] [% PROCESS common.tt %] [% USE HTML %] [% edit=1 %] -

Clone Build

-

Cloning allows you to perform a build with modified inputs.

diff --git a/src/root/clone-jobset.tt b/src/root/clone-jobset.tt index 1f7a46e6..1440783a 100644 --- a/src/root/clone-jobset.tt +++ b/src/root/clone-jobset.tt @@ -1,17 +1,23 @@ -[% WRAPPER layout.tt title="Clone Jobset" %] +[% WRAPPER layout.tt title="Clone jobset $jobset.project.name:$jobset.name" %] [% PROCESS common.tt %] [% USE HTML %] [% edit=1 %] - + -

Cloning jobset [% jobset.project.name %]:[% jobset.name %]

-

- Name "") %] /> -

-

- -

+
+
+ +
+ +
+
+ +
+ +
+ +
diff --git a/src/root/common.tt b/src/root/common.tt index 21cfb39c..fddeaecc 100644 --- a/src/root/common.tt +++ b/src/root/common.tt @@ -394,28 +394,6 @@ BLOCK renderInputDiff; %] [% END; -BLOCK hydraStatus %] - - - - - - [% FOREACH step IN steps %] - - - - - - - - - - [% END %] - -
MachineJobTypeBuildStepWhatSince
[% IF step.machine; step.machine.match('@(.*)').0; ELSE; 'localhost'; END %][% INCLUDE renderFullJobName project = step.build.project.name jobset = step.build.jobset.name job = step.build.job.name %][% step.system %][% step.build.id %][% step.stepnr %][% step.drvpath.match('-(.*)').0 %][% INCLUDE renderDuration duration = curTime - step.starttime %]
-[% END; - - BLOCK renderPager %] -

Showing evaluations [% (page - 1) * resultsPerPage + 1 %] - [% (page - 1) * resultsPerPage + evals.size %] out of [% total %].

diff --git a/src/root/jobset.tt b/src/root/jobset.tt index d445fb57..01a5780a 100644 --- a/src/root/jobset.tt +++ b/src/root/jobset.tt @@ -1,4 +1,4 @@ -[% WRAPPER layout.tt title=(edit ? (create ? "New Jobset in Project ‘$project.name’" : "Editing Jobset ‘$project.name:$jobset.name’") : "Jobset ‘$project.name:$jobset.name’") %] +[% WRAPPER layout.tt title=(edit ? (create ? "Create jobset in project $project.name" : "Editing jobset $project.name:$jobset.name") : "Jobset $project.name:$jobset.name") %] [% PROCESS common.tt %] [% IF edit %] @@ -6,11 +6,6 @@ [% END %] -[% IF create %] -

New Jobset in Project [% project.name %]

-[% END %] - - [% BLOCK renderInputAlt %] [% IF edit %] @@ -258,7 +253,9 @@ }); -

+
+ +
diff --git a/src/root/jobstatus.tt b/src/root/jobstatus.tt index b37fa3c2..333854a2 100644 --- a/src/root/jobstatus.tt +++ b/src/root/jobstatus.tt @@ -1,8 +1,9 @@ -[% WRAPPER layout.tt title="Job status" %] +[% WRAPPER layout.tt title="Job status" _ + (job ? " of job $project.name:$jobset.name:$job.name" : + jobset ? " of jobset $project.name:$jobset.name" : + project ? " of project $project.name" : "") %] [% PROCESS common.tt %] -

Job status[% IF project %] of [% project.name %][% IF jobset %]:[% jobset.name%][% END %][% IF job %]:[% job.name%][% END %][% END %]

-

Below are the latest builds for each job. It is ordered by the status change time (the timestamp of the last build that had a different build result status). That is, it shows the jobs that most recently diff --git a/src/root/layout.tt b/src/root/layout.tt index 3f3f8bf3..277bab78 100644 --- a/src/root/layout.tt +++ b/src/root/layout.tt @@ -4,20 +4,20 @@ [% PROCESS common.tt %] - + - + - Hydra - [% title %] + Hydra - [% HTML.escape(title) %] - + - - + + @@ -104,6 +104,14 @@

+ [% IF !hideHeader %] +
+

[% HTML.escape(title) %]

+
+ [% ELSE %] +
+ [% END %] + [% content %]
- +
diff --git a/src/root/machine.tt b/src/root/machine.tt index 0c983fc3..1fe68bcd 100644 --- a/src/root/machine.tt +++ b/src/root/machine.tt @@ -1,8 +1,6 @@ -[% WRAPPER layout.tt title=(create ? "New machine" : "Editing machine '$machine.hostname'") %] +[% WRAPPER layout.tt title=(create ? "New machine" : "Machine $machine.hostname") %] [% PROCESS common.tt %] -

[% IF create %]New machine[% ELSE %]Machine [% machine.hostname %][% END %]

-
diff --git a/src/root/machines.tt b/src/root/machines.tt index 9ad49246..26cee09c 100644 --- a/src/root/machines.tt +++ b/src/root/machines.tt @@ -1,8 +1,6 @@ -[% WRAPPER layout.tt title="Machines" %] +[% WRAPPER layout.tt title="Build machines" %] [% PROCESS common.tt %] -

Build machines

- diff --git a/src/root/news.tt b/src/root/news.tt index cffc6caa..7f489263 100644 --- a/src/root/news.tt +++ b/src/root/news.tt @@ -2,7 +2,6 @@ [% PROCESS common.tt %] [% USE String %] -

News items

[% IF newsItems.size == 0 %]

No news items

diff --git a/src/root/overview.tt b/src/root/overview.tt index eaf7bba9..85b2acbb 100644 --- a/src/root/overview.tt +++ b/src/root/overview.tt @@ -1,4 +1,4 @@ -[% WRAPPER layout.tt title="Overview" %] +[% WRAPPER layout.tt title="Overview" hideHeader=1 %] [% PROCESS common.tt %] [% IF newItems.size != 0 %] diff --git a/src/root/plain.tt b/src/root/plain.tt index bb6c09cb..8ec217d0 100644 --- a/src/root/plain.tt +++ b/src/root/plain.tt @@ -5,10 +5,6 @@ [% jobset = build.jobset %] [% job = build.job %] -

[% title %]

- -
[% contents %] -
[% END %] diff --git a/src/root/project.tt b/src/root/project.tt index 6b43f256..613f8bfc 100644 --- a/src/root/project.tt +++ b/src/root/project.tt @@ -1,8 +1,8 @@ -[% WRAPPER layout.tt title=(edit ? (create ? "New Project" : "Editing Project ‘$project.name’") : "Project ‘$project.name’") %] +[% WRAPPER layout.tt title=(edit ? (create ? "New Project" : "Editing project $project.name") : "Project $project.name") %] [% PROCESS common.tt %]
    [% IF !edit %] -
  • Project
    • +
  • Overview
    • [% END %]
  • Settings
    • [% IF !edit %] @@ -14,8 +14,6 @@ [% IF !edit %]
    -

    Jobsets

    - [% IF project.jobsets.size > 0 %]

    This project has the following jobsets:

    @@ -94,9 +92,6 @@ [% END %] - -

    Information

    -
[% IF edit %] @@ -140,7 +135,7 @@ [% IF edit %] -

+

@@ -167,8 +162,6 @@ [% IF !edit %]
-

Views

- [% IF views.size > 0 %]

Project [% project.name %] has the following views:

diff --git a/src/root/queue.tt b/src/root/queue.tt index 1c6d3425..b9847d5a 100644 --- a/src/root/queue.tt +++ b/src/root/queue.tt @@ -1,8 +1,6 @@ [% WRAPPER layout.tt title="Queue" %] [% PROCESS common.tt %] -

Hydra queue

-

Running build steps

[% IF flashMsg %] diff --git a/src/root/release.tt b/src/root/release.tt index eb7fbaea..1fb1d6e1 100644 --- a/src/root/release.tt +++ b/src/root/release.tt @@ -1,13 +1,10 @@ -[% WRAPPER layout.tt title="Release ‘$release.name’" %] +[% WRAPPER layout.tt title="Release $release.name" %] [% PROCESS common.tt %] [% PROCESS "product-list.tt" %] [% USE HTML %] -

Release [% release.name %] -

-

Released on [% INCLUDE renderDateTime timestamp = -release.timestamp %].

+release.timestamp %].

[% IF !members %] diff --git a/src/root/releases.tt b/src/root/releases.tt index c0fc6a38..c82f5507 100644 --- a/src/root/releases.tt +++ b/src/root/releases.tt @@ -1,9 +1,7 @@ -[% WRAPPER layout.tt title="Releases for Project ‘$project.name’" %] +[% WRAPPER layout.tt title="Releases for project $project.name" %] [% PROCESS common.tt %] [% USE HTML %] -

Releases for Project [% project.name %]

- [% IF releases.size == 0 %]

This project has no releases yet.

diff --git a/src/root/static/css/hydra.css b/src/root/static/css/hydra.css index 0eaeefb4..20f767f3 100644 --- a/src/root/static/css/hydra.css +++ b/src/root/static/css/hydra.css @@ -1,5 +1,5 @@ body { - padding-top: 60px; + padding-top: 40px; } .logo { diff --git a/src/root/status.tt b/src/root/status.tt index ee820c2e..14a62d46 100644 --- a/src/root/status.tt +++ b/src/root/status.tt @@ -1,8 +1,23 @@ -[% WRAPPER layout.tt title="Hydra status" %] +[% WRAPPER layout.tt title="Active build steps" %] [% PROCESS common.tt %] -

Hydra status

- -[% INCLUDE hydraStatus %] +
+ + + + + [% FOREACH step IN steps %] + + + + + + + + + + [% END %] + +
MachineJobTypeBuildStepWhatSince
[% IF step.machine; step.machine.match('@(.*)').0; ELSE; 'localhost'; END %][% INCLUDE renderFullJobName project = step.build.project.name jobset = step.build.jobset.name job = step.build.job.name %][% step.system %][% step.build.id %][% step.stepnr %][% step.drvpath.match('-(.*)').0 %][% INCLUDE renderDuration duration = curTime - step.starttime %]
[% END %] diff --git a/src/root/timeline.tt b/src/root/timeline.tt index f380898c..2f665ad0 100644 --- a/src/root/timeline.tt +++ b/src/root/timeline.tt @@ -4,8 +4,6 @@ [% PROCESS common.tt %] -

Hydra timeline of last 24 hours

- diff --git a/src/root/topbar.tt b/src/root/topbar.tt index 2411fee5..69cd24cc 100644 --- a/src/root/topbar.tt +++ b/src/root/topbar.tt @@ -124,8 +124,8 @@ [% IF build %] [% WRAPPER makeSubMenu title=("Build: " _ build.id) %] [% INCLUDE makeLink - uri = '#' - title = "Related builds" %] + uri = c.uri_for('/build' build.id) + title = "Overview" %] [% IF c.user_exists %]
  • [% INCLUDE makeLink @@ -177,7 +177,7 @@ class = "" %] [% INCLUDE maybeLink uri = c.uri_for(c.controller('Admin').action_for('clear_queue_non_current')) - content = "Clear all non-running old builds from queue." + content = "Clear all non-running old builds from queue" confirmmsg = "Are you sure you want to clear the queue?" class = "" %] diff --git a/src/root/user.tt b/src/root/user.tt index 2ba14c26..5bd91d6c 100644 --- a/src/root/user.tt +++ b/src/root/user.tt @@ -1,4 +1,4 @@ -[% WRAPPER layout.tt title=(create ? "New user" : "Editing user '$user.username'") %] +[% WRAPPER layout.tt title=(create ? "New user" : "User $user.username") %] [% PROCESS common.tt %] [% BLOCK roleoption %] @@ -14,8 +14,6 @@ >[% role %] [% END %] -

    [% IF create %]New user[% ELSE %]User [% user.username %][% END %]

    -
    diff --git a/src/root/users.tt b/src/root/users.tt index b937b85c..56d54088 100644 --- a/src/root/users.tt +++ b/src/root/users.tt @@ -1,8 +1,6 @@ [% WRAPPER layout.tt title="Users" %] [% PROCESS common.tt %] -

    Users

    - diff --git a/src/root/view-result.tt b/src/root/view-result.tt index 6852f751..928f3d03 100644 --- a/src/root/view-result.tt +++ b/src/root/view-result.tt @@ -4,8 +4,6 @@ [% PROCESS "product-list.tt" %] [% USE HTML %] -

    View [% view.project.name %]:[% view.name %] result [% result.id %][% IF result.releasename %] ([% result.releasename %])[% END %]

    -

    Finished building on [% INCLUDE renderDateTime timestamp = result.timestamp %].

    [% IF result.status == 1 %] diff --git a/src/root/view.tt b/src/root/view.tt index f473a481..dbdf087c 100644 --- a/src/root/view.tt +++ b/src/root/view.tt @@ -1,9 +1,7 @@ -[% WRAPPER layout.tt title="View ‘$view.project.name:$view.name’" %] +[% WRAPPER layout.tt title="View $view.project.name:$view.name" %] [% PROCESS common.tt %] [% USE HTML %] -

    View [% view.project.name %]:[% view.name %]

    -

    Edit Latest