From d350b935f2939fee7e6bda9e1f8ae3b4f281c07f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 17 Apr 2012 08:53:00 +0000 Subject: [PATCH 1/8] Add validation for project and jobset names --- src/lib/Hydra/Controller/Jobset.pm | 16 ++++++++-------- src/lib/Hydra/Controller/JobsetEval.pm | 18 +++++++++++------- src/lib/Hydra/Controller/Project.pm | 6 +++++- src/lib/Hydra/Helper/CatalystUtils.pm | 16 +++++++++------- 4 files changed, 33 insertions(+), 23 deletions(-) diff --git a/src/lib/Hydra/Controller/Jobset.pm b/src/lib/Hydra/Controller/Jobset.pm index 4dc90094..fa968ef3 100644 --- a/src/lib/Hydra/Controller/Jobset.pm +++ b/src/lib/Hydra/Controller/Jobset.pm @@ -221,7 +221,7 @@ sub updateJobset { my ($c, $jobset) = @_; my $jobsetName = trim $c->request->params->{"name"}; - error($c, "Invalid jobset name: $jobsetName") unless $jobsetName =~ /^[[:alpha:]][\w\-]*$/; + error($c, "Invalid jobset name: ‘$jobsetName’") if $jobsetName !~ /^$jobsetNameRE$/; my ($nixExprPath, $nixExprInput) = nixExprPathFromParams $c; @@ -298,13 +298,13 @@ sub clone_submit : Chained('jobset') PathPart('clone/submit') Args(0) { requireProjectOwner($c, $jobset->project); requirePost($c); - my $newjobsetName = trim $c->request->params->{"newjobset"}; - error($c, "Invalid jobset name: $newjobsetName") unless $newjobsetName =~ /^[[:alpha:]][\w\-]*$/; + my $newJobsetName = trim $c->request->params->{"newjobset"}; + error($c, "Invalid jobset name: $newJobsetName") unless $newJobsetName =~ /^[[:alpha:]][\w\-]*$/; - my $newjobset; + my $newJobset; txn_do($c->model('DB')->schema, sub { - $newjobset = $jobset->project->jobsets->create( - { name => $newjobsetName + $newJobset = $jobset->project->jobsets->create( + { name => $newJobsetName , description => $jobset->description , nixexprpath => $jobset->nixexprpath , nixexprinput => $jobset->nixexprinput @@ -314,14 +314,14 @@ sub clone_submit : Chained('jobset') PathPart('clone/submit') Args(0) { }); foreach my $input ($jobset->jobsetinputs) { - my $newinput = $newjobset->jobsetinputs->create({name => $input->name, type => $input->type}); + my $newinput = $newJobset->jobsetinputs->create({name => $input->name, type => $input->type}); foreach my $inputalt ($input->jobsetinputalts) { $newinput->jobsetinputalts->create({altnr => $inputalt->altnr, value => $inputalt->value}); } } }); - $c->res->redirect($c->uri_for($c->controller('Jobset')->action_for("edit"), [$jobset->project->name, $newjobsetName])); + $c->res->redirect($c->uri_for($c->controller('Jobset')->action_for("edit"), [$jobset->project->name, $newJobsetName])); } diff --git a/src/lib/Hydra/Controller/JobsetEval.pm b/src/lib/Hydra/Controller/JobsetEval.pm index 76c85feb..ebfc49be 100644 --- a/src/lib/Hydra/Controller/JobsetEval.pm +++ b/src/lib/Hydra/Controller/JobsetEval.pm @@ -32,13 +32,17 @@ sub view : Chained('eval') PathPart('') Args(0) { # Allow comparing this evaluation against the previous evaluation # (default), an arbitrary evaluation, or the latest completed # evaluation of another jobset. - if (defined $compare && $compare =~ /^\d+$/) { - $eval2 = $c->model('DB::JobsetEvals')->find($compare) - or notFound($c, "Evaluation $compare doesn't exist."); - } elsif (defined $compare && $compare =~ /^($jobNameRE)$/) { - my $j = $c->stash->{project}->jobsets->find({name => $compare}) - or notFound($c, "Jobset $compare doesn't exist."); - $eval2 = getLatestFinishedEval($c, $j); + if (defined $compare) { + if ($compare =~ /^\d+$/) { + $eval2 = $c->model('DB::JobsetEvals')->find($compare) + or notFound($c, "Evaluation $compare doesn't exist."); + } elsif (defined $compare && $compare =~ /^($jobsetNameRE)$/) { + my $j = $c->stash->{project}->jobsets->find({name => $compare}) + or notFound($c, "Jobset $compare doesn't exist."); + $eval2 = getLatestFinishedEval($c, $j); + } else { + notFound($c, "Unknown comparison source ‘$compare’."); + } } else { ($eval2) = $eval->jobset->jobsetevals->search( { hasnewbuilds => 1, id => { '<', $eval->id } }, diff --git a/src/lib/Hydra/Controller/Project.pm b/src/lib/Hydra/Controller/Project.pm index 0b600d41..18597942 100644 --- a/src/lib/Hydra/Controller/Project.pm +++ b/src/lib/Hydra/Controller/Project.pm @@ -119,6 +119,8 @@ sub create_submit : Path('/create-project/submit') { my $projectName = trim $c->request->params->{name}; + error($c, "Invalid project name: ‘$projectName’") if $projectName !~ /^$projectNameRE$/; + txn_do($c->model('DB')->schema, sub { # Note: $projectName is validated in updateProject, # which will abort the transaction if the name isn't @@ -152,6 +154,8 @@ sub create_jobset_submit : Chained('project') PathPart('create-jobset/submit') A my $jobsetName = trim $c->request->params->{name}; + error($c, "Invalid jobset name: ‘$jobsetName’") if $jobsetName !~ /^$jobsetNameRE$/; + txn_do($c->model('DB')->schema, sub { # Note: $jobsetName is validated in updateProject, which will # abort the transaction if the name isn't valid. @@ -168,7 +172,7 @@ sub create_jobset_submit : Chained('project') PathPart('create-jobset/submit') A sub updateProject { my ($c, $project) = @_; my $projectName = trim $c->request->params->{name}; - error($c, "Invalid project name: " . ($projectName || "(empty)")) unless $projectName =~ /^[[:alpha:]][\w\-]*$/; + error($c, "Invalid project name: ‘$projectName’") if $projectName !~ /^$projectNameRE$/; my $displayName = trim $c->request->params->{displayname}; error($c, "Invalid display name: $displayName") if $displayName eq ""; diff --git a/src/lib/Hydra/Helper/CatalystUtils.pm b/src/lib/Hydra/Helper/CatalystUtils.pm index 80c391ab..a58c9c38 100644 --- a/src/lib/Hydra/Helper/CatalystUtils.pm +++ b/src/lib/Hydra/Helper/CatalystUtils.pm @@ -13,7 +13,7 @@ our @EXPORT = qw( requireLogin requireProjectOwner requireAdmin requirePost isAdmin isProjectOwner trim getLatestFinishedEval - $pathCompRE $relPathRE $relNameRE $jobNameRE $systemRE + $pathCompRE $relPathRE $relNameRE $projectNameRE $jobsetNameRE $jobNameRE $systemRE @buildListColumns ); @@ -181,12 +181,14 @@ sub getLatestFinishedEval { # Security checking of filenames. -Readonly our $pathCompRE => "(?:[A-Za-z0-9-\+\._][A-Za-z0-9-\+\._]*)"; -Readonly our $relPathRE => "(?:$pathCompRE(?:/$pathCompRE)*)"; -Readonly our $relNameRE => "(?:[A-Za-z0-9-][A-Za-z0-9-\.]*)"; -Readonly our $attrNameRE => "(?:[A-Za-z_][A-Za-z0-9_]*)"; -Readonly our $jobNameRE => "(?:$attrNameRE(?:\\.$attrNameRE)*)"; -Readonly our $systemRE => "(?:[a-z0-9_]+-[a-z0-9_]+)"; +Readonly our $pathCompRE => "(?:[A-Za-z0-9-\+\._][A-Za-z0-9-\+\._]*)"; +Readonly our $relPathRE => "(?:$pathCompRE(?:/$pathCompRE)*)"; +Readonly our $relNameRE => "(?:[A-Za-z0-9-][A-Za-z0-9-\.]*)"; +Readonly our $attrNameRE => "(?:[A-Za-z_][A-Za-z0-9_]*)"; +Readonly our $projectNameRE => "(?:[A-Za-z_][A-Za-z0-9-_]*)"; +Readonly our $jobsetNameRE => "(?:[A-Za-z_][A-Za-z0-9-_]*)"; +Readonly our $jobNameRE => "(?:$attrNameRE(?:\\.$attrNameRE)*)"; +Readonly our $systemRE => "(?:[a-z0-9_]+-[a-z0-9_]+)"; 1; From 896a47d9502fe6bcb79694a13f1a908d6eccc76b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 17 Apr 2012 09:34:35 +0000 Subject: [PATCH 2/8] Clear nrSucceeded when restarting a build --- src/lib/Hydra/Controller/Build.pm | 4 ++-- src/lib/Hydra/Helper/AddBuilds.pm | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/lib/Hydra/Controller/Build.pm b/src/lib/Hydra/Controller/Build.pm index f9f1825a..b3442f02 100644 --- a/src/lib/Hydra/Controller/Build.pm +++ b/src/lib/Hydra/Controller/Build.pm @@ -351,9 +351,9 @@ sub restart : Chained('build') PathPart Args(0) { requireProjectOwner($c, $build->project); - my $drvpath = $build->drvpath ; + my $drvpath = $build->drvpath; error($c, "This build cannot be restarted.") - unless $build->finished && -f $drvpath ; + unless $build->finished && -f $drvpath; restartBuild($c->model('DB')->schema, $build); diff --git a/src/lib/Hydra/Helper/AddBuilds.pm b/src/lib/Hydra/Helper/AddBuilds.pm index c6c7703a..1e9bd0e7 100644 --- a/src/lib/Hydra/Helper/AddBuilds.pm +++ b/src/lib/Hydra/Helper/AddBuilds.pm @@ -968,5 +968,11 @@ sub restartBuild { , busy => 0 , locker => "" }); + + # Reset the stats for the evals to which this build belongs. + # !!! Should do this in a trigger. + foreach my $m ($build->jobsetevalmembers->all) { + $m->eval->update({nrsucceeded => undef}); + } }); } From 634d8c092fb48113a4434a344a2a34d730cc94cb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 17 Apr 2012 09:35:37 +0000 Subject: [PATCH 3/8] Use

for running/failed build steps --- src/root/build.tt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/root/build.tt b/src/root/build.tt index 47d3d193..a6b51c8c 100644 --- a/src/root/build.tt +++ b/src/root/build.tt @@ -9,8 +9,6 @@ [% job = build.job %] [% BLOCK renderBuildSteps %] - -

[% type %] build steps

@@ -67,7 +65,7 @@ [% IF flashMsg %] -

[% flashMsg %]

+

[% flashMsg %]

[% END %]
NrWhatDurationMachineStatus
[% FOREACH m IN machines %] diff --git a/src/root/all.tt b/src/root/all.tt index ff146515..f0f0b9a6 100644 --- a/src/root/all.tt +++ b/src/root/all.tt @@ -1,10 +1,10 @@ -[% WRAPPER layout.tt title="All Builds" %] +[% WRAPPER layout.tt title="All builds" %] [% PROCESS common.tt %] -

All Builds +

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 %]

+ [% 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.

diff --git a/src/root/build.tt b/src/root/build.tt index a6b51c8c..99de759b 100644 --- a/src/root/build.tt +++ b/src/root/build.tt @@ -140,9 +140,14 @@
[% IF c.user_exists && available %] -
-

Add to release: -

+ +
+ +
+ + +
+
[% END %] diff --git a/src/root/channel-contents.tt b/src/root/channel-contents.tt index 911c4767..0f0387e2 100644 --- a/src/root/channel-contents.tt +++ b/src/root/channel-contents.tt @@ -2,7 +2,7 @@ [% PROCESS common.tt %] [% USE HTML %] -

Channel [% channelName %]

+

Channel [% channelName %]

This page provides a channel for the Nix package manager. If you have Nix diff --git a/src/root/clone-build.tt b/src/root/clone-build.tt index e44da753..44b6ccb7 100644 --- a/src/root/clone-build.tt +++ b/src/root/clone-build.tt @@ -3,7 +3,7 @@ [% USE HTML %] [% edit=1 %] -

Clone Build

+

Clone Build

Cloning allows you to perform a build with modified inputs.

diff --git a/src/root/common.tt b/src/root/common.tt index 1f900282..c6b14a5e 100644 --- a/src/root/common.tt +++ b/src/root/common.tt @@ -189,7 +189,7 @@ [% BLOCK maybeLink -%] - [% IF uri %] uri) %][% IF confirmmsg %]onclick="javascript:return confirm('[% confirmmsg %]')"[% END %]>[% content %][% ELSE; content; END -%] + [% IF uri %] uri, class => class) %][% IF confirmmsg %]onclick="javascript:return confirm('[% confirmmsg %]')"[% END %]>[% content %][% ELSE; content; END -%] [% END -%] [% BLOCK maybeButton -%] @@ -198,11 +198,24 @@ [% BLOCK renderSelection %] [% IF edit %] - + [% IF radiobuttons %] +
+ [% FOREACH name IN options.keys.sort %] + + [% END %] +
+ [% ELSE %] + + [% END %] [% ELSE %] [% options.$curValue %] [% END %] diff --git a/src/root/edit-release.tt b/src/root/edit-release.tt index 63e29b51..7f8e86dc 100644 --- a/src/root/edit-release.tt +++ b/src/root/edit-release.tt @@ -1,57 +1,63 @@ -[% WRAPPER layout.tt title=(create ? "New Release" : "Edit Release") %] +[% WRAPPER layout.tt title=(create ? "New release" : "Edit release") %] [% PROCESS common.tt %] [% USE HTML %] -

[% IF create %]New Release[% ELSE %]Release [% release.name %][% END %]

+

[% IF create %]New release[% ELSE %]Release [% release.name %][% END %]

-
+ - - - - - - - - - -
Identifier: release.name) %] />
Description: release.description) %] />
- -

