From 844f95fae33192bba4655d2974cfcb3ff3306a8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 7 Feb 2012 10:23:28 +0100
Subject: [PATCH] [IMP] Improved comments display. Also removed now deleted
 thread_view fields from crm.lead that was still present in form view.

bzr revid: tde@openerp.com-20120207092328-mw8ugjycgkgth6bs
---
 addons/crm/crm_lead_view.xml        |  3 ---
 addons/mail/mail_group_view.xml     |  2 +-
 addons/mail/static/src/css/mail.css | 16 +++++++++++-----
 addons/mail/static/src/xml/mail.xml | 14 ++++++++------
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 6218d00f044..3fc6aff1536 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -561,9 +561,6 @@
                                 icon="terp-mail-replied" type="action" />
                         </tree>
                     </field>
-                    <newline/>
-                    <field name="thread_view" colspan="4" widget='mail.ThreadView'/>
-                    <newline/>
                     <button string="Add Internal Note"
                         name="%(crm.action_crm_add_note)d"
                         context="{'model': 'crm.lead' }"
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index 9d349ff65dd..ff489b09734 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -103,7 +103,7 @@
                         <label string="This group is visible by non members" colspan="2"/>
                     </group>
                     <separator string="OpenChatter" colspan="4"/>
-                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+<!--                     <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/> -->
                 </form>
             </field>
         </record>
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 02dc231dd76..b98913f841e 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -2,15 +2,15 @@
 
 .oe_mail_comment {
     width: 65%;
-    border-right: 4px solid #770033;
+    border: 4px solid #770033;
 }
 
-.ThreadMsgView {
+.oe_mail_msg {
     width: 80%;
-    border-right: 4px solid #770033;
+    border: 4px solid #998877;
 }
 
-.ThreadMsgView:after {
+.oe_mail_msg:after {
   content: "";
   display: block;
   clear: both; 
@@ -21,9 +21,10 @@
     width: 10%;
 }
 
-.oe_mail_msg {
+.oe_mail_msg_content {
     float: right;
     width: 80%;
+    border: 4px solid #557722;
 }
 
 .oe_mail_msg_body {
@@ -34,3 +35,8 @@
 
 .oe_mail_msg_date {
 }
+
+.oe_mail_msg_p {
+    padding: 0;
+    margin: 0;
+}
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index a5c35073be9..9ca0f5eb890 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -7,7 +7,7 @@
             <button type="button" class="oe_mail_action_unfollow">Unfollow</button>
         </div>
         <div class="oe_mail_comment">
-            <textarea rows="2" cols="15">Type your comment</textarea>
+            <textarea rows="3" cols="15">Type your comment</textarea><br />
             <button type="button" class="oe_mail_action_comment">Post comment</button>
         </div>
         <div>
@@ -25,12 +25,14 @@
     </div>
     
     <div t-name="ThreadMsgView">
-        <div class="ThreadMsgView">
+        <div class="oe_mail_msg">
             <div class="oe_mail_msg_image">Image</div>
-            <div class="oe_mail_msg">
-                <span class="oe_mail_msg_body"><t t-esc="record.body_text"/></span><br />
-                <span class="oe_mail_msg_author"><t t-esc="record.user_id[1]"/></span><br />
-                <span class="oe_mail_msg_date"><t t-esc="record.date"/></span>
+            <div class="oe_mail_msg_content">
+                <p class="oe_mail_msg_p">
+                    <span class="oe_mail_msg_body"><t t-esc="record.body_text"/></span><br />
+                    <span class="oe_mail_msg_author"><t t-esc="record.user_id[1]"/></span><br />
+                    <span class="oe_mail_msg_date"><t t-esc="record.date"/></span>
+                </p>
             </div>
         </div>
     </div>