From 18da8cdc5b22e63f3f43e941408cbe98d2c2e368 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 1 Feb 2013 12:56:42 +0100
Subject: [PATCH] [IMP] crm,project,mail: css for alias

bzr revid: chm@openerp.com-20130201115642-n1wijg4exsibju84
---
 addons/crm/__openerp__.py                 |  1 +
 addons/crm/crm_salesteams.xml             | 31 ++++++++---------------
 addons/crm/static/src/css/crm.css         | 17 +++++++++++++
 addons/crm/static/src/js/crm.js           | 11 ++++++++
 addons/mail/mail_group_view.xml           |  3 +--
 addons/project/project_view.xml           | 10 +++-----
 addons/project/static/src/css/project.css | 17 +++++++++++++
 7 files changed, 60 insertions(+), 30 deletions(-)
 create mode 100644 addons/crm/static/src/js/crm.js

diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 46ce37f188c..1ae67f1fb55 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -116,6 +116,7 @@ Dashboard for CRM will include:
         'test/ui/delete_lead.yml',
     ],
     'css': ['static/src/css/crm.css'],
+    'js': ['static/src/js/crm.js'],
     'installable': True,
     'application': True,
     'auto_install': False,
diff --git a/addons/crm/crm_salesteams.xml b/addons/crm/crm_salesteams.xml
index 6c32deb79cf..e6caa03c042 100644
--- a/addons/crm/crm_salesteams.xml
+++ b/addons/crm/crm_salesteams.xml
@@ -59,7 +59,7 @@
             <field name="name">crm.case.section.kanban</field>
             <field name="model">crm.case.section</field>
             <field name="arch" type="xml">
-                <kanban version="7.0">
+                <kanban version="7.0" class="oe_background_grey">
                     <field name="name"/>
                     <field name="user_id"/>
                     <field name="member_ids"/>
@@ -70,29 +70,24 @@
                     <field name="number_opportunity"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_card oe_kanban_project oe_kanban_global_click oe_kanban_crm_salesteams" style="width:200px;">
+                            <div t-attf-class="oe_kanban_card oe_kanban_crm_salesteams oe_kanban_global_click oe_kanban_crm_salesteams" style="width:220px;">
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user">
                                     <span class="oe_e">í</span>
                                     <ul class="oe_dropdown_menu">
-                                        <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Project Settings</a></li></t>
+                                        <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Sales Teams Settings</a></li></t>
                                         <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
                                     </ul>
                                 </div>
                                 <div class="oe_kanban_content">
-                                    <h4>
-                                      <field name="name"/>
-                                      <div class="oe_kanban_crm_salesteams_leader">
-                                        <small>
-                                          <t t-if="record.user_id.raw_value">(<field name="user_id"/>)</t>
-                                          <t t-if="!record.user_id.raw_value"><br/></t>
-                                        </small>
-                                      </div>
-                                    </h4>
+                                    <h4><field name="name"/></h4>
+                                    <div class="oe_kanban_crm_salesteams_alias" t-if="record.alias_id.raw_value and record.alias_id.value.match(/@.+/)">
+                                        <span class="oe_e">%%</span><small><field name="alias_id"/></small>
+                                    </div>
                                     <div class="oe_kanban_crm_salesteams_list">
-                                        <a name="%(crm_case_form_view_salesteams_opportunity)d" type="action">
+                                        <a name="%(crm_case_form_view_salesteams_opportunity)d" type="action" style="margin-right: 10px">
                                             <field name="number_opportunity"/>
-                                            <t t-if="record.number_opportunity.raw_value &gt; 1">Opportunities</t><t t-if="record.number_opportunity.raw_value &lt;= 1">Opportunity</t></a>,
-                                        <a name="%(crm_case_form_view_salesteams_lead)d" type="action">
+                                            <t t-if="record.number_opportunity.raw_value &gt; 1">Opportunities</t><t t-if="record.number_opportunity.raw_value &lt;= 1">Opportunity</t></a>
+                                        <a name="%(crm_case_form_view_salesteams_lead)d" type="action" style="margin-right: 10px">
                                             <field name="number_lead"/>
                                             <t t-if="record.number_lead.raw_value &gt; 1">Leads</t><t t-if="record.number_lead.raw_value &lt;= 1">Lead</t></a>
                                     </div>
