[Erp5-report] r8456 - in /erp5/trunk/bt5/erp5_html_style: SkinTemplateItem/portal_skins/erp...

Mon Jul 17 17:16:23 CEST 2006

Author: fab
Date: Mon Jul 17 17:16:21 2006
New Revision: 8456

URL: http://svn.erp5.org?rev=8456&view=rev
Log:
- small fix to make it work with erp5_subversion. erp5_subversion is now based on xhtml_style and html_style lacked some variables

Modified:
    erp5/trunk/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_master.xml
    erp5/trunk/bt5/erp5_html_style/bt/revision
    erp5/trunk/bt5/erp5_html_style/bt/version

Modified: erp5/trunk/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_master.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_master.xml?rev=8456&r1=8455&r2=8456&view=diff
==============================================================================

--- erp5/trunk/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_master.xml (original)
+++ erp5/trunk/bt5/erp5_html_style/SkinTemplateItem/portal_skins/erp5_html_style/view_master.xml Mon Jul 17 17:16:21 2006
@@ -79,18 +79,16 @@
 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 @@
                    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 @@
        </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 @@
       </table>\n
     </form>\n
   </body>\n
+  </tal:block>\n
 </html>
 
 ]]></string> </value>

Modified: erp5/trunk/bt5/erp5_html_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_html_style/bt/revision?rev=8456&r1=8455&r2=8456&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_html_style/bt/revision (original)
+++ erp5/trunk/bt5/erp5_html_style/bt/revision Mon Jul 17 17:16:21 2006
@@ -1,1 +1,1 @@
-8
+12

Modified: erp5/trunk/bt5/erp5_html_style/bt/version
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_html_style/bt/version?rev=8456&r1=8455&r2=8456&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_html_style/bt/version (original)
+++ erp5/trunk/bt5/erp5_html_style/bt/version Mon Jul 17 17:16:21 2006
@@ -1,1 +1,1 @@
-0.8
+0.8.1


