From a637eaf4385c33e53d56a11310f29f768464ecde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Wed, 26 Sep 2018 16:29:06 +0200
Subject: [PATCH] [IMP] hr_holidays: improve kanban views

Purpose of this commit is to make kanban vignette a bit more aligned with
Odoo style. Those are much better now thanks to @est-odoo.
---
 .../views/hr_leave_allocation_views.xml       | 70 ++++++-----------
 addons/hr_holidays/views/hr_leave_views.xml   | 75 ++++++++-----------
 2 files changed, 54 insertions(+), 91 deletions(-)

diff --git a/addons/hr_holidays/views/hr_leave_allocation_views.xml b/addons/hr_holidays/views/hr_leave_allocation_views.xml
index d0d2c99c496..6529de5aca0 100644
--- a/addons/hr_holidays/views/hr_leave_allocation_views.xml
+++ b/addons/hr_holidays/views/hr_leave_allocation_views.xml
@@ -229,58 +229,36 @@
                 <field name="can_approve"/>
                 <templates>
                     <t t-name="kanban-box">
-                        <div t-attf-class="oe_kanban_global_click">
-                            <div>
-                                <span>
-                                    <img t-att-src="kanban_image('hr.employee', 'image_small', record.employee_id.raw_value)" t-att-title="record.employee_id.value" t-att-alt="record.employee_id.value" width="40" height="40" class="oe_kanban_avatar float-left mr4"/>
-                                </span>
-                                <div class="row">
-                                    <div class="col-8">
-                                        <strong class="o_kanban_record_title"><t t-esc="record.employee_id.value"/></strong>
-                                    </div>
-                                    <div class="col-4">
-                                        <span class="float-right badge badge-secondary">
-                                            <field name="state" widget="kanban_label_selection"
-                                                options="{'classes': {'draft': 'default', 'confirm': 'default', 'validate': 'success', 'cancel': 'danger'}}"/>
-                                        </span>
-                                    </div>
+                        <div class="oe_kanban_global_click container">
+                            <div class="row no-gutters">
+                                <div class="col-2">
+                                    <img t-att-src="kanban_image('hr.employee', 'image_small', record.employee_id.raw_value)"
+                                        t-att-title="record.employee_id.value"
+                                        t-att-alt="record.employee_id.value"
+                                        width="40" height="40"
+                                        class="oe_kanban_avatar float-left mr4 col-md-"/>
                                 </div>
-                                <div class="row">
-                                    <div class="col-12 text-muted o_kanban_record_subtitle">
+                                <div class="col-10">
+                                    <span class="badge badge-pill float-right mt4 mr16"><t t-esc="record.number_of_days.value"/> days</span>
+                                    <strong class="o_kanban_record_title"><t t-esc="record.employee_id.value"/></strong>
+                                    <div class="text-muted o_kanban_record_subtitle">
                                         <t t-esc="record.name.value"/>
                                     </div>
-                                </div>
-                                <div class="o_dropdown_kanban dropdown" groups="base.group_user">
-                                    <a role="button" class="dropdown-toggle o-no-caret btn" data-toggle="dropdown" href="#" aria-label="Dropdown menu" title="Dropdown menu">
-                                        <span class="fa fa-ellipsis-v"/>
-                                    </a>
-                                    <div class="dropdown-menu" role="menu">
-                                        <a t-if="widget.editable" role="menuitem" type="edit" class="dropdown-item">Edit Task</a>
-                                        <a t-if="widget.deletable" role="menuitem" type="delete" class="dropdown-item">Delete</a>
-                                        <a t-if="record.can_approve.value" name="action_approve" type="object"
-                                            role="menuitem" class="dropdown-item">Approve</a>
-                                        <a t-if="record.can_approve.value" name="action_refuse" type="object"
-                                            role="menuitem" class="dropdown-item">Refuse</a>
+                                    <div class="o_dropdown_kanban dropdown" groups="base.group_user">
+                                        <a role="button" class="dropdown-toggle o-no-caret btn" data-toggle="dropdown" href="#" aria-label="Dropdown menu" title="Dropdown menu">
+                                            <span class="fa fa-ellipsis-v"/>
+                                        </a>
+                                        <div class="dropdown-menu" role="menu">
+                                            <a t-if="widget.editable" role="menuitem" type="edit" class="dropdown-item">Edit Allocation</a>
+                                            <a t-if="widget.deletable" role="menuitem" type="delete" class="dropdown-item">Delete</a>
+                                            <a t-if="record.can_approve.value" name="action_approve" type="object"
+                                                role="menuitem" class="dropdown-item">Approve</a>
+                                            <a t-if="record.can_approve.value" name="action_refuse" type="object"
+                                                role="menuitem" class="dropdown-item">Refuse</a>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
-                            <div class="o_kanban_record_bottom mt8 mb4">
-                                <div t-attf-class="oe_kanban_bottom_left #{record.date_from.value ? 'mt8 mb4': ''}">
-                                    <table class="text-right" t-if="record.date_from.value">
-                                        <tr>
-                                            <td style="padding-bottom:4px"><small class="text-muted">from</small></td>
-                                            <td style="padding:0 0 4px 4px"><t t-esc="record.date_from.value"/></td>
-                                        </tr>
-                                        <tr>
-                                            <td><small class="text-muted">to</small></td>
-                                            <td style="padding-left:4px"><t t-esc="record.date_to.value"/></td>
-                                        </tr>
-                                    </table>
-                                </div>
-                                <div t-attf-class="oe_kanban_bottom_right #{record.date_from.value ? 'mt8': ''}">
-                                    <span class="badge badge-pill"><t t-esc="record.number_of_days.value"/> days</span>
-                                </div>
-                            </div>
                         </div>
                     </t>
                 </templates>
