diff options
| author | Jeremy Kersten <jke@odoo.com> | 2014-11-04 11:20:21 +0100 |
|---|---|---|
| committer | Jeremy Kersten <jke@odoo.com> | 2014-11-04 11:20:56 +0100 |
| commit | a3e2fe2c038eaa8bf682779a1dc9628e5977a974 (patch) | |
| tree | f52b19039e77f3291fdbf407deb2c12334afe29c | |
| parent | f37d0af6f889f3450ae958ff500681d318076bbd (diff) | |
[FIX] website: main layout - title more flexible for customization. (additionnal_)title was overwritted by website_meta_title or main_object.name
| -rw-r--r-- | addons/website/views/website_templates.xml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index 0718a9d40e8..33c5b81e584 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -65,15 +65,16 @@ t-att-data-oe-company-name="res_company.name"> <head> <meta charset="utf-8" /> - <t t-if="main_object and 'website_meta_title' in main_object"> + <t t-if="main_object and 'website_meta_title' in main_object and not title"> <t t-set="title" t-value="main_object.website_meta_title"/> </t> - <t t-if="not title and main_object and 'name' in main_object"> + <t t-if="main_object and 'name' in main_object and not title and not additional_title"> <t t-set="additional_title" t-value="main_object.name"/> </t> <t t-if="not title"> - <t t-set="title"><t t-raw="res_company.name"/><t t-if="additional_title"> - <t t-raw="additional_title"/></t></t> + <t t-set="title"><t t-if="additional_title"><t t-raw="additional_title"/> | </t><t t-esc="(website or res_company).name"/></t> </t> + <meta name="viewport" content="initial-scale=1"/> <meta name="description" t-att-content="main_object and 'website_meta_description' in main_object and main_object.website_meta_description or website_meta_description"/> |