From 2c9f093431e51a437f429ddbc331e59cf5fcf200 Mon Sep 17 00:00:00 2001 From: Fabien Devaux <fab@gnux.info> Date: Mon, 17 Jul 2006 15:16:21 +0000 Subject: [PATCH] - small fix to make it work with erp5_subversion. erp5_subversion is now based on xhtml_style and html_style lacked some variables git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@8456 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_html_style/view_master.xml | 22 ++++++++++++------- bt5/erp5_html_style/bt/revision | 2 +- bt5/erp5_html_style/bt/version | 2 +- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_master.xml b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_master.xml index fc9c0582e7..b6917385d0 100644 --- a/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_master.xml +++ b/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_master.xml @@ -79,18 +79,16 @@ 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 -\n <html xmlns="http://www.w3.org/1999/xhtml" lang="en"\n xml:lang="en"\n xmlns:tal="http://xml.zope.org/namespaces/tal"\n xmlns:metal="http://xml.zope.org/namespaces/metal"\n xmlns:i18n="http://xml.zope.org/namespaces/i18n"\n metal:define-macro="master">\n -\n - <script language="JavaScript" src="erp5.js"\n - tal:attributes="src python:\'%s/erp5.js\' % here.portal_url()">\n - </script>\n -\n + <tal:block tal:define="css_list css_list | python: [];\n + dummy python: css_list.append(\'%s/erp5.css\' % (here.portal_url.getPortalPath(), ));\n + js_list js_list | python: [];\n + dummy python: js_list.append(\'%s/erp5.js\' % (here.portal_url.getPortalPath(), ));">\n <script type="text/javascript" src="wz_dragdrop.js" tal:attributes="src python:\'%s/wz_dragdrop.js\' % here.portal_url()">\n </script>\n \n @@ -104,8 +102,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n tal:content="template/title_or_id"\n /> - <tal:block i18n:name="object_title" \n tal:content="here/getTitleOrId"/></title>\n - <link href="erp5.css" rel="stylesheet" type="text/css"\n - tal:attributes="href python: here.portal_url() + \'/\' + \'erp5.css\'" />\n \n <tal:block tal:condition="exists: form">\n <tal:block tal:condition="python:form.has_field(\'planning_box\')">\n @@ -114,6 +110,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n </tal:block>\n </tal:block>\n </tal:block>\n + <tal:block tal:repeat="css css_list">\n + <link tal:attributes="href css"\n + type="text/css"\n + rel="stylesheet" />\n + </tal:block>\n + <tal:block tal:repeat="js js_list">\n + <script tal:attributes="src js"\n + type="text/javascript"></script>\n + </tal:block>\n \n </head>\n <body LEFTMARGIN=0 TOPMARGIN=0 MARGINHEIGHT="0" MARGINWIDTH="0">\n @@ -211,6 +216,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n </table>\n </form>\n </body>\n + </tal:block>\n </html> ]]></string> </value> diff --git a/bt5/erp5_html_style/bt/revision b/bt5/erp5_html_style/bt/revision index 301160a930..3cacc0b93c 100644 --- a/bt5/erp5_html_style/bt/revision +++ b/bt5/erp5_html_style/bt/revision @@ -1 +1 @@ -8 \ No newline at end of file +12 \ No newline at end of file diff --git a/bt5/erp5_html_style/bt/version b/bt5/erp5_html_style/bt/version index ce609caf85..c18d72be30 100644 --- a/bt5/erp5_html_style/bt/version +++ b/bt5/erp5_html_style/bt/version @@ -1 +1 @@ -0.8 \ No newline at end of file +0.8.1 \ No newline at end of file -- 2.30.9