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. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16559 20353a03-c40f-0410-a6d1-a30d3c3de9de

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. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16559 20353a03-c40f-0410-a6d1-a30d3c3de9de
2f8cbecd · Yoshinori Okuji · 3c71069e · 2f8cbecd · 2f8cbecd · 2f8cbecd
Commit 2f8cbecd authored Sep 23, 2007 by Yoshinori Okuji
4 changed files
--- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/field_render.xml
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/field_render.xml
@@ -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 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\n
                         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

--- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/template_erp5_xhtml_style.xml
@@ -120,8 +120,6 @@ IDEAS:\n
    <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

--- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_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.
+
 2007-09-23 Kazuhiko
 * Add favicon
 * Output better XHTML/1.0

--- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
-441
\ No newline at end of file
+443
\ No newline at end of file