[Erp5-report] r10794 - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: SkinTemplat...

[nobody at svn.erp5.org]

Author: vincent
Date: Wed Oct 18 09:59:36 2006
New Revision: 10794

URL: http://svn.erp5.org?rev=10794&view=rev
Log:
Cleanup overcomplexified statements.

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

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=10794&r1=10793&r2=10794&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 Wed Oct 18 09:59:36 2006
@@ -86,8 +86,8 @@
    tal:define="ignore_layout          request/ignore_layout | nothing;\n
                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 and not ignore_layout) and True or False;\n
-               editable_mode  python: not layout_form and True or ((not (not(hasattr(context.REQUEST, \'editable_mode\')) or not(context.REQUEST[\'editable_mode\']))) or ignore_layout);\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\', 0);\n
                dummy          python: request.set(\'editable_mode\', editable_mode);\n
                page_template  python: is_web_mode and ((layout_form.meta_type==\'Page Template\' and layout_form.id) or getattr(layout_form, \'pt\', None)) or \'template_erp5_xhtml_style\';">\n
     <tal:block metal:use-macro="python: getattr(here, page_template).macros[\'master\']">\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision?rev=10794&r1=10793&r2=10794&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision Wed Oct 18 09:59:36 2006
@@ -1,1 +1,1 @@
-268
+270