diff options
| author | ivan <ivan> | 2010-12-29 03:12:19 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2010-12-29 03:12:19 +0000 |
| commit | 54395e0be06cb94a65d25041f657836241e23b60 (patch) | |
| tree | ef27eea2bce6605c68363f97c572dea8dd6cb445 /torrus/templates | |
| parent | f480822b8c344289ac97f7db517511fb75d9c364 (diff) | |
torrus skinning improvements, RT#10574
Diffstat (limited to 'torrus/templates')
| -rw-r--r-- | torrus/templates/default-rrd.html | 12 | ||||
| -rw-r--r-- | torrus/templates/html-incblocks.txt | 33 |
2 files changed, 14 insertions, 31 deletions
diff --git a/torrus/templates/default-rrd.html b/torrus/templates/default-rrd.html index cfbdbce8d..496410a33 100644 --- a/torrus/templates/default-rrd.html +++ b/torrus/templates/default-rrd.html @@ -1,9 +1,15 @@ [% PROCESS 'html-incblocks.txt' %] [% INCLUDE setdate %] -[% INCLUDE htmlstart title='Graphs for ' _ path(token) printpath=1 %] - [% parentComment = nodeParam(parent(token),'comment') %] -[% IF parentComment %]<H1>Graphs for [% xmlnorm(parentComment) %]</H1>[% END %] +[% IF parentComment; + INCLUDE htmlstart title='Graphs for ' _ xmlnorm(parentComment); + ELSE; + INCLUDE htmlstart title='Graphs for ' _ path(token) printpath=1; + END; +%] + + + %]<H1>Graphs for [% xmlnorm(parentComment) %]</H1>[% END %] [% INCLUDE variables %] diff --git a/torrus/templates/html-incblocks.txt b/torrus/templates/html-incblocks.txt index 6108d1a60..c5de4ab72 100644 --- a/torrus/templates/html-incblocks.txt +++ b/torrus/templates/html-incblocks.txt @@ -1,5 +1,5 @@ [%# - $Id: html-incblocks.txt,v 1.3 2010-12-27 18:11:56 ivan Exp $ + $Id: html-incblocks.txt,v 1.4 2010-12-29 03:12:19 ivan Exp $ All BLOCK statements are defined here %] @@ -24,29 +24,6 @@ window.open('[%url(token) _ '&view=helptext-html'%]','helpwindow', //--> </SCRIPT> -<DIV CLASS="Header"> - -[% IF siteInfo %] -<SPAN CLASS="SiteInfo"> -[% siteInfo %] -</SPAN> -[% END %] - -[% IF treeName and treeInfo %] -<SPAN CLASS="TreeInfo"> -[% treeInfo %] -</SPAN> -[% END %] - -[% IF userAuth and uid; - commonname = userAttr('cn'); - IF commonname == ''; commonname = uid; END; %] -<DIV CLASS="LoginInfo"> -<SPAN CLASS="UserName">[% commonname %]</SPAN> -<SPAN CLASS="Logout"><A HREF="[% topURL _ '?LOGOUT=1' %]">Logout</A></SPAN> -</DIV> -[% END %] -</DIV> <DIV CLASS="CurrentTime">[% timestamp %]</DIV> [% IF printpath %] <DIV CLASS="PathMenu"> @@ -158,10 +135,10 @@ window.open('[%url(token) _ '&view=helptext-html'%]','helpwindow', title="Permanent link to this page"%] [% INCLUDE shortcut url=url('SS') text="Tokensets" title="List of non-empty tokensets"%] -[% INCLUDE shortcut url=url(token,view,'MEDIA','printer','OVS',ovs) - text="Printable view" - title="Prepare this page for printing" - newwindow=1%] +[%# INCLUDE shortcut url=url(token,view,'MEDIA','printer','OVS',ovs) + # text="Printable view" + # title="Prepare this page for printing" + # newwindow=1%] [% IF mayDisplayReports(); INCLUDE shortcut url=reportsUrl text="Reports" |