update name of populate_request macro. template_erp5_xhtml_style is now...

update name of populate_request macro. template_erp5_xhtml_style is now capable of adding optional head items. breadcrum was wrong and should be now fixed (by passing the current document to the method).

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25576 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/WebSection_viewBreadcrumbWidget.xml

@@ -54,8 +54,9 @@
   -->\n
 </tal:block>\n
 \n
-<tal:block tal:define="current_web_section python: request.get(\'current_web_section\', here);\n
-                       breadcrumb_list python: current_web_section.WebSection_getBreadcrumbItemList();">\n
+<tal:block tal:define="current_web_section python:request.get(\'current_web_section\', here);\n
+                       current_web_document python:request.get(\'current_web_document\', here);\n
+                       breadcrumb_list python: current_web_section.getBreadcrumbItemList(current_web_document);">\n
 <ul>\n
   <li class="nobullet">You are here:&nbsp;</li>\n
   <li tal:repeat="breadcrumb breadcrumb_list">\n

bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_demo_layout/footer_box.xml

@@ -312,7 +312,7 @@
             <key> <string>_text</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-python:\'<p>%s</p> <p class="credits">Design by <a href="http://1234.info/" title="Designer Homepage">1234.info</a> | Modified by <a href="http://www.nexedi.com" title="Modifyer Homepage">Nexedi</a> | Powered by <a href="http://www.erp5.com" title="CMS Homepage">ERP5</a> | Media Player by <a href="http://www.jeroenwijering.com" title="Media Player Credits">Jeroen Wijering</a>  | <a href="http://validator.w3.org/check?uri=referer" title="Validate XHTML code">XHTML 1.0</a> | <a href="http://jigsaw.w3.org/css-validator/" title="Validate CSS code">CSS 2.0</a></p> \' % request.current_web_section.getLayoutProperty(\'layout_copyright_message\', \'Copyright \xc2\xa9 2009 | All Rights Reserved\')
+python:\'<p>%s</p> <p class="credits">Design by <a href="http://1234.info/" title="Designer Homepage">1234.info</a> | Modified by <a href="http://www.nexedi.com" title="Modifyer Homepage">Nexedi</a> | Powered by <a href="http://www.erp5.com" title="CMS Homepage">ERP5</a> | Media Player by <a href="http://www.jeroenwijering.com" title="Media Player Credits">Jeroen Wijering</a>  | <a href="http://validator.w3.org/check?uri=referer" title="Validate XHTML code">XHTML 1.0</a> | <a href="http://jigsaw.w3.org/css-validator/" title="Validate CSS code">CSS 2.0</a></p> \' % request.current_web_section.getLayoutProperty(\'layout_copyright_message\', \'Copyright © 2009 | All Rights Reserved\')
 
 ]]></string> </value>
         </item>

bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/erp5_web_multiflex5_layout/footer_box.xml

@@ -312,7 +312,7 @@
             <key> <string>_text</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-python:\'<p>%s</p> <p class="credits">Design by <a href="http://1234.info/" title="Designer Homepage">1234.info</a> | Modified by <a href="http://www.nexedi.com" title="Modifyer Homepage">Nexedi</a> | Powered by <a href="http://www.erp5.com" title="CMS Homepage">ERP5</a> | Media Player by <a href="http://www.jeroenwijering.com" title="Media Player Credits">Jeroen Wijering</a>  | <a href="http://validator.w3.org/check?uri=referer" title="Validate XHTML code">XHTML 1.0</a> | <a href="http://jigsaw.w3.org/css-validator/" title="Validate CSS code">CSS 2.0</a></p> \' % request.current_web_section.getLayoutProperty(\'layout_copyright_message\', \'Copyright \xc2\xa9 2009 | All Rights Reserved\')
+python:\'<p>%s</p> <p class="credits">Design by <a href="http://1234.info/" title="Designer Homepage">1234.info</a> | Modified by <a href="http://www.nexedi.com" title="Modifyer Homepage">Nexedi</a> | Powered by <a href="http://www.erp5.com" title="CMS Homepage">ERP5</a> | Media Player by <a href="http://www.jeroenwijering.com" title="Media Player Credits">Jeroen Wijering</a>  | <a href="http://validator.w3.org/check?uri=referer" title="Validate XHTML code">XHTML 1.0</a> | <a href="http://jigsaw.w3.org/css-validator/" title="Validate CSS code">CSS 2.0</a></p> \' % request.current_web_section.getLayoutProperty(\'layout_copyright_message\', \'Copyright © 2009 | All Rights Reserved\')
 
 ]]></string> </value>
         </item>

bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/template_erp5_multiflex5.xml

@@ -106,7 +106,7 @@
 ]">\n
       <tal:block metal:use-macro="here/template_erp5_xhtml_style/macros/master">\n
         <tal:block metal:fill-slot="layout">\n
-          <tal:block metal:use-macro="here/aggregate_render/macros/aggregate_populate_request"/>\n
+          <tal:block metal:use-macro="here/aggregate_render/macros/populate_request"/>\n
 \n
   <!-- CONTAINER FOR ENTIRE PAGE -->\n
   <div class="container">\n

bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/template_erp5_xhtml_style.xml

@@ -91,6 +91,9 @@ IDEAS:\n
           </tal:block>\n
           <link rel="icon" tal:attributes="href string:${portal_path}/favicon.ico" type="image/x-icon" />\n
           <link rel="shortcut icon" tal:attributes="href string:${portal_path}/favicon.ico" type="image/x-icon" />\n
+          <tal:block metal:define-slot="head">\n
+            <!-- this is a placeholder for different extensions to head which could be required by web themes -->\n
+          </tal:block>\n
         </head>\n
         <body tal:attributes="class body_css_class|nothing">\n
           <form id="main_form"\n

bt5/erp5_web_multiflex5_theme/bt/revision

-55
+57
\ No newline at end of file