From 034d244be68a492cb86d727633ef23d250ca6471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 5 Apr 2013 13:07:37 +0200
Subject: [PATCH] [REF] crm, hr, project: refactored kanban/form html/css to be
 cleaner and remove custom CSS. kanban specific css for aliases has been moved
 into web_kanban.

bzr revid: tde@openerp.com-20130405110737-xhdgxodrffqtfrzp
---
 addons/crm/crm.py                             | 10 ++++-----
 addons/crm/crm_case_section_view.xml          | 10 +++++----
 addons/crm/crm_data.xml                       |  2 +-
 addons/crm/static/src/css/crm.css             | 13 -----------
 addons/hr_recruitment/hr_recruitment_view.xml | 15 ++++++++-----
 addons/mail/mail_group_view.xml               | 18 +++++++++++----
 addons/project/project_view.xml               | 22 ++++++++++---------
 addons/project/static/src/css/project.css     | 19 ----------------
 8 files changed, 47 insertions(+), 62 deletions(-)

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 58238de5640..7b6fe02afa8 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -160,7 +160,7 @@ class crm_case_section(osv.osv):
 
     def name_get(self, cr, uid, ids, context=None):
         """Overrides orm name_get method"""
-        if not isinstance(ids, list) :
+        if not isinstance(ids, list):
             ids = [ids]
         res = []
         if not ids:
@@ -177,20 +177,20 @@ class crm_case_section(osv.osv):
     def create(self, cr, uid, vals, context=None):
         mail_alias = self.pool.get('mail.alias')
         if not vals.get('alias_id'):
-            vals.pop('alias_name', None) # prevent errors during copy()
+            alias_name = vals.pop('alias_name', None) or vals.get('name')  # prevent errors during copy()
             alias_id = mail_alias.create_unique_alias(cr, uid,
-                    {'alias_name': vals['name']},
+                    {'alias_name': alias_name},
                     model_name="crm.lead",
                     context=context)
             vals['alias_id'] = alias_id
         res = super(crm_case_section, self).create(cr, uid, vals, context)
-        mail_alias.write(cr, uid, [vals['alias_id']], {'alias_defaults': {'section_id': res, 'type':'lead'}}, context)
+        mail_alias.write(cr, uid, [vals['alias_id']], {'alias_defaults': {'section_id': res, 'type': 'lead'}}, context)
         return res
 
     def unlink(self, cr, uid, ids, context=None):
         # Cascade-delete mail aliases as well, as they should not exist without the sales team.
         mail_alias = self.pool.get('mail.alias')
-        alias_ids = [team.alias_id.id for team in self.browse(cr, uid, ids, context=context) if team.alias_id ]
+        alias_ids = [team.alias_id.id for team in self.browse(cr, uid, ids, context=context) if team.alias_id]
         res = super(crm_case_section, self).unlink(cr, uid, ids, context=context)
         mail_alias.unlink(cr, uid, alias_ids, context=context)
         return res
diff --git a/addons/crm/crm_case_section_view.xml b/addons/crm/crm_case_section_view.xml
index 2559d94805a..e752f542ed5 100644
--- a/addons/crm/crm_case_section_view.xml
+++ b/addons/crm/crm_case_section_view.xml
@@ -94,7 +94,7 @@
                                 </div>
                                 <div class="oe_kanban_content">
                                     <h4><field name="name"/></h4>
-                                    <div class="oe_alias" t-if="record.use_leads.raw_value and record.alias_id.value">
+                                    <div class="oe_kanban_alias" t-if="record.use_leads.raw_value and record.alias_id.value">
                                         <span class="oe_e">%%</span><small><field name="alias_id"/></small>
                                     </div>
                                     <div class="oe_items_list">
@@ -151,11 +151,13 @@
                             <h1>
                                 <field name="name" string="Project Name"/>
                             </h1>
-                            <div name="group_alias">
+                            <div name="group_alias"
+                                    attrs="{'invisible': [('alias_domain', '=', False)]}">
                                 <label for="alias_id" string="Email Alias"/>
                                 <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
-                                <span class="oe_edit_only" name="edit_alias">
-                                    <field name="alias_name" class="oe_inline" attrs="{'required': [('use_leads', '=', True), ('alias_id', '!=', False)]}"/>
+                                <span name="edit_alias" class="oe_edit_only">
+                                    <field name="alias_name" class="oe_inline"
+                                            attrs="{'required': [('use_leads', '=', True), ('alias_id', '!=', False)]}"/>
                                     @
                                     <field name="alias_domain" class="oe_inline" readonly="1"/>
                                 </span>
diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index 3db7a457dfd..7e3e25b1213 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -27,7 +27,7 @@
         </record>
 
         <record model="crm.case.section" id="section_sales_department">
-            <field name="name">Sales Department</field>
+            <field name="name">Sales</field>
             <field name="code">Sales</field>
         </record>
 
diff --git a/addons/crm/static/src/css/crm.css b/addons/crm/static/src/css/crm.css
index 0f509a2fbb3..0a766fee3a1 100644
--- a/addons/crm/static/src/css/crm.css
+++ b/addons/crm/static/src/css/crm.css
@@ -19,19 +19,6 @@
     -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
 }
 
