From 6884ce80532ff1c8791a355d327425d300aee869 Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Thu, 27 Aug 2009 11:18:13 +0000 Subject: [PATCH] try to find description and keyword from web section like layout properties if the document does not have them. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28654 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_web_multiflex5_theme/template_erp5_multiflex5.xml | 2 ++ bt5/erp5_web_multiflex5_theme/bt/revision | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/template_erp5_multiflex5.xml b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/template_erp5_multiflex5.xml index 90291daa2a..5d60d244c9 100644 --- a/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/template_erp5_multiflex5.xml +++ b/bt5/erp5_web_multiflex5_theme/SkinTemplateItem/portal_skins/erp5_web_multiflex5_theme/template_erp5_multiflex5.xml @@ -97,6 +97,8 @@ subcontent_area python:aggregate.get(\'subcontent\', []);\n footer_area python:aggregate.get(\'footer\', []);\n global header_title python:\'%s | %s\' % (here.getTitleOrId(), website.getTitleOrId());\n + global description python:here.getDescription() or here.getLayoutProperty(\'description\');\n + global subject_list python:here.getSubjectList() or here.getLayoutProperty(\'subject_list\');\n global css_list_template python:[\n \'%s/erp5_web_toolbar.css\' % portal_path,\n \'%s/mf54_reset.css\' % portal_path,\n diff --git a/bt5/erp5_web_multiflex5_theme/bt/revision b/bt5/erp5_web_multiflex5_theme/bt/revision index 6d3e9dc78d..8306ec157b 100644 --- a/bt5/erp5_web_multiflex5_theme/bt/revision +++ b/bt5/erp5_web_multiflex5_theme/bt/revision @@ -1 +1 @@ -129 \ No newline at end of file +130 \ No newline at end of file -- 2.30.9