From e755f171555466201f919a01397e41f7e4969bc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 14 Mar 2012 19:03:52 +0100
Subject: [PATCH] [REM] Removed some css changes. user image now only replaces
 the gravatar.

bzr revid: tde@openerp.com-20120314180352-8jpbv9j01jt5mq0y
---
 addons/crm/crm_lead_view.xml                  | 69 +++++++++--------
 addons/crm/doc/crm_kanban_avatar.rst          |  2 +-
 addons/crm/static/src/css/crm_kanban.css      | 21 -----
 addons/project/doc/task_kanban_avatar.rst     |  2 +-
 addons/project/project_view.xml               | 77 +++++++++----------
 .../project/static/src/css/project_task.css   | 21 -----
 6 files changed, 75 insertions(+), 117 deletions(-)
 delete mode 100644 addons/crm/static/src/css/crm_kanban.css
 delete mode 100644 addons/project/static/src/css/project_task.css

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index f156b4ffa40..52cb1b217d2 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -291,42 +291,43 @@
                         <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="border">oe_kanban_color_red</t>
                         <div t-attf-class="#{kanban_color(record.color.raw_value)} #{border || ''}">
                             <div class="oe_kanban_box oe_kanban_color_border">
-                                <div class="oe_proj_task_avatar_box">
-                                    <img t-att-src="kanban_image('res.users', 'avatar_mini', record.user_id.raw_value[0])" class="oe_kanban_avatar" t-att-title="record.user_id.value"/>
-                                </div>
-                                <div class="oe_proj_task_content_box">
-                                    <table class="oe_kanban_table oe_kanban_box_header oe_kanban_color_bgdark oe_kanban_color_border oe_kanban_draghandle">
-                                    <tr>
-                                        <td align="left" valign="middle" width="16">
-                                            <a t-if="record.priority.raw_value == 1" icon="star-on" type="object" name="set_normal_priority"/>
-                                            <a t-if="record.priority.raw_value != 1" icon="star-off" type="object" name="set_high_priority" style="opacity:0.6; filter:alpha(opacity=60);"/>
-                                        </td>
-                                        <td align="left" valign="middle" class="oe_kanban_title" tooltip="lead_details">
-                                            <field name="partner_id"/>
-                                            <t t-if="record.planned_revenue.raw_value">
-                                                - <t t-esc="Math.round(record.planned_revenue.value)"/>
-                                                <field name="company_currency"/>
-                                            </t>
-                                        </td>
-                                    </tr>
-                                    </table>
-                                    <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger">
-                                        <div>
-                                            <b>
-                                                <a t-if="record.partner_address_email.raw_value" t-attf-href="mailto:#{record.partner_address_email.raw_value}">
-                                                    <field name="partner_address_name"/>
-                                                </a>
-                                                <field t-if="!record.partner_address_email.raw_value" name="partner_address_name"/>
-                                            </b>
-                                        </div>
-                                        <div>
-                                            <field name="name"/>
-                                        </div>
-                                        <div style="padding-left: 0.5em">
-                                            <i><field name="date_action"/><t t-if="record.date_action.raw_value"> : </t><field name="title_action"/></i>
-                                        </div>
+                                <table class="oe_kanban_table oe_kanban_box_header oe_kanban_color_bgdark oe_kanban_color_border oe_kanban_draghandle">
+                                <tr>
+                                    <td align="left" valign="middle" width="16">
+                                        <a t-if="record.priority.raw_value == 1" icon="star-on" type="object" name="set_normal_priority"/>
+                                        <a t-if="record.priority.raw_value != 1" icon="star-off" type="object" name="set_high_priority" style="opacity:0.6; filter:alpha(opacity=60);"/>
+                                    </td>
+                                    <td align="left" valign="middle" class="oe_kanban_title" tooltip="lead_details">
+                                        <field name="partner_id"/>
+                                        <t t-if="record.planned_revenue.raw_value">
+                                            - <t t-esc="Math.round(record.planned_revenue.value)"/>
+                                            <field name="company_currency"/>
+                                        </t>
+                                    </td>
+                                    <td valign="top" width="22">
+                                        <img t-att-src="kanban_image('res.users', 'avatar_mini', record.user_id.raw_value[0])"  t-att-title="record.user_id.value"
+                                        width="22" height="22" class="oe_kanban_gravatar"/>
+                                    </td>
+                                </tr>
+                                </table>
+
+                                <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger">
+                                    <div>
+                                        <b>
+                                            <a t-if="record.partner_address_email.raw_value" t-attf-href="mailto:#{record.partner_address_email.raw_value}">
+                                                <field name="partner_address_name"/>
+                                            </a>
+                                            <field t-if="!record.partner_address_email.raw_value" name="partner_address_name"/>
+                                        </b>
+                                    </div>
+                                    <div>
+                                        <field name="name"/>
+                                    </div>
+                                    <div style="padding-left: 0.5em">
+                                        <i><field name="date_action"/><t t-if="record.date_action.raw_value"> : </t><field name="title_action"/></i>
                                     </div>
                                 </div>
