[freeside-commits] freeside/torrus/templates html-incblocks.txt, 1.3, 1.4 default-rrd.html, 1.1.1.1, 1.2

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/torrus/templates
In directory wavetail.420.am:/tmp/cvs-serv24302/torrus/templates

Modified Files:
	html-incblocks.txt default-rrd.html 
Log Message:
torrus skinning improvements, RT#10574

Index: default-rrd.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/torrus/templates/default-rrd.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -w -d -r1.1.1.1 -r1.2
--- default-rrd.html	27 Dec 2010 00:04:04 -0000	1.1.1.1
+++ default-rrd.html	29 Dec 2010 03:12:19 -0000	1.2
@@ -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 %]
 

Index: html-incblocks.txt
===================================================================
RCS file: /home/cvs/cvsroot/freeside/torrus/templates/html-incblocks.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -d -r1.3 -r1.4
--- html-incblocks.txt	27 Dec 2010 18:11:56 -0000	1.3
+++ html-incblocks.txt	29 Dec 2010 03:12:19 -0000	1.4
@@ -24,29 +24,6 @@
 //--> 
 </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 @@
                     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"