From: Fabien Pinckaers <fp@openerp.com>
Date: Mon, 22 Sep 2014 07:21:14 +0000 (+0200)
Subject: [IMP] Website name instead of company name in title and logo
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=d51157154e478d1fafdd5b7861346535baeed6d2;p=odoo%2Fodoo.git

[IMP] Website name instead of company name in title and logo
---

diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 33f62b0..661a311 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -149,7 +149,8 @@ class website(osv.osv):
     _name = "website" # Avoid website.website convention for conciseness (for new api). Got a special authorization from xmo and rco
     _description = "Website"
     _columns = {
-        'name': fields.char('Domain'),
+        'name': fields.char('Website Name'),
+        'domain': fields.char('Website Domain'),
         'company_id': fields.many2one('res.company', string="Company"),
         'language_ids': fields.many2many('res.lang', 'website_lang_rel', 'website_id', 'lang_id', 'Languages'),
         'default_lang_id': fields.many2one('res.lang', string="Default language"),
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 3f3dffc69..fae7b7d 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -67,7 +67,7 @@
                 <t t-set="additional_title" t-value="main_object.name"/>
             </t>
             <t t-if="not title">
-                <t t-set="title"><t t-if="additional_title"><t t-raw="additional_title"/> | </t><t t-raw="res_company.name"/></t>
+                <t t-set="title"><t t-if="additional_title"><t t-raw="additional_title"/> | </t><t t-raw="website.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
diff --git a/addons/website/views/website_views.xml b/addons/website/views/website_views.xml
index 355aaf8..8507d1d 100644
--- a/addons/website/views/website_views.xml
+++ b/addons/website/views/website_views.xml
@@ -24,7 +24,8 @@
                     <div name="domain">
                         <separator string="Domain"/>
                         <group name="domain">
-                            <field name="name" class="oe_inline"/>
+                            <field name="name"/>
+                            <field name="domain"/>
                             <field name="google_analytics_key" placeholder="UA-XXXXXXXX-Y"/>
                         </group>
                     </div>