From a32de38ab262d0970da820d7b8251edfaa34180c Mon Sep 17 00:00:00 2001 From: Kevin Deldycke <kevin@nexedi.com> Date: Mon, 21 Aug 2006 08:08:27 +0000 Subject: [PATCH] Fix section bad form rendering with xhtml_style. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@9273 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_skins/erp5_web/section_form_view.xml | 5 ++++- bt5/erp5_web/bt/change_log | 3 +++ bt5/erp5_web/bt/revision | 2 +- bt5/erp5_web/bt/version | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/section_form_view.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/section_form_view.xml index 18e4e0bd37..6c54870895 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/section_form_view.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/section_form_view.xml @@ -72,7 +72,10 @@ </tal:block>\n \n <tal:block tal:condition="python: not(default_content is None and not editable_mode)">\n - <tal:block metal:use-macro="here/form_view/macros/form_render" />\n + <tal:block tal:replace="nothing"><!--\n + Use here/form_view/macros/form_render macro with html style.\n + --></tal:block>\n + <tal:block metal:use-macro="here/form_render/macros/master"/>\n </tal:block>\n \n <tal:block tal:condition="python: default_content is None and not editable_mode">\n diff --git a/bt5/erp5_web/bt/change_log b/bt5/erp5_web/bt/change_log index 55243d72a1..67849ab495 100644 --- a/bt5/erp5_web/bt/change_log +++ b/bt5/erp5_web/bt/change_log @@ -1,3 +1,6 @@ +2006-08-21 Kevin +* Fix section bad form rendering with xhtml_style. + 2006-08-18 Kevin * Fix some Form's group to work with xhtml_style. * Fix default template on WebSection. diff --git a/bt5/erp5_web/bt/revision b/bt5/erp5_web/bt/revision index 147ea53ba1..7f3a7cc66c 100644 --- a/bt5/erp5_web/bt/revision +++ b/bt5/erp5_web/bt/revision @@ -1 +1 @@ -158 \ No newline at end of file +161 \ No newline at end of file diff --git a/bt5/erp5_web/bt/version b/bt5/erp5_web/bt/version index 72f9fa8202..28af839c0a 100644 --- a/bt5/erp5_web/bt/version +++ b/bt5/erp5_web/bt/version @@ -1 +1 @@ -0.2.4 \ No newline at end of file +0.2.5 \ No newline at end of file -- 2.30.9