3 files changed, 28 insertions, 59 deletions
diff --git a/addons/mass_mailing/static/src/css/email_template.css b/addons/mass_mailing/static/src/css/email_template.css
new file mode 100644
index 00000000000..495c201a172
--- /dev/null
+++ b/addons/mass_mailing/static/src/css/email_template.css
@@ -0,0 +1,17 @@
+.openerp .oe_kanban_email_template {
+    width: 360px;
+    min-height: 270px !important;
+}
+
+.kanban_html_preview {
+    width: 600px;
+    height: 600px;
+    -webkit-transform: scale(.50);
+    -ms-transform: scale(.50);
+    transform: scale(.50);
+    -webkit-transform-origin: 0 0; 
+    -ms-transform-origin: 0 0; 
+    transform-origin: 0 0; 
+    margin: 0 0px -300px 0;
+    overflow: hidden !important;
+}
diff --git a/addons/mass_mailing/static/src/css/mass_mailing.css b/addons/mass_mailing/static/src/css/mass_mailing.css
index e54ce46c025..cc91e8acf58 100644
--- a/addons/mass_mailing/static/src/css/mass_mailing.css
+++ b/addons/mass_mailing/static/src/css/mass_mailing.css
@@ -1,61 +1,13 @@
-.openerp .oe_kanban_view .oe_kanban_mass_mailing.oe_kanban_mass_mailing_campaign {
-    /* Customize to manage content */
-    width: 552px;
-    min-height: 278px !important;
-    /* End of customize */
+.openerp .oe_kanban_view .oe_kanban_mass_mailing_campaign {
+    width: 280px;
+    min-height: 141px;
 }
 
-.openerp .oe_kanban_view .oe_kanban_mass_mailing.oe_kanban_mass_mailing_segment {
-    /* Customize to manage content */
-    width: 282px;
-    min-height: 246px !important;
-    /* End of customize */
+.openerp .oe_kanban_view .oe_kanban_mass_mailing_campaign .oe_kanban_header_right {
+    float: right;
 }
 
-.openerp .oe_kanban_view .oe_kanban_mass_mailing .oe_mail_stats {
-    width: 122px; /* Manage space in between stats */
-    display: inline-block;
-    margin: 2px 5px 0px 5px;
-    text-align: center;
-    border: 1px solid rgba(0, 0, 0, 0.16);
-    -webkit-border-radius: 2px;
-    border-radius: 2px;
-    background-color: #FFFFFF;
+.openerp .oe_kanban_view .oe_kanban_mass_mailing {
+    width: 280px;
+    min-height: 141px;
 }
-
-.openerp .oe_kanban_view .oe_kanban_mass_mailing .oe_mail_result {
-    font-weight: bold;
-}
-
-.openerp .oe_kanban_view .oe_kanban_mass_mailing .oe_gauge {
-    width: 120px;
-    height: 120px;
-    display: inline-block;
-}
-
-.openerp .oe_kanban_view .oe_kanban_mass_mailing .oe_kanban_content div.oe_sparkline_container {
-    height: 60px;
-    width: 120px;
-    display: inline-block;
-    margin: 8px 5px 0px 5px;
-}
-
-.openerp .oe_kanban_view .oe_kanban_mass_mailing .oe_sparkline_bar_title {
-    text-align: center;
-    display: inline;
-}
-
-.openerp .oe_kanban_view .oe_kanban_mass_mailing .oe_sparkline_bar {
-    width: 100px;
-    height: 60px;
-    display: inline-block;
-}
-
-/* 
- * Campaign related CSS
- */
-
-
-/* 
- * Segment related CSS
- */
diff --git a/addons/mass_mailing/static/src/js/mass_mailing.js b/addons/mass_mailing/static/src/js/mass_mailing.js
index 93f63f01ad1..ef456c40bbf 100644
--- a/addons/mass_mailing/static/src/js/mass_mailing.js
+++ b/addons/mass_mailing/static/src/js/mass_mailing.js
@@ -1,13 +1,13 @@
-openerp.mass_mailing = function(openerp) {
+openerp.mass_mailing = function (instance) {
+    var _t = instance.web._t;
 
     openerp.web_kanban.KanbanRecord.include({
         on_card_clicked: function (event) {
             if (this.view.dataset.model === 'mail.mass_mailing.campaign') {
-                this.$('.oe_mass_mailings a').first().click();
+                this.$('.oe_mailings').click();
             } else {
                 this._super.apply(this, arguments);
             }
         },
     });
-
 };