+
                                 <div class="oe_kanban_buttons_set oe_kanban_color_border oe_kanban_color_bglight oe_kanban_box_show_onclick">
                                     <div class="oe_kanban_left">
                                         <a string="Edit" icon="gtk-edit" type="edit"/>
diff --git a/addons/crm/doc/crm_kanban_avatar.rst b/addons/crm/doc/crm_kanban_avatar.rst
index 6d5a2702fc6..90998b0b1b9 100644
--- a/addons/crm/doc/crm_kanban_avatar.rst
+++ b/addons/crm/doc/crm_kanban_avatar.rst
@@ -1,4 +1,4 @@
 CRM kanban avatar specs
 =======================
 
-Kanban view of opportunities has been updated to use the newly-introduced avatar_mini field of res.users. The avatar is placed in the right-side of the containing kanban box. CSS file has been added to hold the css definitions necessary to update the boxes.
+Kanban view of opportunities has been updated to use the newly-introduced avatar_mini field of res.users. The avatar is placed in the right-side of the containing kanban box.
diff --git a/addons/crm/static/src/css/crm_kanban.css b/addons/crm/static/src/css/crm_kanban.css
deleted file mode 100644
index c029df7b2ba..00000000000
--- a/addons/crm/static/src/css/crm_kanban.css
+++ /dev/null
@@ -1,21 +0,0 @@
-.openerp .oe_proj_task_content_box {
-    margin-right: 41px;
-}
-
-.openerp .oe_proj_task_avatar_box {
-    float: right;
-    width: 40px;
-}
-
-.openerp .oe_kanban_avatar {
-    display: block;
-    width: 40px;
-    height: auto;
-    clip: rect(5px, 40px, 45px, 0px);
-}
-
-.openerp .oe_kanban_avatar_wide {
-    height: 40px;
-    width: auto;
-    clip: rect(0px, 45px, 40px, 05px);
-}
diff --git a/addons/project/doc/task_kanban_avatar.rst b/addons/project/doc/task_kanban_avatar.rst
index 8403b22a227..af0a460f51c 100644
--- a/addons/project/doc/task_kanban_avatar.rst
+++ b/addons/project/doc/task_kanban_avatar.rst
@@ -1,4 +1,4 @@
 Task kanban avatar specs
 ========================
 
-Kanban view of tasks has been updated to use the newly-introduced avatar_mini field of res.users. The avatar is placed in the right-side of the containing kanban box. CSS file has been added to hold the css definitions necessary to update the boxes.
+Kanban view of tasks has been updated to use the newly-introduced avatar_mini field of res.users. The avatar is placed in the right-side of the containing kanban box.
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 9f791f81053..3716187dedc 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -344,46 +344,45 @@
                             <t t-if="record.kanban_state.raw_value === 'done'" t-set="border">oe_kanban_color_green</t>
                             <div t-attf-class="#{kanban_color(record.color.raw_value)} #{border || ''}">
                                 <div class="oe_kanban_box oe_kanban_color_border">
