try to use description and subject_list if exist.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28653 20353a03-c40f-0410-a6d1-a30d3c3de9de

try to use description and subject_list if exist.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28653 20353a03-c40f-0410-a6d1-a30d3c3de9de
20393e27 · Kazuhiko Shiozaki · 7c0db104 · 20393e27 · 20393e27
Commit 20393e27 authored Aug 27, 2009 by Kazuhiko Shiozaki
2 changed files
--- 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

--- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
-828
\ No newline at end of file
+829
\ No newline at end of file