diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml index 05100994aea99c19af9bb2f0ea8ea03ad7034517..243bd2e2dfe9eb1f7c96ef775b54863fdb4404c1 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml @@ -63,10 +63,10 @@ dummy python: request.set(\'here\', here);\n \n global css_list css_list | python: [];\n - dummy python: not is_web_mode and css_list.append(\'%s/erp5.css\' % (here.portal_url.getPortalPath(), ));\n + dummy python: not is_web_mode and css_list.insert(0, \'%s/erp5.css\' % here.portal_url.getPortalPath());\n \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 + dummy python: not is_web_mode and js_list.insert(0, \'%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 diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log b/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log index 1e741cec57cb46ac8ed43287c77cdeca759d2643..039cf7d68a28a547b0974ee7dd32471b6eb402b0 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log @@ -1,3 +1,6 @@ +2006-08-29 Kevin +* erp5.css and erp5.js are not authoritative over others CSS and JS (this let let user override default CSS and JS definitions). + 2006-08-28 Kevin * Test form accessibility earlier in developper_shortcut_render to let login_form be rendered in erp5_web when anonymous. * Try to get form from 'form' variable before 'current_form_id'. diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision index 83248fb9df4a244c41a10fa536045d5a8e759aee..70e1a64c23f0dc1eb79598f64221bd0c38f18b97 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision @@ -1 +1 @@ -142 \ No newline at end of file +144 \ No newline at end of file diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/version b/product/ERP5/bootstrap/erp5_xhtml_style/bt/version index 5ab1538853ef3c56b12d4789f9a29708093c0c87..f37ae4a163409d21d5a89600e4f0e1b68a816c89 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/version +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/version @@ -1 +1 @@ -1.2.18 \ No newline at end of file +1.2.19 \ No newline at end of file