From 6a37c2fb82412da7fb434050efd3dbf0d562f90f Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 10 Oct 2013 16:55:25 +0200
Subject: [PATCH] [IMP] Use view 'name' as title for main_object of type
 ir.ui.view

bzr revid: fme@openerp.com-20131010145525-417zbwltyqzbjolz
---
 addons/website/models/view.py                             | 1 +
 addons/website/models/website.py                          | 8 ++++++++
 addons/website/views/views.xml                            | 4 +---
 addons/website_blog/views/website_blog_templates.xml      | 3 +--
 addons/website_crm/views/website_crm.xml                  | 1 -
 addons/website_event/views/website_event.xml              | 1 -
 .../views/website_hr_recruitment.xml                      | 3 +--
 addons/website_sale/views/website_sale.xml                | 3 +--
 8 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/addons/website/models/view.py b/addons/website/models/view.py
index b146b405757..68df3bcb35a 100644
--- a/addons/website/models/view.py
+++ b/addons/website/models/view.py
@@ -7,6 +7,7 @@ from openerp.osv import osv, fields
 class view(osv.osv):
     _inherit = "ir.ui.view"
     _columns = {
+        'name': fields.char('View Name', required=True, translate=True),
         'inherit_option_id': fields.many2one('ir.ui.view','Optional Inheritancy'),
         'inherited_option_ids': fields.one2many('ir.ui.view','inherit_option_id','Optional Inheritancies'),
         'page': fields.boolean("Whether this view is a web page template (complete)"),
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index cd0dfaa6940..beb5f8bafee 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -157,6 +157,14 @@ class website(osv.osv):
             inherit_branding=qweb_context.setdefault('editable', False),
         )
 
+        main_object = qweb_context.get('main_object')
+        if main_object:
+            if 'additional_title' not in qweb_context and 'name' in main_object:
+                qweb_context['additional_title'] = main_object.name
+            for key in ['website_description', 'website_keywords']:
+                if key not in qweb_context and key in main_object:
+                    qweb_context[key] = main_object[key]
+
         # check if xmlid of the template exists
         try:
             module, xmlid = template.split('.', 1)
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index 12a6a1b2d8a..dbd3f70ce7f 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -303,7 +303,6 @@
 
         <template id="contactus" name="Contact us" page="True">
             <t t-call="website.layout">
-              <t t-set="additional_title">Contact us</t>
               <div id="wrap">
                 <div class="oe_structure"/>
                 <div class="container">
@@ -328,9 +327,8 @@
             </t>
         </template>
 
-        <template id="aboutus" page="True">
+        <template id="aboutus" name="About us" page="True">
             <t t-call="website.layout">
-              <t t-set="additional_title">About us</t>
               <div id="wrap">
                   <div class="oe_structure"/>
                   <div class="container mb32">
diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index bb79867a5aa..f2681f2bdd5 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -133,13 +133,12 @@
     </template>
 
     <!-- Page --> 
-    <template id="index" name="Blogs" page="True">
+    <template id="index" name="Blog" page="True">
         <t t-call="website.layout">
           <t t-set="head">
               <script type="text/javascript" src="/website_blog/static/src/js/website_blog.js"></script>
               <link rel='stylesheet' href='/website_blog/static/src/css/website_blog.css'/>
           </t>
-          <t t-set="additional_title">Blog</t>
           <div id="wrap">
             <div class="container mt16 js_website_blog">
                 <div class="row">
diff --git a/addons/website_crm/views/website_crm.xml b/addons/website_crm/views/website_crm.xml
index 5ac4e767524..54ae47f0cf3 100644
--- a/addons/website_crm/views/website_crm.xml
+++ b/addons/website_crm/views/website_crm.xml
@@ -57,7 +57,6 @@
 
         <template id="contactus_thanks" name="Contact us" page="True">
             <t t-call="website.layout">
-              <t t-set="additional_title">Contact us</t>
               <div id="wrap">
                 <div class="oe_structure"/>
                 <div class="container">
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index ea9fd17e597..c93420c5a34 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -15,7 +15,6 @@
     <!-- Page --> 
     <template id="index" name="Events" page="True">
         <t t-call="website.layout">
-          <t t-set="additional_title">Events</t>
           <div id="wrap">
             <div class="container">
                 <div class="oe_structure"/>
diff --git a/addons/website_hr_recruitment/views/website_hr_recruitment.xml b/addons/website_hr_recruitment/views/website_hr_recruitment.xml
index 8a9d106a9b6..548645f25cd 100644
--- a/addons/website_hr_recruitment/views/website_hr_recruitment.xml
+++ b/addons/website_hr_recruitment/views/website_hr_recruitment.xml
@@ -16,9 +16,8 @@
             </xpath>
         </template>
 
-        <template id="index" name="Departments" page="True">
+        <template id="index" name="Jobs" page="True">
             <t t-call="website.layout">
-                <t t-set="additional_title">Jobs</t>
                 <div id="wrap">
                     <div class="oe_structure"/>
                     <div class="container oe_website_jobs">
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 5c5f400d62e..bfe58ce3ee2 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -392,14 +392,13 @@
 
     <!-- Page Shop my cart --> 
 
-    <template id="mycart" name="My cart" page="True">
+    <template id="mycart" name="Your Cart" page="True">
         <t t-call="website.layout">
             <t t-set="head">
                 <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
                 <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
                 <t t-raw="head or ''"/>
             </t>
-            <t t-set="additional_title">Your Cart</t>
             <div id="wrap">
               <div class="container oe_website_sale">