diff --git 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 index e7d98afd4b6ed50a4d2f75964f731f213b2918f7..03af6da8d0f727c905f8ba928185e51306601df2 100644 --- 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 diff --git 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 index b82531af268e06f097472019f456bc3c6f171eed..b9a6b7cfb021fea2f5a89f17deecf51d62a1d079 100644 --- 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 diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log b/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log index e51f070dc4f1280734136e6d428753ebca06a9a2..199938849cb2b4fb882811daab1f9c1025d902fa 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log @@ -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 diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision index 2ae9f6c7cb0c0df9f4a24d37ce337efa56c061b7..8f6e44195d544b665eb2312151c731f247cc9f6e 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision @@ -1 +1 @@ -441 \ No newline at end of file +443 \ No newline at end of file