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 f280b2a62886039480ffd928221ed8f9984812a9..addbd5a0a3e9d11cdf047a8322b10de96dd3820b 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 @@ -49,17 +49,18 @@ IDEAS:\n -->\n </tal:block>\n <tal:block metal:define-macro="master">\n - <tal:block tal:define="global_definitions_macros here/global_definitions/macros">\n + <tal:block tal:define="global_definitions_macros here/global_definitions/macros;\n + subject_list subject_list | python:here.getProperty(\'subject_list\', []) or []">\n <tal:block metal:use-macro="global_definitions_macros/header_definitions" />\n <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\n <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">\n <head>\n <base tal:attributes="href python: \'%s/\' % (url, )" />\n - <meta name="generator" content="ERP5 - Copyright (C) 2001 - 2009. All rights reserved." />\n + <meta name="generator" content="ERP5 - Copyright (C) 2001 - 2008. All rights reserved." />\n <meta name="description" content=""\n - tal:attributes="content title | string:ERP5 Free Open Source ERP and CRM" />\n + tal:attributes="content description | title | string:ERP5 Free Open Source ERP and CRM" />\n <meta name="keywords" content=""\n - tal:attributes="content python:\', \'.join(here.getProperty(\'subject_list\', []) or [])" />\n + tal:attributes="content python:\', \'.join(subject_list)" />\n <meta name="robots" content="index, follow" />\n <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\n <meta http-equiv="Content-Script-Type" content="text/javascript" />\n diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision index 7bed0227374ae83cc50da61fd773b5770ea2c733..2f9aa03afc17caa39de85ec7cad8a7c52f6809c2 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision @@ -1 +1 @@ -828 \ No newline at end of file +829 \ No newline at end of file