Menu
▾
▴
[Zenoss-commit] r9405 - branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel
|
From: <sv...@ze...> - 2008-06-03 18:48:35
|
Author: ian Date: 2008-06-03 14:48:44 -0400 (Tue, 03 Jun 2008) New Revision: 9405 Modified: branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/commandOutputTemplate.pt branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/deviceLoggingHeader.pt branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/discoverLoggingHeader.pt branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/templates.pt Log: * Backported r9363 into the 2.2.x branch Modified: branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/commandOutputTemplate.pt =================================================================== --- branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/commandOutputTemplate.pt 2008-06-03 18:48:30 UTC (rev 9404) +++ branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/commandOutputTemplate.pt 2008-06-03 18:48:44 UTC (rev 9405) @@ -1,3 +1,5 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN" +"http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd"> <html> <head metal:use-macro="here/templates/macros/head1"/> <body> Modified: branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/deviceLoggingHeader.pt =================================================================== --- branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/deviceLoggingHeader.pt 2008-06-03 18:48:30 UTC (rev 9404) +++ branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/deviceLoggingHeader.pt 2008-06-03 18:48:44 UTC (rev 9405) @@ -1,3 +1,5 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN" +"http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd"> <html> <head metal:use-macro="here/templates/macros/head1"/> <body> Modified: branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/discoverLoggingHeader.pt =================================================================== --- branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/discoverLoggingHeader.pt 2008-06-03 18:48:30 UTC (rev 9404) +++ branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/discoverLoggingHeader.pt 2008-06-03 18:48:44 UTC (rev 9405) @@ -1,39 +1,31 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN" +"http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd"> <html> - <head metal:use-macro="here/templates/macros/head1"/> + <head> + <tal:block metal:use-macro="here/templates/macros/head1"/> + <tal:block metal:use-macro="here/zenuimacros/macros/jsutils"/> + </head> <body> - <div id="frame"> - <div metal:use-macro="here/templates/macros/topPane"/> - <div id="infoBar"> - <div id="leftPaneToggle"></div> - <div id="breadCrumbPane"> - <span metal:use-macro="here/miscmacros/macros/breadCrumbs" /> - </div> - <tal:block metal:use-macro="here/templates/macros/infoBarExtra"/> - </div> - <div id="paneToggle"></div> - <style tal:condition="python:'Zenoss_Collapsed_Menu' in - here.REQUEST.HTTP_COOKIE"> - #leftPane { display:none;} - #rightPane { margin-left:12px;} - #paneToggle { - background-image: url('paneToggle_bg_collapsed.gif'); - border-right: medium none; - } - #leftPaneToggle{ display:block; - background:transparent url(img/leftpanetoggle_bg.gif) top - left repeat-x; - height: 30px; - width: 30px; - } - #breadCrumbPane{ padding-left: 35px;} + <tal:block metal:use-macro="here/dialogmacros/macros/proxyForm"/> + <tal:block metal:use-macro="here/dialogmacros/macros/dialog_with_buttons"/> + <div id="frame"> + <form name="proxy_form" id="proxy_form" + style="position:absolute;visibility:hidden" + tal:attributes="action here/absolute_url_path"></form> + <div metal:use-macro="here/templates/macros/topPane"/> + <div id="infoBar"> + <div id="leftPaneToggle"></div> + <div metal:use-macro="here/miscmacros/macros/breadCrumbs" /> + <tal:block metal:use-macro="here/templates/macros/infoBarExtra"/> + </div> + <tal:block metal:use-macro=" + here/maintemplate-extras/macros/panetoggle"/> + <div metal:use-macro="here/leftPane/macros/leftPane"/> + <div id="rightPane"/> + <div metal:use-macro="here/templates/macros/tabsPane"/> + <div id="contentPane"> - </style> - <div metal:use-macro="here/templates/macros/leftPane"/> - <div id="rightPane"/> - <div metal:use-macro="here/templates/macros/tabsPane"/> - <div id="contentPane"> - - <table class=" zentable"> + <table class="zentable"> <tr> <th class="tabletitle" colspan="1"> <div class="tabletitlecontainer"> Modified: branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/templates.pt =================================================================== --- branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/templates.pt 2008-06-03 18:48:30 UTC (rev 9404) +++ branches/zenoss-2.2.x/Products/ZenModel/skins/zenmodel/templates.pt 2008-06-03 18:48:44 UTC (rev 9405) @@ -8,8 +8,8 @@ breadCrumb and content ====================================================== --> <tal:block metal:define-macro="page1"> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/html4/loose.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN" +"http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd"> <html> <head> <title> |