[Erp5-report] r38903 kazuhiko - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: Sk...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Tue Oct  5 17:34:15 2010
New Revision: 38903

URL: http://svn.erp5.org?rev=38903&view=rev
Log:
do not override portal_path if already exists, it is required for Zope-2.12 and erp5_web otherwise portal_path is replaced with ERP5 portal's absolute_url instead of the web site's absolute_url.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.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/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=38903&r1=38902&r2=38903&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml [utf8] Tue Oct  5 17:34:15 2010
@@ -43,7 +43,7 @@
   <tal:block metal:define-macro="header_definitions">\n
     <tal:block tal:define="\n
       global portal              here/portal_url/getPortalObject;\n
-      global portal_path         portal/absolute_url;\n
+      global portal_path         portal_path | portal/absolute_url;\n
              local_parameter_list  local_parameter_list | python: {};\n
              action_context    python: portal.restrictedTraverse(request.get(\'object_path\', \'?\'), here);\n
       global actions          python: here.Base_filterDuplicateActions(portal.portal_actions.listFilteredActionsFor(action_context));\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=38903&r1=38902&r2=38903&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] Tue Oct  5 17:34:15 2010
@@ -1 +1 @@
-1027
\ No newline at end of file
+1028
\ No newline at end of file