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

[nobody at svn.erp5.org]

Author: jp
Date: Fri Aug  3 16:08:18 2007
New Revision: 15464

URL: http://svn.erp5.org?rev=15464&view=rev
Log:
better support of editable mode in form_dialog (make sure the environment knows immediately that we moved to editable mode)
allow layout_form_id to be passed in the request so that a page template can select the layout it wished to be rendered in (this is useful to create a front page of web site with very different layout from the rest of the site)

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_dialog.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/main_template.xml

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_dialog.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_dialog.xml?rev=15464&r1=15463&r2=15464&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_dialog.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_dialog.xml Fri Aug  3 16:08:18 2007
@@ -78,7 +78,9 @@
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\n
 -->\n
 </tal:block>\n
-<tal:block metal:define-macro="master">\n
+<tal:block metal:define-macro="master"\n
+           tal:define="editable_mode python: True;\n
+                       dummy python: request.set(\'editable_mode\', editable_mode)">\n
   <tal:block metal:use-macro="here/dialog_main/macros/master">\n
     <tal:block metal:fill-slot="main">\n
       <tal:block tal:define="field_errors python: request.get(\'field_errors\',{});\n
@@ -87,9 +89,7 @@
                              right_group python: form.get_fields_in_group(\'right\');\n
                              center_group python: form.get_fields_in_group(\'center\');\n
                              dialog_actions python: actions.get(dialog_category, []);\n
-                             field_render here/field_render/macros/field_render;\n
-                             editable_mode python: True;\n
-                             dummy python: request.set(\'editable_mode\', editable_mode)">\n
+                             field_render here/field_render/macros/field_render;">\n
         <tal:block tal:condition="preferred_html_style_developper_mode">\n
           <tal:block metal:use-macro="developper_shortcut_render/macros/form" />\n
         </tal:block>\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/main_template.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/main_template.xml?rev=15464&r1=15463&r2=15464&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/main_template.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/main_template.xml Fri Aug  3 16:08:18 2007
@@ -84,7 +84,7 @@
 <tal:block metal:define-macro="master">\n
   <tal:block\n
    tal:define="ignore_layout          request/ignore_layout | nothing;\n
-               layout_form_id         here/getApplicableLayout | nothing;\n
+               layout_form_id         request/layout_form_id | here/getApplicableLayout | nothing;\n
                layout_form    python: layout_form_id and getattr(here, layout_form_id, None) or None;\n
                is_web_mode    python: (layout_form is not None) and (not ignore_layout);\n
                editable_mode  python: (not is_web_mode) or request.get(\'editable_mode\', False);\n