[Erp5-report] r37401 jerome - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: Skin...

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Aug  2 16:28:09 2010
New Revision: 37401

URL: http://svn.erp5.org?rev=37401&view=rev
Log:
r37396 was not enough for front page tabs, generally we include ERP5Site_getJavaScriptRelativeUrlList before js_list defined in the page templates

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=37401&r1=37400&r2=37401&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] Mon Aug  2 16:28:09 2010
@@ -63,8 +63,8 @@
            dummy       python:css_list.extend([\'%s/%s\' % (portal_path, x) for x in portal.ERP5Site_getCssRelativeUrlList()]);\n
            css_list_template css_list_template | python:[\'%s/erp5.css\' % (portal_path,)];\n
            dummy     python:css_list.extend(css_list_template);\n
-           global js_list   js_list | python:[];\n
-           dummy     python:js_list.extend([\'%s/%s\' % (portal_path, x) for x in portal.ERP5Site_getJavaScriptRelativeUrlList() + (\'erp5_xhtml_appearance.js\',)]);\n
+           global js_list   js_list | python:[\'%s/erp5_xhtml_appearance.js\' % portal_path];\n
+           global js_list python: [\'%s/%s\' % (portal_path, x) for x in portal.ERP5Site_getJavaScriptRelativeUrlList()] + js_list;\n
            global http_parameter_list  python: portal.ERP5Site_filterParameterList(request.form);\n
            dummy                python: http_parameter_list.update(local_parameter_list);\n
            global http_parameters      python: portal.ERP5Site_renderHTTPParameterList(http_parameter_list);\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=37401&r1=37400&r2=37401&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] Mon Aug  2 16:28:09 2010
@@ -1 +1 @@
-970
\ No newline at end of file
+971
\ No newline at end of file