[Erp5-report] r9469 - /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Aug 25 18:31:43 CEST 2006
Author: kevin
Date: Fri Aug 25 18:31:40 2006
New Revision: 9469
URL: http://svn.erp5.org?rev=9469&view=rev
Log:
Move planning box generic header stuff there.
Only add default ERP5 JavaScript and CSS file if we are not in Web Mode.
Modified:
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml?rev=9469&r1=9468&r2=9469&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml Fri Aug 25 18:31:40 2006
@@ -48,7 +48,6 @@
<key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[
-\n
<tal:block metal:define-macro="header_definitions">\n
<tal:block tal:define="\n
cancel_url request/cancel_url | request/ACTUAL_URL;\n
@@ -61,13 +60,13 @@
global current_url python: \'%s/%s\' % (url, current_form_id);\n
global current_action python: here.ERP5XhtmlStyle_getCurrentAction(current_url, actions);\n
\n
- dummy python: request.set(\'here\', here);\n
+ dummy python: request.set(\'here\', here);\n
\n
global css_list css_list | python: [];\n
- dummy python: css_list.append(\'%s/erp5.css\' % (here.portal_url.getPortalPath(), ));\n
+ dummy python: not is_web_mode and css_list.append(\'%s/erp5.css\' % (here.portal_url.getPortalPath(), ));\n
\n
- global js_list js_list | python: [];\n
- dummy python: js_list.append(\'%s/erp5.js\' % (here.portal_url.getPortalPath(), ));\n
+ global js_list js_list | python: [];\n
+ dummy python: not is_web_mode and js_list.append(\'%s/erp5.js\' % (here.portal_url.getPortalPath(), ));\n
\n
global http_parameter_list request/form/copy;\n
http_parameter_list python: here.ERP5XhtmlStyle_filterParameterList(http_parameter_list);\n
@@ -76,9 +75,11 @@
"/>\n
</tal:block>\n
\n
+<!-- ============================================================== -->\n
\n
<tal:block metal:define-macro="http_definitions">\n
<tal:block tal:repeat="parameter http_parameter_list/items">\n
+ <!-- Generic way of specifying http parameters -->\n
<tal:block tal:condition="python: same_type(parameter[1], [])">\n
<tal:block tal:repeat="list_item python: parameter[1]">\n
<input type="hidden"\n
@@ -92,13 +93,43 @@
tal:attributes="name python: parameter[0];\n
value python: parameter[1];"/>\n
</tal:block>\n
+</tal:block>\n
+\n
+<!-- ============================================================== -->\n
+\n
+<tal:block metal:define-macro="planning_box_definitions">\n
+ <tal:block tal:condition="form/pt | nothing">\n
+ <tal:block tal:define="planning_box python: here.ERP5XhtmlStyle_getPlanningBox(form)">\n
+ <tal:block tal:condition="python: planning_box">\n
+ <!-- PlanningBox generic stuff -->\n
+ <style tal:content="structure python: planning_box.render_css(None,REQUEST=request)"\n
+ tal:attributes="type python:\'text/css\'">\n
+ </style>\n
+ <tal:block tal:condition="python: planning_box.get_value(\'js_enabled\')">\n
+ <tal:block tal:define="dummy python:js_list.append(\'%s/wz_dragdrop.js\' % (here.portal_url.getPortalPath(), ));" />\n
+ </tal:block>\n
+ </tal:block>\n
+ </tal:block>\n
+ </tal:block>\n
</tal:block>
]]></string> </value>
</item>
<item>
+ <key> <string>content_type</string> </key>
+ <value> <string>text/html</string> </value>
+ </item>
+ <item>
+ <key> <string>expand</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
<key> <string>id</string> </key>
<value> <string>global_definitions</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
</item>
</dictionary>
</pickle>
More information about the Erp5-report
mailing list