torrus skinning improvements, RT#10574

diff --git a/torrus/templates/default-dir.html b/torrus/templates/default-dir.html
index ef6358d..7df195a 100644 (file)
--- 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 %]
-
-<H1>[% xmlnorm(nodeParam(token,'comment')) %]</H1>
+[% 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 7767f7d..e51c3c0 100644 (file)
--- 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 844a2c3..8fe0675 100644 (file)
--- 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 %]
 
 <H1>[% xmlnorm(nodeParam(token,'comment')) %]</H1>