diff --git a/src/root/common.tt b/src/root/common.tt index 6b65ade7..66411c5b 100644 --- a/src/root/common.tt +++ b/src/root/common.tt @@ -101,7 +101,7 @@ [% IF !hideResultInfo %] [% INCLUDE renderBuildStatusIcon size=16 %] - + [% END %] [% build.id %] [% IF showSchedulingInfo %] @@ -204,75 +204,75 @@ [% END %] [% BLOCK renderBuildStatusIcon; %] -[% finished = build != undef ? build.finished : 1 %] -[% busy = build != undef ? build.schedulingInfo.busy : 0 %] -[% buildstatus = buildstatus != undef ? buildstatus : build.resultInfo.buildstatus %] - [% IF finished %] - [% IF buildstatus == 0 %] - Succeeded - [% ELSIF buildstatus == 1 %] - Failed - [% ELSIF buildstatus == 2 %] - Dependency failed - [% ELSIF buildstatus == 4 %] - Failed - [% ELSIF buildstatus == 5 %] - Failed - [% ELSIF buildstatus == 6 %] - Failed (with result) - [% ELSE %] - Failed - [% END %] - [% ELSIF busy %] - Busy - [% ELSE %] - Scheduled - [% END %] + [% finished = build != undef ? build.finished : 1 %] + [% busy = build != undef ? build.schedulingInfo.busy : 0 %] + [% buildstatus = buildstatus != undef ? buildstatus : build.resultInfo.buildstatus %] + [% IF finished %] + [% IF buildstatus == 0 %] + Succeeded + [% ELSIF buildstatus == 1 %] + Failed + [% ELSIF buildstatus == 2 %] + Dependency failed + [% ELSIF buildstatus == 4 %] + Failed + [% ELSIF buildstatus == 5 %] + Failed + [% ELSIF buildstatus == 6 %] + Failed (with result) + [% ELSE %] + Failed + [% END %] + [% ELSIF busy %] + Busy + [% ELSE %] + Scheduled + [% END %] [% END %] [% BLOCK renderStatus; %] - [% IF build.finished %] - [% IF build.resultInfo.buildstatus == 0 %] - [% INCLUDE renderBuildStatusIcon size=16 %] - Success - [% ELSIF build.resultInfo.buildstatus == 1 %] - [% INCLUDE renderBuildStatusIcon size=16 %] - Build returned a non-zero exit code - [% ELSIF build.resultInfo.buildstatus == 2 %] - [% INCLUDE renderBuildStatusIcon size=16 %] - A dependency of the build failed - [% ELSIF build.resultInfo.buildstatus == 4 %] - [% INCLUDE renderBuildStatusIcon size=16 %] - Cancelled by user - [% ELSIF build.resultInfo.buildstatus == 5 %] - [% INCLUDE renderBuildStatusIcon size=16 %] - Build inhibited because a dependency previously failed to build - [% failedDep = build.resultInfo.failedDep %] - (namely, [% failedDep.outpath %]) - [% ELSIF build.resultInfo.buildstatus == 6 %] - [% INCLUDE renderBuildStatusIcon size=16 %] - Build failed (with result) - [% ELSE %] - [% INCLUDE renderBuildStatusIcon size=16 %] - Build failed - (see below) - [% END %] - [% IF c.user_exists && (build.resultInfo.buildstatus == 3 || build.resultInfo.buildstatus == 4) %] -
- -
- [% END %] - [% ELSIF build.schedulingInfo.busy %] - Build in progress - since [% INCLUDE renderDateTime timestamp = build.schedulingInfo.starttime %] - [% ELSE %] - Scheduled to be built - [% IF c.user_exists %] -
- -
- [% END %] - [% END %] + [% IF build.finished %] + [% IF build.resultInfo.buildstatus == 0 %] + [% INCLUDE renderBuildStatusIcon size=16 %] + Success + [% ELSIF build.resultInfo.buildstatus == 1 %] + [% INCLUDE renderBuildStatusIcon size=16 %] + Build returned a non-zero exit code + [% ELSIF build.resultInfo.buildstatus == 2 %] + [% INCLUDE renderBuildStatusIcon size=16 %] + A dependency of the build failed + [% ELSIF build.resultInfo.buildstatus == 4 %] + [% INCLUDE renderBuildStatusIcon size=16 %] + Cancelled by user + [% ELSIF build.resultInfo.buildstatus == 5 %] + [% INCLUDE renderBuildStatusIcon size=16 %] + Build inhibited because a dependency previously failed to build + [% failedDep = build.resultInfo.failedDep %] + (namely, [% failedDep.outpath %]) + [% ELSIF build.resultInfo.buildstatus == 6 %] + [% INCLUDE renderBuildStatusIcon size=16 %] + Build failed (with result) + [% ELSE %] + [% INCLUDE renderBuildStatusIcon size=16 %] + Build failed + (see below) + [% END %] + [% IF c.user_exists && (build.resultInfo.buildstatus == 3 || build.resultInfo.buildstatus == 4) %] +
+ +
+ [% END %] + [% ELSIF build.schedulingInfo.busy %] + Build in progress + since [% INCLUDE renderDateTime timestamp = build.schedulingInfo.starttime %] + [% ELSE %] + Scheduled to be built + [% IF c.user_exists %] +
+ +
+ [% END %] + [% END %] [% END -%] [% BLOCK renderInputValue %]