From a07e95ba70af3456f3a7e2b44a8710e4df444ffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Thu, 7 Sep 2006 18:03:01 +0000 Subject: [PATCH] fix <title>s git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@9752 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_skins/erp5_xhtml_style/form_view.xml | 8 +++++--- .../portal_skins/erp5_xhtml_style/index_html.xml | 2 ++ .../erp5_xhtml_style/template_erp5_xhtml_style.xml | 2 +- product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log | 3 +++ product/ERP5/bootstrap/erp5_xhtml_style/bt/revision | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_view.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_view.xml index 8fa0ba3266..ee946e0a7e 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_view.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_view.xml @@ -73,9 +73,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n -->\n </tal:block>\n <tal:block metal:define-macro="master">\n - <tal:block metal:use-macro="here/view_main/macros/master">\n - <tal:block metal:fill-slot="main">\n - <tal:block metal:use-macro="here/form_render/macros/master" />\n + <tal:block tal:define="title string:${template/title_or_id} - ${here/Title}">\n + <tal:block metal:use-macro="here/view_main/macros/master">\n + <tal:block metal:fill-slot="main">\n + <tal:block metal:use-macro="here/form_render/macros/master" />\n + </tal:block>\n </tal:block>\n </tal:block>\n </tal:block> diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/index_html.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/index_html.xml index d3cf148bd4..7cd0bb988b 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/index_html.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/index_html.xml @@ -72,6 +72,7 @@ along with this program; if not, write to the Free Software\n Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n -->\n </tal:block>\n +<tal:block tal:define="title here/Title">\n <tal:block metal:use-macro="here/main_template/macros/master">\n <tal:block metal:fill-slot="main">\n <tal:block tal:condition="here/portal_membership/isAnonymousUser">\n @@ -98,6 +99,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n </table>\n </div>\n </tal:block>\n +</tal:block>\n </tal:block> ]]></string> </value> 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 b2e051360c..3b0c498c1b 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 @@ -88,7 +88,7 @@ IDEAS:\n <base tal:attributes="href python: \'%s/\' % (url, )"/>\n <meta name="generator" content="ERP5"/>\n <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>\n - <title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui"></title>\n + <title tal:content="title | template/title_or_id" i18n:translate="" i18n:domain="ui"></title>\n <tal:block tal:repeat="css css_list">\n <link tal:attributes="href css" type="text/css" rel="stylesheet"/>\n </tal:block>\n diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log b/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log index 0056d084d2..93ee0e023b 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log @@ -1,3 +1,6 @@ +2006-09-07 jerome +* fix <title>s + 2006-09-07 Kevin * Render field CSS classes on the div.field instead on the label for better styling. * Fix JP "missing" statement. diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision index 09df927592..2efea5198b 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision @@ -1 +1 @@ -166 \ No newline at end of file +167 \ No newline at end of file -- 2.30.9