@@ -101,12 +96,6 @@
                                             <img t-att-src="kanban_image('res.users', 'image_small', member)" t-att-data-member_id="member"/>
                                         </t>
                                     </div>
-                                    <t t-if="record.alias_domain.raw_value">
-                                        <br/>
-                                        <small style="position: absolute; bottom: 5px;">
-                                            <field name="alias_id"/>
-                                        </small>
-                                    </t>
                                 </div>
                             </div>
                         </t>
diff --git a/addons/crm/static/src/css/crm.css b/addons/crm/static/src/css/crm.css
index 06c612561e6..e9f7abfa7ae 100644
--- a/addons/crm/static/src/css/crm.css
+++ b/addons/crm/static/src/css/crm.css
@@ -19,4 +19,21 @@
     -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
 }
 
+.oe_kanban_crm_salesteams_alias {
+    margin: -8px 0 8px 0;
+}
 
+.oe_kanban_crm_salesteams_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_crm_salesteams_alias small {
+    display: block;
+    margin-left: 20px;
+}
\ No newline at end of file
diff --git a/addons/crm/static/src/js/crm.js b/addons/crm/static/src/js/crm.js
new file mode 100644
index 00000000000..e027313d6dc
--- /dev/null
+++ b/addons/crm/static/src/js/crm.js
@@ -0,0 +1,11 @@
+openerp.crm = function(openerp) {
+    openerp.web_kanban.KanbanRecord.include({
+        on_card_clicked: function() {
+            if (this.view.dataset.model === 'crm.case.section') {
+                this.$('.oe_kanban_crm_salesteams_list a').first().click();
+            } else {
+                this._super.apply(this, arguments);
+            }
+        },
+    });
+};
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 95af1df5967..feb62e9aea4 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -75,11 +75,10 @@
                                 <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" invisible="1" required="0"/>
                                 <label for="alias_name" class="oe_edit_only"/>
-                                <field name="alias_name" nolabel="1" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" nolabel="1" class="oe_inline"/>
+                                <field name="alias_name" nolabel="1" class="oe_inline" style="padding-right:0;" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" nolabel="1" class="oe_inline" style="padding-left:0;"/>
                             </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 dd54f41bb2d..893eae68dcd 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -246,8 +246,10 @@
                                     </ul>
                                 </div>
                                 <div class="oe_kanban_content">
-
                                     <h4><field name="name"/></h4>
+                                    <div class="oe_kanban_project_alias" t-if="record.alias_id.raw_value and record.alias_id.value.match(/@.+/)">
+                                        <span class="oe_e">%%</span><small><field name="alias_id"/></small>
+                                    </div>
                                     <div class="oe_kanban_project_list">
                                         <a t-if="record.use_tasks.raw_value" name="%(act_project_project_2_project_task_all)d" type="action" style="margin-right: 10px"> 
                                             <span t-if="record.task_count.raw_value gt 1"><field name="task_count"/> Tasks</span>
@@ -272,12 +274,6 @@
                                             <img t-att-src="kanban_image('res.users', 'image_small', member)" t-att-data-member_id="member"/>
                                         </t>
                                     </div>
-                                    <t t-if="record.alias_domain.raw_value">
-                                        <br/>
-                                        <small style="position: absolute; bottom: 5px;">
-                                            <field name="alias_id"/>
-                                        </small>
-                                    </t>
                                 </div>
                             </div>
                         </t>
diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css
index 1ea3c705105..e4d2196d476 100644
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -62,4 +62,21 @@
     -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
 }
 
+.oe_kanban_project_alias {
+    margin: -8px 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