Release Members

+
+ +
+ +
+ release.name) %]> +
+
+ +
+ +
+ release.description) %]> +
+
+ +

Release members

Note: to add a build to this release, go to the build’s information page and click on “Add to release”.

- [% FOREACH m IN release.releasemembers %] - -
- -

Build [% m.build.id %]

- - - - - - -
Label: m.description) %] />
+ [% FOREACH m IN members %] +
+ +
+ m.description) %]> + +
- + [% END %] -
- -

- +

+ [% IF !create %] - - + + [% END %] -

+
+ +
diff --git a/src/root/edit-view.tt b/src/root/edit-view.tt index 98439ee0..57e238e1 100644 --- a/src/root/edit-view.tt +++ b/src/root/edit-view.tt @@ -1,15 +1,15 @@ -[% WRAPPER layout.tt title=(create ? "New View" : "View ‘$project.name:$view.name’") %] +[% WRAPPER layout.tt title=(create ? "New view" : "View ‘$project.name:$view.name’") %] [% PROCESS common.tt %] [% USE HTML %] -

[% IF create %]New View[% ELSE %]View [% project.name %]:[% view.name %][% END %]

+

[% IF create %]New view[% ELSE %]View [% project.name %]:[% view.name %][% END %]

[% BLOCK renderJob %] - - - - - - - - - - - -
Identifier: view.name) %] />
Description: view.description) %] />
+
+
+ +
+ +
+ view.name) %]> +
+
+ +
+ +
+ view.description) %]> +
+
+ @@ -51,12 +56,28 @@ [% n = n + 1 %] [% END %] - +
-

