[Erp5-report] r20271 - /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateIte...

[nobody at svn.erp5.org]

Author: bartek
Date: Wed Apr  2 14:33:16 2008
New Revision: 20271

URL: http://svn.erp5.org?rev=20271&view=rev
Log:
css file inclusion mechanism (same as for javascript files)

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml?rev=20271&r1=20270&r2=20271&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml Wed Apr  2 14:33:16 2008
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -76,11 +73,8 @@
           <meta http-equiv="Content-Style-Type" content="text/css" />\n
           <title tal:define="title title | string:ERP5"\n
                  tal:content="python: \'%s | %s\' % (title, here.getPortalObject().title_or_id())"></title>\n
-          <tal:block tal:repeat="css css_list">\n
-            <link tal:attributes="href css" type="text/css" rel="stylesheet" />\n
-          </tal:block>\n
           <tal:block tal:replace="nothing">\n
-            <!-- Render each field\'s css and javascript. -->\n
+            <!-- Render each field\'s css and include css\'s and javascripts. -->\n
           </tal:block>\n
           <tal:block tal:condition="python: form is not None">\n
             <tal:block tal:repeat="group python: [x for x in form.get_groups(include_empty=0) if x != \'hidden\']">\n
@@ -91,11 +85,15 @@
                          tal:attributes="type python:\'text/css\'">\n
                   </style>\n
                 </tal:block>\n
+                <tal:block tal:define="dummy python: css_list.extend(field.get_css_list(REQUEST=request))" />\n
                 <tal:block tal:define="dummy python: js_list.extend(field.get_javascript_list(REQUEST=request))" />\n
               </tal:block>\n
             </tal:block>\n
           </tal:block>\n
           <!-- May need to remove duplicates -->\n
+          <tal:block tal:repeat="css css_list">\n
+            <link tal:attributes="href css" type="text/css" rel="stylesheet" />\n
+          </tal:block>\n
           <tal:block tal:repeat="js js_list">\n
             <script tal:attributes="src js" type="text/javascript"></script>\n
           </tal:block>\n