[torrus-commit] plugins/overview/templates item-rrd.html,1.1,1.2 ov-chooser.html,1.1,1.2 ov-dir.html
Brought to you by:
ssinyagin
Menu
▾
▴
[torrus-commit] plugins/overview/templates item-rrd.html,1.1,1.2 ov-chooser.html,1.1,1.2 ov-dir.html,1.1,1.2 ov-html-incblocks.txt,1.1,1.2 ov-tset.html,1.1,1.2 tab-rrd.html,1.1,1.2
|
From: Christian S. <sch...@us...> - 2004-12-13 16:14:06
|
Update of /cvsroot/torrus/plugins/overview/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16338/templates Modified Files: item-rrd.html ov-chooser.html ov-dir.html ov-html-incblocks.txt ov-tset.html tab-rrd.html Log Message: fixed new torrus makefiles and adapted to new release Index: ov-tset.html =================================================================== RCS file: /cvsroot/torrus/plugins/overview/templates/ov-tset.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ov-tset.html 8 Dec 2004 14:39:47 -0000 1.1 +++ ov-tset.html 13 Dec 2004 16:13:55 -0000 1.2 @@ -10,17 +10,21 @@ [% SET pos = 1; SET global.hwpredict = 0 %] [% FOREACH node = sortTokens(tsetMembers(token)) %] - [% comment = nodeParam(parent(node),'comment',1) %] <DIV> [% IF pos == 1 %] <DIV CLASS="ShortLeft"> [% ELSE %] <DIV CLASS="ShortRight"> [% END %] - [% INCLUDE tsgraph + [% nodename=nodeParam(node,'descriptive-nickname'); + IF nodename==''; + nodename=path(node); + END; + INCLUDE tsgraph token=node - nodename=path(node) - comment=nodeParam(parent(node),'comment',1) %] + nodename=nodename + comment=nodeParam(parent(node),'comment',1) + %] </DIV> </DIV> [% IF pos == 1 %] Index: ov-chooser.html =================================================================== RCS file: /cvsroot/torrus/plugins/overview/templates/ov-chooser.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ov-chooser.html 8 Dec 2004 14:39:46 -0000 1.1 +++ ov-chooser.html 13 Dec 2004 16:13:55 -0000 1.2 @@ -1,7 +1,8 @@ [% PROCESS 'ov/ov-html-incblocks.txt' %] [% INCLUDE htmlstart title="Torrus Top: " _ companyName - contentClass="SingleColumnContent" %] + contentClass="SingleColumnContent" + noTopMenu=1 %] <P>Choose the datasource tree</P> Index: tab-rrd.html =================================================================== RCS file: /cvsroot/torrus/plugins/overview/templates/tab-rrd.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- tab-rrd.html 8 Dec 2004 14:39:47 -0000 1.1 +++ tab-rrd.html 13 Dec 2004 16:13:55 -0000 1.2 @@ -68,7 +68,7 @@ termvars = []; IF nodeParam(token, 'rrd-hwpredict') == 'enabled' and param(view, 'rrd-hwpredict') != 'disabled'; - IF not variables.NOHW; + IF not variables.NOHW; hwaction = 'Disable'; hwvars = ['NOHW', 1]; termvars = ['NOHW', '']; @@ -81,8 +81,13 @@ text=hwaction _ " Holt-Winters" title="Switch Holt-Winters prediction boundaries"; END; + + INCLUDE shortcut url=plainURL _ 'explain-rrdgraph.html' + text='Explain graph' + title='Describe graph elements and values' + newwindow=1; %] -</DIV> +</DIV> [% INCLUDE bottomline %] [% INCLUDE htmlend %] Index: ov-dir.html =================================================================== RCS file: /cvsroot/torrus/plugins/overview/templates/ov-dir.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ov-dir.html 8 Dec 2004 14:39:46 -0000 1.1 +++ ov-dir.html 13 Dec 2004 16:13:55 -0000 1.2 @@ -8,12 +8,12 @@ <P>Directories you can jump to:</P> <DIV CLASS="Listing"> -[% hasLeaves = 0; +[% hasLeaves = 0; + childCounter = 0; hasSubNodes = 0; evenRow = 0; FOREACH child = sortTokens(children(token)); hidden = 0; - counter = counter + 1; IF nodeParam(child,'hidden') == 'yes'; hidden = 1; END; @@ -29,12 +29,9 @@ urlTitle = ''; END; END; - IF counter % 2 == 0; - evenRow = 1; - ELSE; - evenRow = 0; - END; - IF not hidden or variables.SHOWHIDDEN + IF not hidden or variables.SHOWHIDDEN; + childCounter = childCounter + 1; + evenRow = childCounter % 2 == 0; %] <DIV CLASS="[% evenRow ? 'ListRowEven' : 'ListRow' %]"> <SPAN CLASS="NodeName"> @@ -61,13 +58,13 @@ [% INCLUDE shortcut url=url(token, 'expanded-dir-html') text="Expand leaves" title="Show all leaf graphs in one page" %] -</DIV> +</DIV> [% END %] [% IF hasSubNodes %] <DIV CLASS="BottomShortcuts"> [% INCLUDE shortcut url=url(token, 'sub-nodes-dir-html') - text="Expand leaves & sub-nodes" - title="Show all leaf & sub-nodes graphs in one page" %] + text="Expand leaves and leaves of sub-nodes" + title="Show all graphs of leaves & of leaves of sub-nodes in one page" %] </DIV> [% END %] Index: item-rrd.html =================================================================== RCS file: /cvsroot/torrus/plugins/overview/templates/item-rrd.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- item-rrd.html 8 Dec 2004 14:39:46 -0000 1.1 +++ item-rrd.html 13 Dec 2004 16:13:55 -0000 1.2 @@ -54,7 +54,7 @@ termvars = []; IF nodeParam(token, 'rrd-hwpredict') == 'enabled' and param(view, 'rrd-hwpredict') != 'disabled'; - IF not variables.NOHW; + IF not variables.NOHW; hwaction = 'Disable'; hwvars = ['NOHW', 1]; termvars = ['NOHW', '']; @@ -67,9 +67,14 @@ text=hwaction _ " Holt-Winters" title="Switch Holt-Winters prediction boundaries"; END; + + INCLUDE shortcut url=plainURL _ 'explain-rrdgraph.html' + text='Explain graph' + title='Describe graph elements and values' + newwindow=1; %] -</DIV> +</DIV> [% INCLUDE htmlend %] Index: ov-html-incblocks.txt =================================================================== RCS file: /cvsroot/torrus/plugins/overview/templates/ov-html-incblocks.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ov-html-incblocks.txt 8 Dec 2004 14:39:46 -0000 1.1 +++ ov-html-incblocks.txt 13 Dec 2004 16:13:55 -0000 1.2 @@ -12,6 +12,15 @@ <HTML> <!-- Torrus Copyright (c) 2003 Stanislav Sinyagin --> <HEAD> +<SCRIPT language="JavaScript"> +<!-- +function helpwindow() +{ +window.open('[%url(token) _ '&view=helptext-html'%]','helpwindow', +'width=600,height=400,resizable=yes,left=200,top=100'); +} +//--> +</SCRIPT> <TITLE>[% title %]</TITLE> <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8"> <STYLE type="text/css" media="all"> @@ -31,8 +40,20 @@ </HEAD> <BODY style='background-color:transparent'> <DIV CLASS="Header"> +<SPAN CLASS="CompanyInfo"> <A TITLE="company info" HREF="[%companyURL%]">[%companyName%]</A> -</DIV> +</SPAN> +[% 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; %] @@ -52,6 +73,9 @@ </DIV> </DIV> [% END %] +[% IF not noTopMenu %] +[% END %] + <DIV CLASS="[%contentClass%]"> [% global.contentFinished = 0; END %] @@ -121,6 +145,16 @@ </SPAN> [% END %] +[%# ########### Print the Help shortcut ################ %] +[% BLOCK helpshortcut; + IF nodeParam(token, 'help-text', 1); + INCLUDE shortcut + url="javascript:helpwindow()" + text="Help" + title="Open a help window for this page"; + END; + END %] + [%# ########### Print the common bottomline ################ %] [% BLOCK bottomline %] @@ -136,6 +170,14 @@ text="Printable view" title="Prepare this page for printing" newwindow=1%] +[% INCLUDE helpshortcut %] +[% IF mayDisplayAdmInfo(token); + INCLUDE shortcut url=url(token,'adminfo') + text="AdmInfo" + title="Administrative details" + newwindow=1; + END +%] </DIV> [% END %] @@ -152,6 +194,7 @@ text="Printable view" title="Prepare this page for printing" newwindow=1%] +[% INCLUDE helpshortcut %] </DIV> [% END %] @@ -217,11 +260,12 @@ IF not hidden or variables.SHOWHIDDEN %] <DIV CLASS="ShortGraph"> + [% IF not urltoken; urltoken = token; END %] [% hidden ? '<SPAN CLASS="ShowHidden">':'' %] <DIV CLASS="NodeName"> - <A HREF="[%url(token)%]">[%IF nodeparent %][%nodeparent%]/[%END%][% nodename %]</A> + <A HREF="[%url(urltoken,urlview)%]">[%IF nodeparent %][%nodeparent%]/[%END%][% nodename %]</A> </DIV> - [%IF comment%]<DIV CLASS="NodeDescr">[%comment%]</DIV>[%END%] + [%IF comment%]<DIV CLASS="NodeDescr">[%xmlnorm(comment)%]</DIV>[%END%] [% hidden ? '</SPAN>':'' %] [% @@ -244,7 +288,7 @@ <DIV CLASS="GraphImage"> <A HREF="[%url(token)%]"> <IMG SRC="[%url(token, overviewView, overviewvars)%]" - ALT="Last Day Graph"> + ALT="[% param(overviewView, 'description') %]"> </A> </DIV> </DIV> |