+
+ + [% IF !create %] + + + [% END %] +
@@ -83,20 +104,5 @@ }); - -[% IF !create %] - -
-

-
- - - -[% END %] - [% END %] diff --git a/src/root/error.tt b/src/root/error.tt index 1538415d..c4434f22 100644 --- a/src/root/error.tt +++ b/src/root/error.tt @@ -1,7 +1,7 @@ [% WRAPPER layout.tt title="Error" %] [% USE HTML %] -

[% IF httpStatus %][% httpStatus %][% ELSE %]Error[% END %]

+

[% IF httpStatus %][% httpStatus %][% ELSE %]Error[% END %]

I'm very sorry, but the following error(s) occurred:

diff --git a/src/root/errors.tt b/src/root/errors.tt index 0333d154..df6d8aa4 100644 --- a/src/root/errors.tt +++ b/src/root/errors.tt @@ -1,7 +1,7 @@ [% WRAPPER layout.tt title="Errors" %] [% PROCESS common.tt %] -

Errors

+

Errors

This page provides a quick way to see how FUBARed your packages are. It shows job expressions that don’t evaluate properly and jobs diff --git a/src/root/jobset-eval.tt b/src/root/jobset-eval.tt index cbdbf44f..0d8b4620 100644 --- a/src/root/jobset-eval.tt +++ b/src/root/jobset-eval.tt @@ -1,7 +1,7 @@ [% WRAPPER layout.tt title="Jobset $project.name:$jobset.name evaluation $eval.id" %] [% PROCESS common.tt %] -