-.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_alias {
-    margin: 0px 0 8px 0;
-}
-
-.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_alias .oe_e {
-    font-size: 30px;
-    line-height: 6px;
-    vertical-align: top;
-    margin-right: 3px;
-    color: white;
-    text-shadow: 0px 0px 2px rgba(0, 0, 0, 1);
-    float: left;
-}
 .openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list {
     margin: 10px 0;
 }
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 46559db0a4d..b531677d538 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -313,12 +313,15 @@
                 </div>
             </field>
             <xpath expr="//div[@class='oe_title']//h1" position="after">
-                <div attrs="{'invisible': [('alias_domain', '=', False)]}">
-                    <field name="alias_id" class="oe_inline" required="0" invisible="1"/>
-                    <label for="alias_id" string='Email'
-                            attrs="{'invisible': [('alias_domain', '=', False)]}"/>
-                    <span name="edit_alias">
-                        <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field class="oe_inline" name="alias_domain"/>
+                <div name="group_alias"
+                        attrs="{'invisible': [('alias_domain', '=', False)]}">
+                    <label for="alias_id" string="Email Alias"/>
+                    <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
+                    <span name="edit_alias" class="oe_edit_only">
+                        <field name="alias_name" class="oe_inline"
+                                attrs="{'required': [('alias_id', '!=', False)]}"/>
+                        @
+                        <field name="alias_domain" class="oe_inline" readonly="1"/>
                     </span>
                 </div>
             </xpath>
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 31c22f94cb7..083adde90e5 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -30,6 +30,7 @@
                     <field name="message_is_follower"/>
                     <field name="message_summary"/>
                     <field name="description"/>
+                    <field name="alias_id"/>
                     <templates>
                         <t t-name="kanban-description">
                             <div class="oe_group_description" t-if="record.description.raw_value">
@@ -43,6 +44,9 @@
                                 </div>
                                 <div class="oe_group_details">
                                     <h4><a type="open"><field name="name"/></a></h4>
+                                    <div class="oe_kanban_alias" t-if="record.alias_id.value">
+                                        <span class="oe_e">%%</span><small><field name="alias_id"/></small>
+                                    </div>
                                     <div class="oe_grey">
                                         <field name="description"/>
                                     </div>
@@ -75,10 +79,16 @@
                                 <label for="name" string="Group Name"/>
                             </div>
                             <h1><field name="name" readonly="0"/></h1>
-                            <div name="alias_box" colspan="4" attrs="{'invisible': [('alias_domain', '=', False)]}">
-                                <field name="alias_id" class="oe_read_only" required="0" invisible="1"/>
-                                <label for="alias_name" string="Email"/>
-                                <field name="alias_name" nolabel="1" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" nolabel="1" class="oe_inline" style="padding-left:0;"/>
+                            <div name="group_alias"
+                                    attrs="{'invisible': [('alias_domain', '=', False)]}">
+                                <label for="alias_id" string="Email Alias"/>
+                                <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
+                                <span name="edit_alias" class="oe_edit_only">
+                                    <field name="alias_name" class="oe_inline"
+                                            attrs="{'required': [('alias_id', '!=', False)]}"/>
+                                    @
+                                    <field name="alias_domain" class="oe_inline" readonly="1"/>
+                                </span>
                             </div>
                         </div>
                         <field name="description" placeholder="Topics discussed in this group..."/>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 44447c8f8e8..a016c46e0e0 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -88,15 +88,17 @@
                         <h1>
                             <field name="name" string="Project Name"/>
                         </h1>
-                        <div name="group_alias">
-                            <label for="alias_id"/>
-                            <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
-                            <span class="oe_edit_only" name="edit_alias">
-                                <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>
-                                @
-                                <field class="oe_inline" name="alias_domain"/>
-                            </span>
-                        </div>
+                        <div name="group_alias"
+                            attrs="{'invisible': [('alias_domain', '=', False)]}">
+                        <label for="alias_id" string="Email Alias"/>
+                        <field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
+                        <span name="edit_alias" class="oe_edit_only">
+                            <field name="alias_name" class="oe_inline"
+                                    attrs="{'required': [('alias_id', '!=', False)]}"/>
+                            @
+                            <field name="alias_domain" class="oe_inline" readonly="1"/>
+                        </span>
+                    </div>
                         <div name="options_active">
                             <field name="use_tasks" class="oe_inline"/>
                             <label for="use_tasks"/>
@@ -248,7 +250,7 @@
                                 </div>
                                 <div class="oe_kanban_content">
                                     <h4><field name="name"/></h4>
-                                    <div class="oe_kanban_project_alias" t-if="record.alias_id.value">
+                                    <div class="oe_kanban_alias" t-if="record.alias_id.value">
                                         <span class="oe_e">%%</span><small><field name="alias_id"/></small>
                                     </div>
                                     <div class="oe_kanban_project_list">
diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css
index 9c516b2d740..e4c70e0d13e 100644
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -61,22 +61,3 @@
     -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
     -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
 }
-
-.oe_kanban_project_alias {
-    margin: 0px 0 8px 0;
-}
-
-.oe_kanban_project_alias .oe_e {
-    font-size: 30px;
-    line-height: 6px;
-    vertical-align: top;
-    margin-right: 3px;
-    color: white;
-    text-shadow: 0px 0px 2px rgba(0, 0, 0, 1);
-    float: left;
-}
-
-.oe_kanban_project_alias small {
-    display: block;
-    margin-left: 20px;
-}
\ No newline at end of file