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

2014-09-22 09:21:14 +02:00
parent 0a4844afb1
commit d51157154e
3 changed files with 5 additions and 3 deletions
@@ -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"),
@@ -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
@@ -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>