From 5c06010256aa88b623aa806b5ecc5d429365db0d Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 29 Dec 2010 03:36:43 +0000 Subject: [PATCH] torrus skinning improvements, RT#10574 --- torrus/templates/default-dir.html | 4 +--- torrus/templates/default-rrd.html | 2 +- torrus/templates/expanded-dir.html | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/torrus/templates/default-dir.html b/torrus/templates/default-dir.html index ef6358d1e..7df195a43 100644 --- a/torrus/templates/default-dir.html +++ b/torrus/templates/default-dir.html @@ -1,8 +1,6 @@ [% PROCESS 'html-incblocks.txt' %] [% thepath=path(token) %] -[% INCLUDE htmlstart title=thepath printpath=1 %] - -

[% xmlnorm(nodeParam(token,'comment')) %]

+[% INCLUDE htmlstart title=xmlnorm(nodeParam(token,'comment')) printpath=1 %] [% INCLUDE legend %] diff --git a/torrus/templates/default-rrd.html b/torrus/templates/default-rrd.html index 7767f7d3c..e51c3c0c7 100644 --- a/torrus/templates/default-rrd.html +++ b/torrus/templates/default-rrd.html @@ -2,7 +2,7 @@ [% INCLUDE setdate %] [% parentComment = nodeParam(parent(token),'comment') %] [% IF parentComment; - INCLUDE htmlstart title='Graphs for ' _ xmlnorm(parentComment); + INCLUDE htmlstart title='Graphs for ' _ xmlnorm(parentComment) printpath=1; ELSE; INCLUDE htmlstart title='Graphs for ' _ path(token) printpath=1; END; diff --git a/torrus/templates/expanded-dir.html b/torrus/templates/expanded-dir.html index 844a2c37c..8fe0675db 100644 --- a/torrus/templates/expanded-dir.html +++ b/torrus/templates/expanded-dir.html @@ -1,7 +1,7 @@ [% PROCESS 'html-incblocks.txt' %] [% INCLUDE setdate %] [% thepath=path(token) %] -[% INCLUDE htmlstart title=thepath printpath=1 %] +[% INCLUDE htmlstart title=xmlnorm(nodeParam(token,'comment')) printpath=1 %]

[% xmlnorm(nodeParam(token,'comment')) %]

-- 2.11.0