From 2a67f91dcfc425ec2df3958825bd1a53b1a81f4c Mon Sep 17 00:00:00 2001
From: Martin Geubelle <mge@odoo.com>
Date: Tue, 26 May 2015 10:55:18 +0200
Subject: [PATCH] [IMP] mass_mailing: improve kanban view to fit with new style

---
 .../static/src/css/mass_mailing.css           | 14 -------
 .../static/src/less/mass_mailing.less         | 25 +++++++++++++
 addons/mass_mailing/views/mass_mailing.xml    | 37 ++++++++++++++-----
 3 files changed, 52 insertions(+), 24 deletions(-)
 delete mode 100644 addons/mass_mailing/static/src/css/mass_mailing.css
 create mode 100644 addons/mass_mailing/static/src/less/mass_mailing.less

diff --git a/addons/mass_mailing/static/src/css/mass_mailing.css b/addons/mass_mailing/static/src/css/mass_mailing.css
deleted file mode 100644
index bc95533a983..00000000000
--- a/addons/mass_mailing/static/src/css/mass_mailing.css
+++ /dev/null
@@ -1,14 +0,0 @@
-.openerp .oe_kanban_view .oe_kanban_mass_mailing_campaign {
-    width: 280px;
-    min-height: 141px;
-}
-.openerp .oe_kanban_view .oe_kanban_mass_mailing {
-    width: 280px;
-    min-height: 35px;
-}
-.openerp .oe_margin_top_8 {
-	margin-top: 8px;
-}
-.openerp .oe_margin_bottom_8 {
-	margin-bottom: 8px;
-}
\ No newline at end of file
diff --git a/addons/mass_mailing/static/src/less/mass_mailing.less b/addons/mass_mailing/static/src/less/mass_mailing.less
new file mode 100644
index 00000000000..b274a540e49
--- /dev/null
+++ b/addons/mass_mailing/static/src/less/mass_mailing.less
@@ -0,0 +1,25 @@
+.o_kanban_view {
+    .oe_kanban_mass_mailing {
+        .o_progressbar .o_progressbar_title {
+            width: 25%;
+        }
+        .o_progressbar .o_progress {
+            width: 50%;
+        }
+        .o_progressbar .o_progressbar_value {
+            width: 25%;
+        }
+        .o_title {
+            margin-bottom: 16px;
+        }
+        .o_kanban_primary_bottom {
+            margin-top: 16px;
+        }
+        .oe_margin_top_8 {
+            margin-top: 8px;
+        }
+        .oe_margin_bottom_8 {
+            margin-bottom: 8px;
+        }
+    }
+}
diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml
index 93f644fb9b9..986f4fceb2d 100644
--- a/addons/mass_mailing/views/mass_mailing.xml
+++ b/addons/mass_mailing/views/mass_mailing.xml
@@ -3,7 +3,7 @@
     <data>
         <template id="assets_backend" name="mass_mailing assets" inherit_id="web.assets_backend">
             <xpath expr="." position="inside">
-                <link rel="stylesheet" href="/mass_mailing/static/src/css/mass_mailing.css"/>
+                <link rel="stylesheet" href="/mass_mailing/static/src/less/mass_mailing.less"/>
                 <link rel="stylesheet" href="/mass_mailing/static/src/css/email_template.css"/>
                 <script type="text/javascript" src="/mass_mailing/static/src/js/mass_mailing.js"></script>
             </xpath>
@@ -503,9 +503,8 @@
                                     </ul>
                                 </div>
                                  <div class="oe_kanban_content">
-                                    <div>
+                                    <div class="o_title">
                                         <h3><field name="name"/></h3>
-
                                         <div attrs="{'invisible': [('sent_date', '=', False)]}">
                                             <h4 style="display: inline;"><field name="mass_mailing_campaign_id" groups="mass_mailing.group_mass_mailing_campaign"/></h4>
                                             <t t-if="record.mass_mailing_campaign_id.raw_value" groups="mass_mailing.group_mass_mailing_campaign"> - </t><field name="sent_date"/>
@@ -513,14 +512,32 @@
                                     </div>
                                     <div attrs="{'invisible': [('sent_date', '=', False)]}">
                                         <t t-if="record.sent_date">
-                                            <div style="display: inline-block">
-                                                <field name="delivered" widget="gauge" style="width:120px; height: 90px;"
-                                                    options="{'max_field': 'total'}"/>
+                                            <div class="row">
+                                                <div class="col-xs-8">
+                                                    <a>Opened</a>
+                                                </div>
+                                                <div class="col-xs-4 text-right">
+                                                    <field name="opened_ratio"/> %
+                                                </div>
                                             </div>
-                                            <div style="display: inline-block; vertical-align: top;">
-                                                <strong>Opened</strong> <field name="opened_ratio"/> %<br />
-                                                <strong>Replied</strong> <field name="replied_ratio"/> % <br />
-                                                <strong>Clicks</strong> <field name="clicks_ratio"/> % <br />
+                                            <div class="row">
+                                                <div class="col-xs-8">
+                                                    <a>Replied</a>
+                                                </div>
+                                                <div class="col-xs-4 text-right">
+                                                    <field name="replied_ratio"/> %
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col-xs-8">
+                                                    <a>Clicks</a>
+                                                </div>
+                                                <div class="col-xs-4 text-right">
+                                                    <field name="clicks_ratio"/> %
+                                                </div>
+                                            </div>
+                                            <div class='o_kanban_primary_bottom'>
+                                                <field name="delivered" widget="progress" options="{'title': 'Delivered', 'current_value': 'delivered', 'max_value': 'total', 'editable': false}"/>
                                             </div>
                                         </t>
                                     </div>