Jobset [% project.name %]:[% jobset.name %] evaluation [% eval.id %]

+

Jobset [% project.name %]:[% jobset.name %] evaluation [% eval.id %]

[%- IF otherEval -%]

Comparisons are relative to [% INCLUDE renderFullJobsetName diff --git a/src/root/jobset-evals.tt b/src/root/jobset-evals.tt index c8bfab1b..c75509ec 100644 --- a/src/root/jobset-evals.tt +++ b/src/root/jobset-evals.tt @@ -1,9 +1,9 @@ [% WRAPPER layout.tt title="Jobset ‘$project.name:$jobset.name’ Evaluations" %] [% PROCESS common.tt %] -

Evaluations of Jobset [% INCLUDE renderLink +

Evaluations of Jobset [% INCLUDE renderLink uri = c.uri_for(c.controller('Project').action_for('view'), [project.name]) - title = project.name %]:[% jobset.name %]

+ title = project.name %]:[% jobset.name %]

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 66f2badf..f2aa3c7f 100644 --- a/src/root/jobset.tt +++ b/src/root/jobset.tt @@ -2,7 +2,7 @@ [% PROCESS common.tt %] [% IF edit %] -
+ [% END %] @@ -13,7 +13,7 @@ [% BLOCK renderInputAlt %] [% IF edit %] - + [% INCLUDE maybeEditString param=param value=alt.value %]
[% ELSE %] @@ -26,7 +26,7 @@ - [% IF edit %][% END -%] + [% IF edit %][% END -%] [% INCLUDE maybeEditString param="$baseName-name" value=input.name extraClass="shortString" %] @@ -42,7 +42,7 @@ [% END %] [% END %] - [% IF edit %][% END %] + [% IF edit %][% END %] @@ -62,7 +62,7 @@ [% END %] [% IF edit %] - + [% END %] @@ -79,6 +79,7 @@ [% END %]
  • Setup
    • +
    [% IF !edit && evals.size() > 0 -%] @@ -151,13 +152,13 @@ Enabled: - [% INCLUDE renderSelection param="enabled" curValue=jobset.enabled options={"1" = "Yes", "0" = "No"} %] + [% INCLUDE renderSelection param="enabled" curValue=jobset.enabled radiobuttons=1 options={"1" = "Yes", "0" = "No"} %] Enable email notification: - [% INCLUDE renderSelection param="enableemail" curValue=jobset.enableemail options={"1" = "Yes", "0" = "No"} %] + [% INCLUDE renderSelection param="enableemail" curValue=jobset.enableemail radiobuttons=1 options={"1" = "Yes", "0" = "No"} %] @@ -254,7 +255,7 @@ }); -

    +

    diff --git a/src/root/jobstatus.tt b/src/root/jobstatus.tt index e39447e1..b37fa3c2 100644 --- a/src/root/jobstatus.tt +++ b/src/root/jobstatus.tt @@ -1,7 +1,7 @@ -[% WRAPPER layout.tt title="Job Status" %] +[% WRAPPER layout.tt title="Job status" %] [% PROCESS common.tt %] -

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

    +

    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 diff --git a/src/root/layout.tt b/src/root/layout.tt index 2247dcca..60e13f0e 100644 --- a/src/root/layout.tt +++ b/src/root/layout.tt @@ -108,17 +108,16 @@ [% content %] -

    - -
    - diff --git a/src/root/log.tt b/src/root/log.tt index 7ec61e55..edc53b61 100644 --- a/src/root/log.tt +++ b/src/root/log.tt @@ -1,7 +1,7 @@ [% WRAPPER layout.tt title="Logfile" %] [% PROCESS common.tt %] -

    Build log of [% INCLUDE renderFullJobNameOfBuild %] build [% build.id %][%IF step %] step [% step.stepnr %][% END %]

    +

    Build log of [% INCLUDE renderFullJobNameOfBuild %] build [% build.id %][%IF step %] step [% step.stepnr %][% END %]

    This is the build log of path [% IF step; step.outpath; ELSE; build.outpath; END %]. diff --git a/src/root/login.tt b/src/root/login.tt index 81f5fd3a..7f1d62ae 100644 --- a/src/root/login.tt +++ b/src/root/login.tt @@ -1,36 +1,39 @@ [% WRAPPER layout.tt title="Login to Hydra" %] [% PROCESS common.tt %] -

    Login

    +

    Login

    + +[% IF errorMsg %] +

    Error: [% errorMsg %]

    +[% END %] [% IF c.user_exists %] -

    +

    You are already logged in as [% c.user.username %]. You can logout here.

    [% ELSE %] -[% IF errorMsg %] -

    Error: [% errorMsg %]

    -[% END %] +
    - +
    +
    + +
    + +
    +
    - - - - - - - - - - - - -
    Username:
    Password:
    - -
    +
    + +
    + +
    +
    + +
    + +
    diff --git a/src/root/machine.tt b/src/root/machine.tt index 4d0bcfcf..b1f4ce98 100644 --- a/src/root/machine.tt +++ b/src/root/machine.tt @@ -1,77 +1,90 @@ [% WRAPPER layout.tt title=(create ? "New machine" : "Editing machine '$machine.hostname'") %] [% PROCESS common.tt %] -
    +

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

    + + -

    Machine[% IF ! create %] '[% machine.hostname %]'[% END %]

    - - +
    [% IF create %] -
    - - - +
    + +
    + +
    +
    [% END %] - - - - - - - - - - - - - - - - - - - - - - - - -
    Hostname:[% INCLUDE maybeEditString param="hostname" value=machine.hostname %]
    Username:[% INCLUDE maybeEditString param="username" value=machine.username %]
    SSH key location:[% INCLUDE maybeEditString param="ssh_key" value=machine.ssh_key %]
    Options: - [% INCLUDE maybeEditString param="options" value=machine.options %] -
    Max concurrent builds:[% INCLUDE maybeEditString param="maxconcurrent" value=machine.maxconcurrent %]
    Speed factor: - [% INCLUDE maybeEditString param="speedfactor" value=machine.speedfactor %] -
    Systems: - -
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    -

    - -
    - -[% IF !create %] - -
    -

    -
    - - -[% END %] +
    + + [% IF !create %] + + + [% END %] +
    + +
    [% END %] diff --git a/src/root/machines.tt b/src/root/machines.tt index 8f0273f8..9a509794 100644 --- a/src/root/machines.tt +++ b/src/root/machines.tt @@ -1,7 +1,7 @@ [% WRAPPER layout.tt title="Machines" %] [% PROCESS common.tt %] -

    Build machines

    +

    Build machines

    @@ -9,7 +9,7 @@ - + [% FOREACH s IN systems %][% END %] @@ -17,7 +17,7 @@ [% FOREACH m IN machines %] - + [% FOREACH s IN systems %] @@ -36,8 +36,7 @@
    Enabled Machine Max concurrentSpeedfactorSpeed factor[% s.system %]
    [% INCLUDE maybeLink uri = c.uri_for(c.controller('Admin').action_for('machine_edit'), [m.hostname]) content = m.hostname %][% m.hostname %] [% m.maxconcurrent %] [% m.speedfactor %]
    -

    [ Add a new machine ]

    - +

    Add a new machine

    Resulting /etc/nix.machines [% IF nixMachinesWritable == 0 %](note: file is not writable!)[% END%]: diff --git a/src/root/news.tt b/src/root/news.tt index f9ac80bf..cffc6caa 100644 --- a/src/root/news.tt +++ b/src/root/news.tt @@ -2,7 +2,7 @@ [% PROCESS common.tt %] [% USE String %] -

    News items

    +

    News items

    [% IF newsItems.size == 0 %]

    No news items

    @@ -15,25 +15,29 @@ [% INCLUDE renderDateTime timestamp=i.createtime %] [% contents.replace('\n','
    \n') %] - [ [% INCLUDE maybeLink uri = c.uri_for(c.controller('Admin').action_for('news_delete') i.id) content = "Delete" confirmmsg = "Are you sure you want to delete this news item?" %] ] + [% INCLUDE maybeLink uri = c.uri_for(c.controller('Admin').action_for('news_delete') i.id) content = "Delete" confirmmsg = "Are you sure you want to delete this news item?" class = "btn btn-mini btn-danger" %] [% END %] [% END %] -
    - -

    Add news item

    -

    - -

    -

    - -

    - + +
    + Add news item +
    + +
    + +
    +
    +
    +
    + +
    - - [% END %] diff --git a/src/root/plain.tt b/src/root/plain.tt index 1975756a..110074e8 100644 --- a/src/root/plain.tt +++ b/src/root/plain.tt @@ -5,7 +5,7 @@ [% jobset = build.jobset %] [% job = build.job %] -

    [% title %]

    +

    [% title %]

    [% contents -%] diff --git a/src/root/project.tt b/src/root/project.tt index da1e7b9f..c913697c 100644 --- a/src/root/project.tt +++ b/src/root/project.tt @@ -133,33 +133,35 @@ Enabled: - [% INCLUDE renderSelection param="enabled" curValue=project.enabled options={"1" = "Yes", "0" = "No"} %] + [% INCLUDE renderSelection param="enabled" curValue=project.enabled radiobuttons=1 options={"1" = "Yes", "0" = "No"} %] [% IF edit %] -

    +

    + + [% IF !create %] + + + [% END %] +

    - - - [% IF !create %] - -
    -

    -
    - - - - [% END %] - [% END %] + +
    [% IF !edit %] @@ -175,7 +177,7 @@ [% FOREACH view IN views %]
  • [% view.name %] - [Edit] + Edit
    • [% END %] @@ -186,7 +188,9 @@ [% END %] -

    [Create a new view]

    +

    + Create a new view +

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

    Hydra Queue

    +

    Hydra queue

    -

    [ Running build steps ]

    +

    Running build steps

    [% IF flashMsg %]

    [% flashMsg %]

    diff --git a/src/root/release.tt b/src/root/release.tt index d8ca9d37..eb7fbaea 100644 --- a/src/root/release.tt +++ b/src/root/release.tt @@ -3,8 +3,8 @@ [% PROCESS "product-list.tt" %] [% USE HTML %] -

    Release [% release.name %] [Edit]

    +

    Release [% release.name %] +

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

    @@ -17,11 +17,11 @@ release.timestamp %].

    [% FOREACH m IN members %] -

    +

    [% HTML.escape(m.description) %] -

    + [% INCLUDE renderProductList build=m.build %] diff --git a/src/root/releases.tt b/src/root/releases.tt index 9fe7061b..c0fc6a38 100644 --- a/src/root/releases.tt +++ b/src/root/releases.tt @@ -2,7 +2,7 @@ [% PROCESS common.tt %] [% USE HTML %] -

    Releases for Project [% project.name %]

    +

    Releases for Project [% project.name %]

    [% IF releases.size == 0 %] @@ -33,9 +33,9 @@ [% END %] [% IF c.user_exists %] -

    -[Create a release] -

    +

    + Create a release +

    [% END %] [% END %] diff --git a/src/root/status.tt b/src/root/status.tt index 20677e4a..ee820c2e 100644 --- a/src/root/status.tt +++ b/src/root/status.tt @@ -1,7 +1,7 @@ [% WRAPPER layout.tt title="Hydra status" %] [% PROCESS common.tt %] -

    Hydra Status

    +

    Hydra status

    [% INCLUDE hydraStatus %] diff --git a/src/root/timeline.tt b/src/root/timeline.tt index 96344590..6b35d09b 100644 --- a/src/root/timeline.tt +++ b/src/root/timeline.tt @@ -4,7 +4,7 @@ [% PROCESS common.tt %] -

    Hydra timeline of last 24 hours

    +

    Hydra timeline of last 24 hours

    + [% END %] +
    +

    -[% IF !create %] - -
    -

    -
    - - -[% END %] - [% END %] diff --git a/src/root/users.tt b/src/root/users.tt index 01203245..7894155d 100644 --- a/src/root/users.tt +++ b/src/root/users.tt @@ -1,7 +1,7 @@ [% WRAPPER layout.tt title="Users" %] [% PROCESS common.tt %] -

    Users

    +

    Users

    @@ -17,18 +17,20 @@ [% FOREACH u IN users %] - + - + [% END %]
    [% INCLUDE maybeLink uri = c.uri_for(c.controller('Admin').action_for('user_edit'), [u.username]) content = u.username %][% u.username %] [% u.fullname %] [% u.emailaddress %] [% FOREACH r IN u.userroles %][% r.role %] [% END %] [% IF u.emailonerror %]Yes[% ELSE %]No[% END %][ [% INCLUDE maybeLink uri = c.uri_for(c.controller('Admin').action_for('reset_password'), [u.username]) content = "Reset password" confirmmsg = "Are you sure you want to reset the password for this user?" %] ][% INCLUDE maybeLink uri = c.uri_for(c.controller('Admin').action_for('reset_password'), [u.username]) content = "Reset password" confirmmsg = "Are you sure you want to reset the password for this user?" class = "btn btn-mini" %]
    -

    [ Add a new user ]

    +

    + Add a new user +

    [% END %] diff --git a/src/root/view-result.tt b/src/root/view-result.tt index 8ee2e958..96fb80ba 100644 --- a/src/root/view-result.tt +++ b/src/root/view-result.tt @@ -4,7 +4,7 @@ [% PROCESS "product-list.tt" %] [% USE HTML %] -

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

    +

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

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

    @@ -46,11 +46,13 @@ [% END %] +
    + [% END %] [% IF c.user_exists %]

    -[Release] +Release

    [% END %] diff --git a/src/root/view.tt b/src/root/view.tt index cc314541..05eefd2b 100644 --- a/src/root/view.tt +++ b/src/root/view.tt @@ -2,11 +2,11 @@ [% PROCESS common.tt %] [% USE HTML %] -

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

    +

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

    -[Edit] -[Latest] + Edit + Latest

    Showing results [% (page - 1) * resultsPerPage + 1 %] - [% (page - 1) * resultsPerPage + results.size %] out of [% totalResults %].

    @@ -65,8 +65,12 @@
      + [% IF page > 1 %] + [% END %] + [% IF page * resultsPerPage < totalResults %] + [% END %]