From 147b980028c2ba9afe9850093a68b9aaacb56f75 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 25 Nov 2008 01:22:47 +0000 Subject: [PATCH] --- src/HydraFrontend/lib/HydraFrontend/Controller/Root.pm | 2 +- src/HydraFrontend/root/log.tt | 2 +- src/HydraFrontend/root/static/css/logfile.css | 4 ++++ src/HydraFrontend/xsl/log2html.xsl | 3 +++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/HydraFrontend/lib/HydraFrontend/Controller/Root.pm b/src/HydraFrontend/lib/HydraFrontend/Controller/Root.pm index e9e32d19..82fb7f1f 100644 --- a/src/HydraFrontend/lib/HydraFrontend/Controller/Root.pm +++ b/src/HydraFrontend/lib/HydraFrontend/Controller/Root.pm @@ -328,7 +328,7 @@ sub nixlog :Local { return error($c, "Build step $stepnr of build $id does not have a log file.") if $step->logfile eq ""; $c->stash->{template} = 'log.tt'; - $c->stash->{id} = $id; + $c->stash->{build} = $build; $c->stash->{step} = $step; # !!! should be done in the view (as a TT plugin). diff --git a/src/HydraFrontend/root/log.tt b/src/HydraFrontend/root/log.tt index 4c491054..3ebe0763 100644 --- a/src/HydraFrontend/root/log.tt +++ b/src/HydraFrontend/root/log.tt @@ -1,6 +1,6 @@ [% WRAPPER layout.tt title="Hydra Overview" %] -

Logfile for [% build.project.name %]:[% build.attrname %] build [% build.id %]

+

Logfile for [% build.project.name %]:[% build.attrname %] build [% build.id %][%IF step %], step [% step.stepnr %] ([% step.outpath %])[% END %]

[% logtext -%] diff --git a/src/HydraFrontend/root/static/css/logfile.css b/src/HydraFrontend/root/static/css/logfile.css index fce99070..ee9bb086 100644 --- a/src/HydraFrontend/root/static/css/logfile.css +++ b/src/HydraFrontend/root/static/css/logfile.css @@ -79,3 +79,7 @@ em.storeref:hover span.popup { color: #ff0000; font-weight: bold; } + +.prio3 { + font-style: italic; +} diff --git a/src/HydraFrontend/xsl/log2html.xsl b/src/HydraFrontend/xsl/log2html.xsl index 9979dc64..73ba2429 100644 --- a/src/HydraFrontend/xsl/log2html.xsl +++ b/src/HydraFrontend/xsl/log2html.xsl @@ -65,6 +65,9 @@ errorLine + + prio3 +