-                                    <div class="oe_proj_task_avatar_box">
-                                        <img t-att-src="kanban_image('res.users', 'avatar_mini', record.user_id.raw_value[0])" class="oe_kanban_avatar" t-att-title="record.user_id.value"/>
-                                    </div>
-                                    <div class="oe_proj_task_content_box">
-                                        <table class="oe_kanban_table oe_kanban_box_header oe_kanban_color_bgdark oe_kanban_color_border oe_kanban_draghandle">
-                                        <tr>
-                                            <td align="left" valign="middle" width="16">
-                                                <a t-if="record.priority.raw_value == 1" icon="star-on" type="object" name="set_normal_priority"/>
-                                                <a t-if="record.priority.raw_value != 1" icon="star-off" type="object" name="set_high_priority" style="opacity:0.6; filter:alpha(opacity=60);"/>
-                                            </td>
-                                            <td align="left" valign="middle" class="oe_kanban_title" tooltip="task_details">
-                                                <field name="name"/>
-                                            </td>
-                                        </tr>
-                                        </table>
-                                        <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger">
-                                            <div class="oe_kanban_description">
-                                                <t t-esc="kanban_text_ellipsis(record.description.value, 160)"/>
-                                                <i t-if="record.date_deadline.raw_value">
-                                                    <t t-if="record.description.raw_value">, </t>
-                                                    <field name="date_deadline"/>
-                                                </i>
-                                                <span class="oe_kanban_project_times" style="white-space: nowrap; padding-left: 5px;">
-                                                    <t t-set="hours" t-value="record.remaining_hours.raw_value"/>
-                                                    <t t-set="times" t-value="[
-                                                        [1, (hours gte 1 and hours lt 2)]
-                                                        ,[2, (hours gte 2 and hours lt 5)]
-                                                        ,[5, (hours gte 5 and hours lt 10)]
-                                                        ,[10, (hours gte 10)]
-                                                    ]"/>
-                                                    <t t-foreach="times" t-as="time"
-                                                        ><a t-if="!time[1]" t-attf-data-name="set_remaining_time_#{time[0]}"
-                                                            type="object" class="oe_kanban_button"><t t-esc="time[0]"/></a
-                                                        ><b t-if="time[1]" class="oe_kanban_button oe_kanban_button_active"><t t-esc="Math.round(hours)"/></b
-                                                    ></t>
-                                                    <a name="do_open" states="draft" string="Validate planned time and open task" type="object" class="oe_kanban_button oe_kanban_button_active">!</a>
-                                                </span>
-                                            </div>
-                                            <div class="oe_kanban_clear"/>
+                                    <table class="oe_kanban_table oe_kanban_box_header oe_kanban_color_bgdark oe_kanban_color_border oe_kanban_draghandle">
+                                    <tr>
+                                        <td align="left" valign="middle" width="16">
+                                            <a t-if="record.priority.raw_value == 1" icon="star-on" type="object" name="set_normal_priority"/>
+                                            <a t-if="record.priority.raw_value != 1" icon="star-off" type="object" name="set_high_priority" style="opacity:0.6; filter:alpha(opacity=60);"/>
+                                        </td>
+                                        <td align="left" valign="middle" class="oe_kanban_title" tooltip="task_details">
+                                            <field name="name"/>
+                                        </td>
+                                        <td valign="top" width="22">
+                                            <img t-att-src="kanban_image('res.users', 'avatar_mini', record.user_id.raw_value[0])"  t-att-title="record.user_id.value"
+                                            width="22" height="22" class="oe_kanban_gravatar"/>
+                                        </td>
+                                    </tr>
+                                    </table>
+                                    <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger">
+                                        <div class="oe_kanban_description">
+                                            <t t-esc="kanban_text_ellipsis(record.description.value, 160)"/>
+                                            <i t-if="record.date_deadline.raw_value">
+                                                <t t-if="record.description.raw_value">, </t>
+                                                <field name="date_deadline"/>
+                                            </i>
+                                            <span class="oe_kanban_project_times" style="white-space: nowrap; padding-left: 5px;">
+                                                <t t-set="hours" t-value="record.remaining_hours.raw_value"/>
+                                                <t t-set="times" t-value="[
+                                                     [1, (hours gte 1 and hours lt 2)]
+                                                    ,[2, (hours gte 2 and hours lt 5)]
+                                                    ,[5, (hours gte 5 and hours lt 10)]
+                                                    ,[10, (hours gte 10)]
+                                                ]"/>
+                                                <t t-foreach="times" t-as="time"
+                                                    ><a t-if="!time[1]" t-attf-data-name="set_remaining_time_#{time[0]}"
+                                                        type="object" class="oe_kanban_button"><t t-esc="time[0]"/></a
+                                                    ><b t-if="time[1]" class="oe_kanban_button oe_kanban_button_active"><t t-esc="Math.round(hours)"/></b
+                                                ></t>
+                                                <a name="do_open" states="draft" string="Validate planned time and open task" type="object" class="oe_kanban_button oe_kanban_button_active">!</a>
+                                            </span>
                                         </div>
+                                        <div class="oe_kanban_clear"/>
                                     </div>
                                     <div class="oe_kanban_buttons_set oe_kanban_color_border oe_kanban_color_bglight oe_kanban_box_show_onclick">
                                         <div class="oe_kanban_left">
diff --git a/addons/project/static/src/css/project_task.css b/addons/project/static/src/css/project_task.css
deleted file mode 100644
index c029df7b2ba..00000000000
--- a/addons/project/static/src/css/project_task.css
+++ /dev/null
@@ -1,21 +0,0 @@
-.openerp .oe_proj_task_content_box {
-    margin-right: 41px;
-}
-
-.openerp .oe_proj_task_avatar_box {
-    float: right;
-    width: 40px;
-}
-
-.openerp .oe_kanban_avatar {
-    display: block;
-    width: 40px;
-    height: auto;
-    clip: rect(5px, 40px, 45px, 0px);
-}
-
-.openerp .oe_kanban_avatar_wide {
-    height: 40px;
-    width: auto;
-    clip: rect(0px, 45px, 40px, 05px);
-}