From c7736f06430e104ff3df4597eb7a107780264ffa Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 2 Mar 2009 15:21:35 +0000 Subject: [PATCH] --- src/Hydra/root/build.tt | 20 ++++++++++---------- src/Hydra/root/common.tt | 2 ++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/Hydra/root/build.tt b/src/Hydra/root/build.tt index eefa0ff7..152a410c 100644 --- a/src/Hydra/root/build.tt +++ b/src/Hydra/root/build.tt @@ -22,10 +22,6 @@ Build ID: [% build.id %] - - Time added: - [% PROCESS renderDateTime timestamp = build.timestamp %] - Status: @@ -68,6 +64,12 @@ Nix name: [% build.nixname %] + [% IF build.resultInfo.releasename %] + + Release name: + [% HTML.escape(build.resultInfo.releasename) %] + + [% END %] Short description: [% IF build.description %][% HTML.escape(build.description) %][% ELSE %](not given)[% END %] @@ -102,6 +104,10 @@ [% END %] + + Time added: + [% PROCESS renderDateTime timestamp = build.timestamp %] + [% IF build.finished %] Build started: @@ -121,12 +127,6 @@ [% END %] - [% IF build.resultInfo.releasename %] - - Release name: - [% HTML.escape(build.resultInfo.releasename) %] - - [% END %] [% IF build.resultInfo.logfile %] Logfile: diff --git a/src/Hydra/root/common.tt b/src/Hydra/root/common.tt index 4768df17..0269b78e 100644 --- a/src/Hydra/root/common.tt +++ b/src/Hydra/root/common.tt @@ -31,6 +31,7 @@ [% END %] Project Job + Name System Timestamp Description @@ -57,6 +58,7 @@ [% END %] [% build.project.name %] [% build.attrname %] + [% build.resultInfo.releasename ? build.resultInfo.releasename : build.nixname %] [% build.system %] [% date.format(build.timestamp, '%Y-%m-%d %H:%M:%S') %] [% build.description %]