diff --git a/addons/hr_holidays/views/hr_leave_views.xml b/addons/hr_holidays/views/hr_leave_views.xml
index 673ac56d0a3..8a60b2854fb 100644
--- a/addons/hr_holidays/views/hr_leave_views.xml
+++ b/addons/hr_holidays/views/hr_leave_views.xml
@@ -77,57 +77,42 @@
                 <field name="can_approve"/>
                 <templates>
                     <t t-name="kanban-box">
-                        <div t-attf-class="oe_kanban_global_click">
-                            <div>
-                                <span>
-                                    <img t-att-src="kanban_image('hr.employee', 'image_small', record.employee_id.raw_value)" t-att-title="record.employee_id.value" t-att-alt="record.employee_id.value" width="40" height="40" class="oe_kanban_avatar float-left mr4"/>
-                                </span>
-                                <div class="row">
-                                    <div class="col-8">
-                                        <strong class="o_kanban_record_title"><t t-esc="record.employee_id.value"/></strong>
-                                    </div>
-                                    <div class="col-4">
-                                        <span class="float-right badge badge-secondary">
-                                            <field name="state" widget="kanban_label_selection"
-                                                options="{'classes': {'draft': 'default', 'confirm': 'default', 'validate': 'success', 'cancel': 'danger'}}"/>
-                                        </span>
-                                    </div>
+                        <div class="oe_kanban_global_click container">
+                            <div class="row no-gutters">
+                                <div class="col-2">
+                                    <img t-att-src="kanban_image('hr.employee', 'image_small', record.employee_id.raw_value)"
+                                        t-att-title="record.employee_id.value"
+                                        t-att-alt="record.employee_id.value"
+                                        width="40" height="40"
+                                        class="oe_kanban_avatar float-left mr4 col-md-"/>
                                 </div>
-                                <div class="row">
-                                    <div class="col-12 text-muted o_kanban_record_subtitle">
+                                <div class="col-10">
+                                    <span class="badge badge-pill float-right mt4 mr16"><t t-esc="record.number_of_days.value"/> days</span>
+                                    <strong class="o_kanban_record_title"><t t-esc="record.employee_id.value"/></strong>
+                                    <div class="text-muted o_kanban_record_subtitle">
                                         <t t-esc="record.name.value"/>
                                     </div>
-                                </div>
-                                <div class="o_dropdown_kanban dropdown" groups="base.group_user">
-                                    <a role="button" class="dropdown-toggle o-no-caret btn" data-toggle="dropdown" href="#" aria-label="Dropdown menu" title="Dropdown menu">
-                                        <span class="fa fa-ellipsis-v"/>
-                                    </a>
-                                    <div class="dropdown-menu" role="menu">
-                                        <a t-if="widget.editable" role="menuitem" type="edit" class="dropdown-item">Edit Task</a>
-                                        <a t-if="widget.deletable" role="menuitem" type="delete" class="dropdown-item">Delete</a>
-                                        <a t-if="record.can_approve.value" name="action_approve" type="object"
-                                            role="menuitem" class="dropdown-item">Approve</a>
-                                        <a t-if="record.can_approve.value" name="action_refuse" type="object"
-                                            role="menuitem" class="dropdown-item">Refuse</a>
+                                    <div class="o_dropdown_kanban dropdown" groups="base.group_user">
+                                        <a role="button" class="dropdown-toggle o-no-caret btn" data-toggle="dropdown" href="#" aria-label="Dropdown menu" title="Dropdown menu">
+                                            <span class="fa fa-ellipsis-v"/>
+                                        </a>
+                                        <div class="dropdown-menu" role="menu">
+                                            <a t-if="widget.editable" role="menuitem" type="edit" class="dropdown-item">Edit Leave</a>
+                                            <a t-if="widget.deletable" role="menuitem" type="delete" class="dropdown-item">Delete</a>
+                                            <a t-if="record.can_approve.value" name="action_approve" type="object"
+                                                role="menuitem" class="dropdown-item">Approve</a>
+                                            <a t-if="record.can_approve.value" name="action_refuse" type="object"
+                                                role="menuitem" class="dropdown-item">Refuse</a>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
-                            <div class="o_kanban_record_bottom mt8 mb4">
-                                <div t-attf-class="oe_kanban_bottom_left #{record.date_from.value ? 'mt8 mb4': ''}">
-                                    <table class="text-right" t-if="record.date_from.value">
-                                        <tr>
-                                            <td style="padding-bottom:4px"><small class="text-muted">from</small></td>
-                                            <td style="padding:0 0 4px 4px"><t t-esc="record.date_from.value"/></td>
-                                        </tr>
-                                        <tr>
-                                            <td><small class="text-muted">to</small></td>
-                                            <td style="padding-left:4px"><t t-esc="record.date_to.value"/></td>
-                                        </tr>
-                                    </table>
-                                </div>
-                                <div t-attf-class="oe_kanban_bottom_right #{record.date_from.value ? 'mt8': ''}">
-                                    <span class="badge badge-pill"><t t-esc="record.number_of_days.value"/> days</span>
-                                </div>
+                            <div class="row no-gutters justify-content-end">
+                                <div class="col-2"><span class="text-muted">from</span></div>
+                                <div class="col-8"><t t-esc="record.date_from.value"/></div>
+                                <div class="w-100"></div>
+                                <div class="col-2"><span class="text-muted">to</span></div>
+                                <div class="col-8"><t t-esc="record.date_to.value"/></div>
                             </div>
                         </div>
                     </t>