[Erp5-report] r16559 - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: SkinTemplat...

Sun Sep 23 18:22:21 CEST 2007

Author: yo
Date: Sun Sep 23 18:22:21 2007
New Revision: 16559

URL: http://svn.erp5.org?rev=16559&view=rev
Log:
2007-09-23 yo
* Remove the links to the favicon, as it breaks existing settings.
* Ignore an error if form is None. This may happen when standard_error_message is called.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/field_render.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/field_render.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/field_render.xml?rev=16559&r1=16558&r2=16559&view=diff
==============================================================================

--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/field_render.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/field_render.xml Sun Sep 23 18:22:21 2007
@@ -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>
@@ -84,7 +81,7 @@
                          value        python: request.get(field_id, None);\n
                          field_errors python: request.get(\'field_errors\', {});\n
                          field_has_error  python: field_errors.has_key(field_id);\n
-                         global form_id form_id | python: form.id;\n
+                         global form_id form_id | form/id | nothing;\n
                          field_description field/Field_getDescription;\n
                          is_web_mode is_web_mode | nothing">\n
     <div tal:define="html_render  python: field.render_htmlgrid(value, request)"\n

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=16559&r1=16558&r2=16559&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 Sun Sep 23 18:22:21 2007
@@ -120,8 +120,6 @@
     <tal:block tal:repeat="js js_list">\n
       <script tal:attributes="src js" type="text/javascript"></script>\n
     </tal:block>\n
-    <link rel="icon" tal:attributes="href python: \'%s/images/favicon.ico\' % here.portal_url()" type="image/x-icon" />\n
-    <link rel="shortcut icon" tal:attributes="href python: \'%s/images/favicon.ico\' % here.portal_url()" type="image/x-icon" />\n
   </head>\n
   <body>\n
     <form id="main_form"\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log?rev=16559&r1=16558&r2=16559&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log Sun Sep 23 18:22:21 2007
@@ -1,3 +1,7 @@
+2007-09-23 yo
+* Remove the links to the favicon, as it breaks existing settings.
+* Ignore an error if form is None. This may happen when standard_error_message is called.
+
 2007-09-23 Kazuhiko
 * Add favicon
 * Output better XHTML/1.0

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision?rev=16559&r1=16558&r2=16559&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision Sun Sep 23 18:22:21 2007
@@ -1,1 +1,1 @@
-441
+443


