[Erp5-report] r11831 - /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateIte...

Mon Jan 1 20:58:58 CET 2007

Author: jp
Date: Mon Jan  1 20:58:54 2007
New Revision: 11831

URL: http://svn.erp5.org?rev=11831&view=rev
Log:
2007-01-01 JPS
onload script only fixes height for standard ERP5 style but not for layout based styles (Web mode)

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.xml?rev=11831&r1=11830&r2=11831&view=diff
==============================================================================

--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.js.xml Mon Jan  1 20:58:54 2007
@@ -116,8 +116,10 @@
   }\n
 }\n
 \n
-function fixLeftRightHeightAndFocus() {  \n
-  fixLeftRightHeight();\n
+function fixLeftRightHeightAndFocus(fix_height) {\n
+  if (fix_height == 1) {\n
+    fixLeftRightHeight();\n
+  }\n
   autoFocus();\n
 }
 

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml?rev=11831&r1=11830&r2=11831&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml Mon Jan  1 20:58:54 2007
@@ -94,7 +94,7 @@
     <base tal:attributes="href python: \'%s/\' % (url, )"/>\n
     <meta name="generator" content="ERP5"/>\n
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>\n
-    <title tal:content="title | string:ERP5"/>\n
+    <title tal:content="python: \'%s | %s\' % (here.getTitle() or here.getId(), here.getPortalObject().getTitle() or here.getPortalObject().getId())"/>\n
     <tal:block tal:repeat="css css_list">\n
       <link tal:attributes="href css" type="text/css" rel="stylesheet"/>\n
     </tal:block>\n
@@ -105,7 +105,7 @@
       <script tal:attributes="src js" type="text/javascript"></script>\n
     </tal:block>\n
   </head>\n
-  <body onload="fixLeftRightHeight()">\n
+  <body tal:attributes="onload python:\'fixLeftRightHeightAndFocus(%s)\' % int(not is_web_mode)">\n
     <form id="main_form"\n
           tal:attributes="enctype form/Form_getEnctype | nothing;\n
                           action url;\n
@@ -116,6 +116,7 @@
              id="hidden_button" type="submit" value="dummy"\n
              tal:attributes="name python: \'%s:method\' % (form_action, )" />\n
       <tal:block metal:use-macro="global_definitions_macros/http_definitions"/>\n
+      <tal:block metal:define-slot="layout">\n
       <div id="bars">\n
         <div id="main_bar"\n
              tal:content="structure here/ERP5Site_renderCachedNavigationBox">\n
@@ -144,6 +145,7 @@
       <div id="master">\n
         <tal:block metal:define-slot="main"/>\n
       </div>\n
+      </tal:block>\n
     </form>\n
   </body>\n
 </html>\n


