From aa472b8f9528874e6e6744060fa46680be54a5b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Thu, 18 Oct 2012 14:02:53 +0200
Subject: [PATCH 1/2] [FIX] mail: composition button bindings + annoying button
 commented out

bzr revid: fva@openerp.com-20121018120253-mc260x4ljfzrhrsh
---
 addons/mail/static/src/js/mail.js   | 2 ++
 addons/mail/static/src/xml/mail.xml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 7f18f650dae..8e1be70e459 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -369,6 +369,7 @@ openerp.mail = function(session) {
             this.$el.replaceWith( $render );
             this.$el = $render;
             this.$('textarea').focus();
+            this.bind_events();
         },
 
         /* convert the compact mode into the compose message
@@ -377,6 +378,7 @@ openerp.mail = function(session) {
             var $render = $(session.web.qweb.render('mail.compose_message.compact', {'widget': this}));
             this.$el.replaceWith( $render );
             this.$el = $render;
+            this.bind_events();
         },
     });
 
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 6a76c7aa323..450e9a834e2 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -246,7 +246,7 @@
         -->
     <t t-name="mail.compose_message.button_top_bar">
         <div class="oe_topbar_compose_full_email">
-            <button class="oe_button oe_highlight">Write an email</button>
+            <!-- <button class="oe_button oe_highlight">Write an email</button> -->
         </div>
     </t>
 

From c040aa5a843adce17e498222b33d1227bf24324d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Thu, 18 Oct 2012 14:53:28 +0200
Subject: [PATCH 2/2] [IMP] mail: further work on the css

bzr revid: fva@openerp.com-20121018125328-7oxxd28kbzmm9k03
---
 addons/mail/static/src/css/mail.css | 28 ++++++++++++++++++++++++----
 addons/mail/static/src/xml/mail.xml | 12 +++++-------
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index a8089bb9629..3d73bbfa33a 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -11,16 +11,19 @@
     padding: 8px;
 }
 .openerp .oe_mail .oe_thread{
-    margin-left: 8px;
+    margin-left: 32px;
 }
-.openerp .oe_mail .oe_thread.oe_root_thread{
+.openerp .oe_mail > .oe_thread{
     margin-left: 0px;
 }
+
+/* ---------------- MESSAGES ------------------ */
+
 .openerp .oe_mail .oe_msg{
     position: relative;
     background: blue;
     margin-bottom: 4px;
-    min-height: 100px;
+    min-height: 75px;
 }
 .openerp .oe_mail .oe_msg .oe_msg_left{
     position: absolute;
@@ -32,9 +35,11 @@
     position: relative;
     display: block;
     margin-left: 75px;
-    margin-right: 32px;
     background: gray;
 }
+.openerp .oe_mail .oe_msg.oe_with_buttons .oe_msg_center{
+    margin-right: 32px;
+}
 .openerp .oe_mail .oe_msg .oe_msg_right{
     position: absolute;
     right:0; top:0; bottom: 0; width: 32px;
@@ -62,3 +67,18 @@
     padding: 0px;
     resize: vertical;
 }
+.openerp .oe_mail .oe_msg.oe_msg_composer_compact{
+    padding:4px;
+    min-height:0px;
+}
+.openerp .oe_mail .oe_msg.oe_msg_composer_compact textarea{
+    height: 24px;
+    width: 100%;
+}
+
+.openerp .oe_mail .oe_msg.oe_msg_unread .oe_unread{
+    display:none;
+}
+.openerp .oe_mail .oe_msg.oe_msg_read .oe_read{
+    display:none;
+}
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 450e9a834e2..1980c9661f7 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -185,7 +185,7 @@
 
     <!-- default layout -->
     <t t-name="mail.thread.message">
-        <div t-attf-class="oe_msg oe_msg_#{widget.datasets.type} oe_msg_#{widget.datasets.to_read?'unread':'read'}">
+        <div t-attf-class="oe_msg oe_with_buttons oe_msg_#{widget.datasets.type} oe_msg_#{widget.datasets.to_read?'unread':'read'}">
             <!-- message actions (read/unread, reply, delete...) -->
             <div class='oe_msg_right'>
                 <div class="oe_msg_icons">
@@ -204,7 +204,7 @@
 
             <div class="oe_msg_center">
                 <!-- message itself -->
-                <div class="oe_mail_msg">
+                <div class="oe_msg_content">
                     <h1 t-if="widget.datasets.subject" class="oe_msg_title">
                         <t t-raw="widget.datasets.subject"/>
                     </h1>
@@ -277,10 +277,8 @@
     <!-- mail.thread.message.star
         Template used to display stared/unstared message in a mail.message
     -->
-    <span t-name="mail.thread.message.star">
-        <span class="oe_left">
-            <button t-attf-class="oe_mail_starbox oe_tag #{widget.datasets.has_stared?'oe_stared':''}">*</button>
-        </span>
-    </span>
+    <t t-name="mail.thread.message.star">
+         <a t-attf-class="oe_mail_starbox #{widget.datasets.has_stared?'oe_stared':''}">*</a>
+    </t>
 
 </template>