From a3e2fe2c038eaa8bf682779a1dc9628e5977a974 Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Tue, 4 Nov 2014 11:20:21 +0100
Subject: [PATCH] [FIX] website: main layout - title more flexible for
 customization. (additionnal_)title was overwritted by
 website_meta_title or main_object.name

---
 addons/website/views/website_templates.xml |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 0718a9d..33c5b81 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"/>
-- 
1.7.10.4

