From 6dd8e1ffafe224420093d55d4306094f3fdcd2b1 Mon Sep 17 00:00:00 2001 From: Jean-Paul Smets <jp@nexedi.com> Date: Tue, 12 Jun 2007 16:43:55 +0000 Subject: [PATCH] Take into account the new javascript loading mechanism and add portal_path. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@14794 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_svn/BusinessTemplate_viewSvnDiff.xml | 8 ++++++-- .../erp5_svn/BusinessTemplate_viewSvnStatus.xml | 11 +++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnDiff.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnDiff.xml index 9a73dc4c89..0584a610ca 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnDiff.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnDiff.xml @@ -71,8 +71,12 @@ along with this program; if not, write to the Free Software\n Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n -->\n </tal:block>\n -<tal:block tal:define="css_list python: [\'ERP5Subversion_movableMenu.css\',];\n - js_list python: [\'ERP5Subversion_menuico.js\', \'ERP5Subversion_movableMenu.js\', \'ERP5Subversion_doCreateJavaScriptDiff.js\']">\n +<tal:block tal:define="portal_path here/portal_url;\n + css_list python: [\'%s/ERP5Subversion_movableMenu.css\' % portal_path,];\n + js_list python: [\'%s/erp5.js\' % portal_path,\n + \'%s/ERP5Subversion_menuico.js\' % portal_path,\n + \'%s/ERP5Subversion_movableMenu.js\' % portal_path,\n + \'%s/ERP5Subversion_doCreateJavaScriptDiff.js\' % portal_path]">\n <tal:block metal:use-macro="here/view_master/macros/master">\n <tal:block metal:fill-slot="main">\n <tal:py replace="structure \n diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml index 2247536bc7..2c1e2ad69e 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml @@ -71,8 +71,15 @@ along with this program; if not, write to the Free Software\n Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n -->\n </tal:block>\n -<tal:block tal:define="css_list python: [\'ERP5Subversion_dhtmlXTree.css\', \'ERP5Subversion_movableMenu.css\'];\n - js_list python: [\'ERP5Subversion_dhtmlXCommon.js\', \'ERP5Subversion_dhtmlXTree.js\', \'ERP5Subversion_menuico.js\', \'ERP5Subversion_movableMenu.js\', \'ERP5Subversion_doCreateJavaScriptStatus.js\']">\n +<tal:block tal:define="portal_path here/portal_url;\n + css_list python: [\'%s/ERP5Subversion_dhtmlXTree.css\' % portal_path,\n + \'%s/ERP5Subversion_movableMenu.css\' % portal_path];\n + js_list python: [\'%s/erp5.js\' % portal_path,\n + \'%s/ERP5Subversion_dhtmlXCommon.js\' % portal_path,\n + \'%s/ERP5Subversion_dhtmlXTree.js\' % portal_path,\n + \'%s/ERP5Subversion_menuico.js\' % portal_path,\n + \'%s/ERP5Subversion_movableMenu.js\' % portal_path,\n + \'%s/ERP5Subversion_doCreateJavaScriptStatus.js\' % portal_path]">\n <tal:block metal:use-macro="here/view_master/macros/master">\n <tal:block metal:fill-slot="main">\n <noscript>\n -- 2.30.9