diff --git a/src/root/build.tt b/src/root/build.tt index 551b5bc2..382d7b5e 100644 --- a/src/root/build.tt +++ b/src/root/build.tt @@ -24,7 +24,7 @@ [% IF ( type == "All" ) || ( type == "Failed" && step.status != 0 ) || ( type == "Running" && step.busy == 1 ) %] [% has_log = log_exists(step.drvpath); log = c.uri_for('/build' build.id 'nixlog' step.stepnr); %] - + [% step.stepnr %] [% IF step.type == 0 %] diff --git a/src/root/channel-contents.tt b/src/root/channel-contents.tt index f7f136d2..b03ee4e0 100644 --- a/src/root/channel-contents.tt +++ b/src/root/channel-contents.tt @@ -45,14 +45,12 @@ install the package simply by clicking on the packages below.

- [% odd = 0 %] - [% FOREACH pkg IN nixPkgs %] [% b = pkg.build %] [% uri = "${curUri}/pkg/${pkg.name}.nixpkg" %] - + [% b.id %] [% b.get_column('releasename') || b.nixname %] [% b.system %] diff --git a/src/root/common.tt b/src/root/common.tt index 4497cbe4..f3ba0e39 100644 --- a/src/root/common.tt +++ b/src/root/common.tt @@ -62,7 +62,7 @@ END; BLOCK renderBuildListHeader %] - +
[% IF !hideResultInfo %] @@ -94,15 +94,8 @@ BLOCK renderBuildListHeader %] BLOCK renderBuildListBody; - odd = 0; FOREACH build IN builds; %] - + [% IF !hideResultInfo %] + [% IF !jobset && !build %] [% END %] diff --git a/src/root/errors.tt b/src/root/errors.tt index 04ef39a8..29efdaae 100644 --- a/src/root/errors.tt +++ b/src/root/errors.tt @@ -13,7 +13,7 @@ that don’t build.

Evaluation errors in jobsets

-
[% INCLUDE renderBuildStatusIcon size=16 busy=(showSchedulingInfo ? 1 : 0) buildstatus=build.buildstatus %] @@ -405,7 +398,7 @@ BLOCK renderEvals %] [% FOREACH e IN evals; eval = e.eval; link = c.uri_for(c.controller('JobsetEval').action_for('view'), [eval.id]) %] -
[% INCLUDE renderFullJobsetName project=eval.get_column('project') jobset=eval.get_column('jobset') %]
+
@@ -39,7 +39,7 @@ that don’t build.

Evaluation errors in jobs

-
Name
+
diff --git a/src/root/jobset-status-tab.tt b/src/root/jobset-status-tab.tt index 5ae3b937..d12d4ae5 100644 --- a/src/root/jobset-status-tab.tt +++ b/src/root/jobset-status-tab.tt @@ -3,9 +3,8 @@
Name
[% FOREACH s IN systems %][% END %] - [% odd = 0 %] [% FOREACH j IN activeJobsStatus %] - + [% FOREACH s IN systems %] [% system = s.system %] diff --git a/src/root/overview.tt b/src/root/overview.tt index d6a5bf71..968c15dc 100644 --- a/src/root/overview.tt +++ b/src/root/overview.tt @@ -25,8 +25,7 @@ [% FOREACH p IN projects %] - + diff --git a/src/root/project.tt b/src/root/project.tt index 6b3e2415..d6a07bcc 100644 --- a/src/root/project.tt +++ b/src/root/project.tt @@ -27,8 +27,7 @@ [% FOREACH j IN jobsets %] [% successrate = 0 %] - + [% FOREACH release IN releases %] [% link = c.uri_for('/release' project.name release.name) %] - + diff --git a/src/root/view.tt b/src/root/view.tt index dbdf087c..e5311f6f 100644 --- a/src/root/view.tt +++ b/src/root/view.tt @@ -25,7 +25,7 @@ [% FOREACH result IN results %] [% link = c.uri_for('/view' project.name view.name result.id) %] - +
Job[% s.system %]
[% INCLUDE renderJobName project=project.name jobset = jobset.name job = j.get_column('job') %]
[% INCLUDE renderProjectName project = p.name %] [% HTML.escape(p.displayname) %] [% WRAPPER maybeLink uri=p.homepage %][% HTML.escape(p.description) %][% END %]
[% IF j.get_column('nrscheduled') > 0 %] Scheduled @@ -130,7 +129,7 @@
[% release.name %] [% INCLUDE renderDateTime timestamp = release.timestamp %]
[% IF result.status == 0 %]