From 1b9b26693ccc932c820df7cc1ccbe56dfc490fef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 2 Feb 2012 15:18:43 +0100
Subject: [ADD] Added first not-working draft for widget. Cleaned message
 search function.

bzr revid: tde@openerp.com-20120202141843-4jq49mbd7a6ecq4b
---
 addons/mail/static/src/xml/mail.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 addons/mail/static/src/xml/mail.xml

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
new file mode 100644
index 00000000000..005b4b23a79
--- /dev/null
+++ b/addons/mail/static/src/xml/mail.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<template>
+    
+    <t t-name="MailTest">
+        <div style="height:100%;">
+            <p>Hello world !</p>
+        </div>
+    </t>
+    
+<!--    <t t-extend="ViewManagerAction">
+        <t t-jquery=".oe-shortcut-toggle" t-operation="after">
+            <a class="oe-share_link" href="#share_link" title="Follow">Follow</a>
+            <a class="oe-share" href="#share" title="Unfollow">Unfollow</a>
+        </t>
+    </t>-->
+    
+</template>
\ No newline at end of file
-- 
cgit v1.2.3


From 2950a8866ab13d2e83feae30a33110ba8b22d449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 6 Feb 2012 10:06:18 +0100
Subject: [ADD] Added firsdt draft of ThreadView widget

bzr revid: tde@openerp.com-20120206090618-s3m5lpdkz7zh1sh2
---
 addons/mail/static/src/xml/mail.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 005b4b23a79..c5c1b64cbd2 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template>
     
-    <t t-name="MailTest">
-        <div style="height:100%;">
-            <p>Hello world !</p>
-        </div>
-    </t>
+    <div t-name="MailTest">
+        vdvgfxdfxdfv
+    </div>
     
 <!--    <t t-extend="ViewManagerAction">
         <t t-jquery=".oe-shortcut-toggle" t-operation="after">
-- 
cgit v1.2.3


From a61be0bf53e6cf2d0240b58e21d47f7f5ce748ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 6 Feb 2012 12:26:23 +0100
Subject: [IMP] Added need_action_user_id, as draft for mechanism to know wich
 user must take an action; small fixes in views; updated ThreadView widget:
 first draft for follow/unfollow buttons

bzr revid: tde@openerp.com-20120206112623-fvwjf7o0iuwi3ocs
---
 addons/mail/static/src/xml/mail.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index c5c1b64cbd2..ad9c886fab3 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -2,7 +2,17 @@
 <template>
     
     <div t-name="MailTest">
-        vdvgfxdfxdfv
+        <button type="button" class="oe_mail_action_follow">
+            Follow
+<!--             <img src="/edi/static/src/img/pdf.png"/> -->
+        </button>
+        <button type="button" class="oe_mail_action_unfollow">
+            Unfollow
+<!--             <img src="/edi/static/src/img/pdf.png"/> -->
+        </button>
+        <p>Bladivoctock !</p>
+        <t t-if="type=='comment'">Blougiboulga !!</t>
+        <p>Ouagadougou</p>
     </div>
     
 <!--    <t t-extend="ViewManagerAction">
-- 
cgit v1.2.3


From 2a73f8bdd18a56b26b5e9ffbad4104efa1e716f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 6 Feb 2012 16:10:09 +0100
Subject: [IMP] Improved ThradView widget: follow/unfollow mechanism, draft of
 comment post mechanism

bzr revid: tde@openerp.com-20120206151009-qvfutg9n6ytffxei
---
 addons/mail/static/src/xml/mail.xml | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index ad9c886fab3..b8bd0b1fe20 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -1,25 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template>
     
-    <div t-name="MailTest">
-        <button type="button" class="oe_mail_action_follow">
-            Follow
-<!--             <img src="/edi/static/src/img/pdf.png"/> -->
-        </button>
-        <button type="button" class="oe_mail_action_unfollow">
-            Unfollow
-<!--             <img src="/edi/static/src/img/pdf.png"/> -->
-        </button>
-        <p>Bladivoctock !</p>
-        <t t-if="type=='comment'">Blougiboulga !!</t>
-        <p>Ouagadougou</p>
+    <div t-name="ThreadView">
+        <div class="oe_mail_actions">
+            <button type="button" class="oe_mail_action_follow">Follow</button>
+            <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>
+            <button type="button" class="oe_mail_action_comment">Post comment</button>
+        </div>
+        <div>
+            <p>
+            <t t-if="tmp=='comment'">Variable tmp valant comment</t>
+            <t t-if="tmp=='note'">Variable tmp valant note</t>
+            </p>
+        </div>
     </div>
     
-<!--    <t t-extend="ViewManagerAction">
-        <t t-jquery=".oe-shortcut-toggle" t-operation="after">
-            <a class="oe-share_link" href="#share_link" title="Follow">Follow</a>
-            <a class="oe-share" href="#share" title="Unfollow">Unfollow</a>
-        </t>
-    </t>-->
-    
 </template>
\ No newline at end of file
-- 
cgit v1.2.3


From ef0ebc09d8c54f9a0c96d991ea11f6914605b494 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 6 Feb 2012 18:19:11 +0100
Subject: Added comment mechanism. Also improved comments view.

bzr revid: tde@openerp.com-20120206171911-iq1q0988yvrlomu9
---
 addons/mail/static/src/xml/mail.xml | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index b8bd0b1fe20..a5c35073be9 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -12,10 +12,27 @@
         </div>
         <div>
             <p>
-            <t t-if="tmp=='comment'">Variable tmp valant comment</t>
-            <t t-if="tmp=='note'">Variable tmp valant note</t>
+            <t t-if="follow_state == 0">00000000</t>
+            <t t-if="follow_state == 1">11111111</t>
+            <t t-if="follow_state == '0'">00000000</t>
+            <t t-if="follow_state == '1'">11111111</t>
+            <t t-if="this.follow_state == 0">00000000</t>
+            <t t-if="this.follow_state == 1">11111111</t>
+            <t t-if="this.follow_state == '0'">00000000</t>
+            <t t-if="this.follow_state == '1'">11111111</t>
             </p>
         </div>
     </div>
     
+    <div t-name="ThreadMsgView">
+        <div class="ThreadMsgView">
+            <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>
+        </div>
+    </div>
+    
 </template>
\ No newline at end of file
-- 
cgit v1.2.3


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: [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/mail/static/src/xml/mail.xml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'addons/mail/static/src/xml')

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>
-- 
cgit v1.2.3


From 74255533e141ea35b9780a3b63fcaf91e896c2db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 7 Feb 2012 18:07:46 +0100
Subject: [IMP] Moved code for views in correct files; some improvements in
 mail.thread; work on threadview widget

bzr revid: tde@openerp.com-20120207170746-m3ptbzotrafa9wvq
---
 addons/mail/static/src/xml/mail.xml | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 9ca0f5eb890..35eefe53f16 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -10,28 +10,21 @@
             <textarea rows="3" cols="15">Type your comment</textarea><br />
             <button type="button" class="oe_mail_action_comment">Post comment</button>
         </div>
-        <div>
-            <p>
-            <t t-if="follow_state == 0">00000000</t>
-            <t t-if="follow_state == 1">11111111</t>
-            <t t-if="follow_state == '0'">00000000</t>
-            <t t-if="follow_state == '1'">11111111</t>
-            <t t-if="this.follow_state == 0">00000000</t>
-            <t t-if="this.follow_state == 1">11111111</t>
-            <t t-if="this.follow_state == '0'">00000000</t>
-            <t t-if="this.follow_state == '1'">11111111</t>
-            </p>
-        </div>
     </div>
     
     <div t-name="ThreadMsgView">
         <div class="oe_mail_msg">
+<!--             <p style="border: 3px solid #332299;"> -->
+                    zmeofizepofinzepfoiznepfoizpfozeinfpzoeinfpoznf zfe zef zef ze fz efz efz ef zef ze fz efznf zfe zef zef ze fz efz efz ef zef ze fz efznf zfe zef zef ze fz efz efz ef zef ze fz ef
+<!--             </p> -->
             <div class="oe_mail_msg_image">Image</div>
             <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>
+                    zmeofizepofinzepfoiznepfoizpfozeinfpzoeinfpoznf zfe zef zef ze fz efz efz ef zef ze fz efznf zfe zef zef ze fz efz efz ef zef ze fz efznf zfe zef zef ze fz efz efz ef zef ze fz ef
+<!--                     <t t-raw="record.body_text"/> -->
+<!--                     <span class="oe_mail_msg_body"><t t-raw="record.body_text"/></span><br /> -->
+<!--                     <span class="oe_mail_msg_author"><t t-raw="record.user_id[1]"/></span><br /> -->
+<!--                     <span class="oe_mail_msg_date"><t t-raw="record.date"/></span> -->
                 </p>
             </div>
         </div>
-- 
cgit v1.2.3


From cff98a3aeb4b2308d00dc4b91b283ab79e322c45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 8 Feb 2012 16:25:21 +0100
Subject: [IMP] Improved ThreadView widget display; cleaned ThreadView widget
 js code; added basic access rules; added message_mark_done method to clean a
 mail.thread of its need_action_user_id; added auto-push of notifications if
 user requested to perform an action is not following the object; added first
 draft of messaging mechanism in hr_holidays

bzr revid: tde@openerp.com-20120208152521-68i4nekjj8mnuyc8
---
 addons/mail/static/src/xml/mail.xml | 42 +++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 18 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 35eefe53f16..376e8042a06 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -1,33 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template>
     
-    <div t-name="ThreadView">
+    <div t-name="ThreadView" class="oe_mail_main">
+        <div class="separator horizontal">OpenSocial</div>
         <div class="oe_mail_actions">
             <button type="button" class="oe_mail_action_follow">Follow</button>
             <button type="button" class="oe_mail_action_unfollow">Unfollow</button>
         </div>
-        <div class="oe_mail_comment">
+        <div class="oe_mail_post_comment">
             <textarea rows="3" cols="15">Type your comment</textarea><br />
             <button type="button" class="oe_mail_action_comment">Post comment</button>
         </div>
+        <div class="oe_mail_comments">
+        </div>
     </div>
     
-    <div t-name="ThreadMsgView">
-        <div class="oe_mail_msg">
-<!--             <p style="border: 3px solid #332299;"> -->
-                    zmeofizepofinzepfoiznepfoizpfozeinfpzoeinfpoznf zfe zef zef ze fz efz efz ef zef ze fz efznf zfe zef zef ze fz efz efz ef zef ze fz efznf zfe zef zef ze fz efz efz ef zef ze fz ef
-<!--             </p> -->
-            <div class="oe_mail_msg_image">Image</div>
-            <div class="oe_mail_msg_content">
-                <p class="oe_mail_msg_p">
-                    zmeofizepofinzepfoiznepfoizpfozeinfpzoeinfpoznf zfe zef zef ze fz efz efz ef zef ze fz efznf zfe zef zef ze fz efz efz ef zef ze fz efznf zfe zef zef ze fz efz efz ef zef ze fz ef
-<!--                     <t t-raw="record.body_text"/> -->
-<!--                     <span class="oe_mail_msg_body"><t t-raw="record.body_text"/></span><br /> -->
-<!--                     <span class="oe_mail_msg_author"><t t-raw="record.user_id[1]"/></span><br /> -->
-<!--                     <span class="oe_mail_msg_date"><t t-raw="record.date"/></span> -->
-                </p>
-            </div>
+    <t t-name="ThreadMsgView">
+        <div class="oe_mail_msg_image">Image</div>
+        <div class="oe_mail_msg_content">
+            <p class="oe_mail_msg_p">
+                <t t-if="record.type == 'notification'">
+                    <span class="oe_mail_msg_author">OpenERP System Notification</span>
+                </t>
+                <t t-if="record.type == 'comment'">
+                    <span class="oe_mail_msg_author"><t t-raw="record.user_id[1]"/></span>
+                </t>
+                <t t-if="record.type == 'email'">
+                    <span class="oe_mail_msg_author"><t t-raw="record.user_id[1]"/></span>
+                </t>
+                <t t-if="record.need_action_user_id != false">- <span class="oe_mail_msg_need_action">Need action</span></t>
+                <br />
+                <span class="oe_mail_msg_body"><t t-raw="record.body_text"/></span><br />
+                <span class="oe_mail_msg_date"><t t-raw="record.date"/></span>
+           </p>
         </div>
-    </div>
+    </t>
     
 </template>
\ No newline at end of file
-- 
cgit v1.2.3


From 5363de0632070e03d91efccab4a4930ffbdd5bbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 8 Feb 2012 17:42:29 +0100
Subject: [ADD] Added menu entry for the wall; refactored menu name, ids and
 code in files; added js definition for the wall

bzr revid: tde@openerp.com-20120208164229-esmg4pv5qjn8s8o1
---
 addons/mail/static/src/xml/mail.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 376e8042a06..e9895ce4c7b 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -35,5 +35,8 @@
            </p>
         </div>
     </t>
+
+    <div t-name="WallView" class="oe_mail_wall">
+    </div>
     
 </template>
\ No newline at end of file
-- 
cgit v1.2.3


From 5561797ce8cb17643607ab8b57e233b22acf7101 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 8 Feb 2012 18:08:08 +0100
Subject: [IMP] Basic Wall system displaying all pushes messages.

bzr revid: tde@openerp.com-20120208170808-8bac1bnj53z4650u
---
 addons/mail/static/src/xml/mail.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index e9895ce4c7b..58e242829b6 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -37,6 +37,12 @@
     </t>
 
     <div t-name="WallView" class="oe_mail_wall">
+        <div class="oe_mail_post_comment">
+            <textarea rows="3" cols="15">Type your comment</textarea><br />
+            <button type="button" class="oe_mail_action_comment">Post comment</button>
+        </div>
+        <div class="oe_mail_comments">
+        </div>
     </div>
     
 </template>
\ No newline at end of file
-- 
cgit v1.2.3


From 5042ba24658d48ffbd500484b6e01c0712f0ada5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 10 Feb 2012 11:52:23 +0100
Subject: [IMP] Cleaned xml, css and js for ThreadView.

bzr revid: tde@openerp.com-20120210105223-fv24nic79ycldc2i
---
 addons/mail/static/src/xml/mail.xml | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 58e242829b6..72fbf8d0f88 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -3,17 +3,28 @@
     
     <div t-name="ThreadView" class="oe_mail_main">
         <div class="separator horizontal">OpenSocial</div>
-        <div class="oe_mail_actions">
-            <button type="button" class="oe_mail_action_follow">Follow</button>
-            <button type="button" class="oe_mail_action_unfollow">Unfollow</button>
+        <div class="oe_mail_main_left">
+            <div class="oe_mail_actions">
+                <button type="button" class="oe_mail_button_follow">Follow</button>
+                <button type="button" class="oe_mail_button_unfollow">Unfollow</button>
+            </div>
+            <div class="oe_mail_post_comment">
+                <textarea class="oe_mail_action_textarea" onfocus="this.value='';">Enter your comment here...</textarea><br />
+                <button type="button" class="oe_mail_button_comment">Post comment</button>
+            </div>
+            <div class="oe_mail_msg">
+                <div class="oe_mail_comment">
+                </div>
+            </div>
         </div>
-        <div class="oe_mail_post_comment">
-            <textarea rows="3" cols="15">Type your comment</textarea><br />
-            <button type="button" class="oe_mail_action_comment">Post comment</button>
-        </div>
-        <div class="oe_mail_comments">
+        <div class="oe_mail_main_right">
+            <button type="button" class="oe_mail_button_getfollowers">See followers</button>
+            <button type="button" class="oe_mail_button_hidefollowers">Hide followers</button>
+            <br />
+             <div class="oe_mail_followers_vignette" title="Raoul Grobedon"><img src="people.png"/></div>
         </div>
     </div>
+
     
     <t t-name="ThreadMsgView">
         <div class="oe_mail_msg_image">Image</div>
@@ -23,15 +34,15 @@
                     <span class="oe_mail_msg_author">OpenERP System Notification</span>
                 </t>
                 <t t-if="record.type == 'comment'">
-                    <span class="oe_mail_msg_author"><t t-raw="record.user_id[1]"/></span>
+                    <span class="oe_mail_msg_author"><a href="#"><t t-raw="record.user_id[1]"/></a></span>
                 </t>
                 <t t-if="record.type == 'email'">
                     <span class="oe_mail_msg_author"><t t-raw="record.user_id[1]"/></span>
                 </t>
-                <t t-if="record.need_action_user_id != false">- <span class="oe_mail_msg_need_action">Need action</span></t>
+                <t t-if="record.need_action_user_id != false">- <span class="oe_mail_msg_need_action">Need action by <a href="#"><t t-raw="record.need_action_user_id[1]"/></a></span></t>
                 <br />
                 <span class="oe_mail_msg_body"><t t-raw="record.body_text"/></span><br />
-                <span class="oe_mail_msg_date"><t t-raw="record.date"/></span>
+                <span class="oe_mail_msg_date"><a href="#"><t t-raw="record.date"/></a></span>
            </p>
         </div>
     </t>
-- 
cgit v1.2.3


From a123480d2c123f011265eff253d787cca27fb57f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 10 Feb 2012 13:43:48 +0100
Subject: [IMP] Added a 'get followers' button on ThreadWidget. Basic
 displaying of results added.

bzr revid: tde@openerp.com-20120210124348-8s73xmswnfypqhx6
---
 addons/mail/static/src/xml/mail.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 72fbf8d0f88..ff8386f32b9 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -18,13 +18,13 @@
             </div>
         </div>
         <div class="oe_mail_main_right">
-            <button type="button" class="oe_mail_button_getfollowers">See followers</button>
-            <button type="button" class="oe_mail_button_hidefollowers">Hide followers</button>
-            <br />
-             <div class="oe_mail_followers_vignette" title="Raoul Grobedon"><img src="people.png"/></div>
+            <div class="oe_mail_followers_actions">
+                <button type="button" class="oe_mail_button_followers">See followers</button>
+            </div>
+            <div class="oe_mail_followers">
+            </div>
         </div>
     </div>
-
     
     <t t-name="ThreadMsgView">
         <div class="oe_mail_msg_image">Image</div>
-- 
cgit v1.2.3


From 67bb1396605c4e145cfd8b0c397a4232e5626de4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 16 Feb 2012 17:03:02 +0100
Subject: [REF] mail.thread: fixed an error in is_subscriber, cleaned code;
 mail.js: threadview widget: cleaned code

bzr revid: tde@openerp.com-20120216160302-g5knaca3vie1ekot
---
 addons/mail/static/src/xml/mail.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index ff8386f32b9..50e73f10326 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -56,4 +56,4 @@
         </div>
     </div>
     
-</template>
\ No newline at end of file
+</template>
-- 
cgit v1.2.3


From 7429f3bfb6797b1bdd97e05afdd5992a3bd320ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 21 Feb 2012 16:39:42 +0100
Subject: [IMP] Slighty improved wall widget.

bzr revid: tde@openerp.com-20120221153942-mue1h18f2fjluf27
---
 addons/mail/static/src/xml/mail.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 50e73f10326..ff69ef4c29f 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -47,12 +47,14 @@
         </div>
     </t>
 
-    <div t-name="WallView" class="oe_mail_wall">
+    <div t-name="WallView" class="oe_mail_wall_main">
         <div class="oe_mail_post_comment">
-            <textarea rows="3" cols="15">Type your comment</textarea><br />
-            <button type="button" class="oe_mail_action_comment">Post comment</button>
+            <textarea class="oe_mail_action_textarea" onfocus="this.value='';">Enter your comment here...</textarea><br />
+            <button type="button" class="oe_mail_button_comment">Post comment</button>
         </div>
-        <div class="oe_mail_comments">
+        <div class="oe_mail_msg">
+            <div class="oe_mail_comment">
+            </div>
         </div>
     </div>
     
-- 
cgit v1.2.3


From 1bc3f0cec4353e558ef47cf29bcc7b974d4194b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 22 Feb 2012 15:04:03 +0100
Subject: [IMP] Wall: pushed message are now displayed in conversation, with a
 1-level hierarchy based on source record. Wall and Thread: added support for
 user image.

bzr revid: tde@openerp.com-20120222140403-fbjisr0u96jml5zv
---
 addons/mail/static/src/xml/mail.xml | 45 ++++++++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 13 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index ff69ef4c29f..755357b7da3 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -25,9 +25,39 @@
             </div>
         </div>
     </div>
-    
+
+    <div t-name="WallView" class="oe_mail_wall_main">
+        <div class="oe_mail_main_left">
+            <div class="oe_mail_post_comment">
+                <textarea class="oe_mail_action_textarea" onfocus="this.value='';">Enter your comment here...</textarea><br />
+                <button type="button" class="oe_mail_button_comment">Post comment</button>
+            </div>
+            <div class="oe_mail_msg">
+                <div class="oe_mail_comment">
+                </div>
+            </div>
+        </div>
+        <div class="oe_mail_main_right">
+            <div class="oe_mail_followers_actions">
+                <button type="button" class="oe_mail_button_followers">See followers</button>
+            </div>
+            <div class="oe_mail_followers">
+            </div>
+        </div>
+    </div>
+
+    <t t-name="WallThreadView">
+        <div class="oe_mail_thread_header">
+            Discussion about document <t t-raw="record_model"/> (id: <t t-raw="record_id"/>)
+        </div>
+        <div class="oe_mail_thread_content">
+        </div>
+    </t>
+
     <t t-name="ThreadMsgView">
-        <div class="oe_mail_msg_image">Image</div>
+        <div class="oe_mail_msg_image">
+            <img t-att-src="record.mini_url"/>
+        </div>
         <div class="oe_mail_msg_content">
             <p class="oe_mail_msg_p">
                 <t t-if="record.type == 'notification'">
@@ -46,16 +76,5 @@
            </p>
         </div>
     </t>
-
-    <div t-name="WallView" class="oe_mail_wall_main">
-        <div class="oe_mail_post_comment">
-            <textarea class="oe_mail_action_textarea" onfocus="this.value='';">Enter your comment here...</textarea><br />
-            <button type="button" class="oe_mail_button_comment">Post comment</button>
-        </div>
-        <div class="oe_mail_msg">
-            <div class="oe_mail_comment">
-            </div>
-        </div>
-    </div>
     
 </template>
-- 
cgit v1.2.3


From 6671d25523af5fdb9b9da08bacce7033772a1af4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 22 Feb 2012 15:48:35 +0100
Subject: [IMP] ThreadView: moved follow/unfollow action on the right; see
 followers now has its value toggling when choosing to display or hide
 followers; comment textare now displays as a comment, i.e. it has user avatar
 on the left and is aligned with comments

bzr revid: tde@openerp.com-20120222144835-w8jfscffigaggr6p
---
 addons/mail/static/src/xml/mail.xml | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 755357b7da3..79e421cc559 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -4,13 +4,15 @@
     <div t-name="ThreadView" class="oe_mail_main">
         <div class="separator horizontal">OpenSocial</div>
         <div class="oe_mail_main_left">
-            <div class="oe_mail_actions">
-                <button type="button" class="oe_mail_button_follow">Follow</button>
-                <button type="button" class="oe_mail_button_unfollow">Unfollow</button>
-            </div>
-            <div class="oe_mail_post_comment">
-                <textarea class="oe_mail_action_textarea" onfocus="this.value='';">Enter your comment here...</textarea><br />
-                <button type="button" class="oe_mail_button_comment">Post comment</button>
+            <div class="oe_mail_comment">
+                <div class="oe_mail_msg_image">
+                </div>
+                <div class="oe_mail_msg_content">
+                    <div class="oe_mail_post_comment">
+                        <textarea class="oe_mail_action_textarea" onfocus="this.value='';">Enter your comment here...</textarea><br />
+                        <button type="button" class="oe_mail_button_comment">Post comment</button>
+                    </div>
+                </div>
             </div>
             <div class="oe_mail_msg">
                 <div class="oe_mail_comment">
@@ -18,8 +20,12 @@
             </div>
         </div>
         <div class="oe_mail_main_right">
+            <div class="oe_mail_actions">
+                <button type="button" class="oe_mail_button_follow">Follow</button>
+                <button type="button" class="oe_mail_button_unfollow">Unfollow</button>
+            </div>
             <div class="oe_mail_followers_actions">
-                <button type="button" class="oe_mail_button_followers">See followers</button>
+                <button type="button" class="oe_mail_button_followers">Hide followers</button>
             </div>
             <div class="oe_mail_followers">
             </div>
-- 
cgit v1.2.3


From d77a5ad0bf6d3bd361a4bc819927a9ca2ec2a8db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 23 Feb 2012 17:32:36 +0100
Subject: [REF] Major refactoring of mail widgets (Thread and Wall). Thread
 display is now a self-contained widget; Thread view shows a thread, the wall
 shows several threads. Added the possibility to comment each thread in the
 wall.

bzr revid: tde@openerp.com-20120223163236-ufn3s8qw3fewwkw1
---
 addons/mail/static/src/xml/mail.xml | 101 ++++++++++++++++++++----------------
 1 file changed, 57 insertions(+), 44 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 79e421cc559..a6303aa8a58 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -1,66 +1,69 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template>
-    
-    <div t-name="ThreadView" class="oe_mail_main">
-        <div class="separator horizontal">OpenSocial</div>
-        <div class="oe_mail_main_left">
-            <div class="oe_mail_comment">
-                <div class="oe_mail_msg_image">
-                </div>
-                <div class="oe_mail_msg_content">
-                    <div class="oe_mail_post_comment">
-                        <textarea class="oe_mail_action_textarea" onfocus="this.value='';">Enter your comment here...</textarea><br />
-                        <button type="button" class="oe_mail_button_comment">Post comment</button>
-                    </div>
+
+    <div t-name="Wall" class="oe_mail_wall">
+        <div class="oe_mail_wall_left">
+            <div class="oe_mail_wall_act">
+                <div class="oe_mail_wall_tweet">
+                    <textarea class="oe_mail_action_textarea" onfocus="this.value='';">Enter your comment here...</textarea><br />
+                    <button class="oe_mail_button_comment" type="button">Post comment</button>
                 </div>
             </div>
-            <div class="oe_mail_msg">
-                <div class="oe_mail_comment">
+            <div class="oe_mail_wall_threads">
+            </div>
+        </div>
+        <div class="oe_mail_wall_right">
+            <div class="oe_mail_followers">
+                <div class="oe_mail_followers_actions">
+                    <button class="oe_mail_button_followers" type="button">Display followers</button>
+                </div>
+                <div class="oe_mail_followers_display">
                 </div>
             </div>
         </div>
-        <div class="oe_mail_main_right">
+    </div>
+
+    <t t-name="WallThreadContainer">
+        <div class="oe_mail_wall_thread_header">
+            Discussion about document <t t-raw="record_model"/> (id: <t t-raw="record_id"/>)
+        </div>
+        <div class="oe_mail_wall_thread_content">
+        </div>
+    </t>
+
+    <div t-name="Thread" class="oe_mail_thread_main">
+        <div class="separator horizontal">OpenSocial</div>
+        <div class="oe_mail_thread_left">
+        </div>
+        <div class="oe_mail_thread_right">
             <div class="oe_mail_actions">
                 <button type="button" class="oe_mail_button_follow">Follow</button>
                 <button type="button" class="oe_mail_button_unfollow">Unfollow</button>
             </div>
-            <div class="oe_mail_followers_actions">
-                <button type="button" class="oe_mail_button_followers">Hide followers</button>
-            </div>
             <div class="oe_mail_followers">
+                <div class="oe_mail_followers_actions">
+                    <button type="button" class="oe_mail_button_followers">Display followers</button>
+                </div>
+                <div class="oe_mail_followers_display">
+                </div>
             </div>
         </div>
     </div>
 
-    <div t-name="WallView" class="oe_mail_wall_main">
-        <div class="oe_mail_main_left">
-            <div class="oe_mail_post_comment">
-                <textarea class="oe_mail_action_textarea" onfocus="this.value='';">Enter your comment here...</textarea><br />
-                <button type="button" class="oe_mail_button_comment">Post comment</button>
+    <div t-name="ThreadDisplay" class="oe_mail_thread">
+        <div class="oe_mail_thread_act">
+            <div class="oe_mail_msg_image">
             </div>
-            <div class="oe_mail_msg">
-                <div class="oe_mail_comment">
-                </div>
+            <div class="oe_mail_msg_content">
+                    <textarea class="oe_mail_action_textarea" onfocus="this.value='';">Enter your comment here...</textarea><br />
+                    <button type="button" class="oe_mail_button_comment">Post comment</button>
             </div>
         </div>
-        <div class="oe_mail_main_right">
-            <div class="oe_mail_followers_actions">
-                <button type="button" class="oe_mail_button_followers">See followers</button>
-            </div>
-            <div class="oe_mail_followers">
-            </div>
+        <div class="oe_mail_thread_display">
         </div>
     </div>
 
-    <t t-name="WallThreadView">
-        <div class="oe_mail_thread_header">
-            Discussion about document <t t-raw="record_model"/> (id: <t t-raw="record_id"/>)
-        </div>
-        <div class="oe_mail_thread_content">
-        </div>
-    </t>
-
-    <t t-name="ThreadMsgView">
+    <t t-name="ThreadMsg">
         <div class="oe_mail_msg_image">
             <img t-att-src="record.mini_url"/>
         </div>
@@ -75,12 +78,22 @@
                 <t t-if="record.type == 'email'">
                     <span class="oe_mail_msg_author"><t t-raw="record.user_id[1]"/></span>
                 </t>
-                <t t-if="record.need_action_user_id != false">- <span class="oe_mail_msg_need_action">Need action by <a href="#"><t t-raw="record.need_action_user_id[1]"/></a></span></t>
+                <t t-if="record.need_action_user_id != false">
+                    - <span class="oe_mail_msg_need_action">Need action by <a href="#"><t t-raw="record.need_action_user_id[1]"/></a></span>
+                </t>
                 <br />
                 <span class="oe_mail_msg_body"><t t-raw="record.body_text"/></span><br />
-                <span class="oe_mail_msg_date"><a href="#"><t t-raw="record.date"/></a></span>
+                <span class="oe_mail_msg_date"><t t-raw="record.date"/></span>
            </p>
         </div>
     </t>
-    
+
+    <t t-name="WallHeader">
+        <div class="tmp_oe_mail_thread_header">
+            Discussion about document <t t-raw="record_model"/> (id: <t t-raw="record_id"/>)
+        </div>
+        <div class="tmp_oe_mail_thread_content">
+        </div>
+    </t>
+
 </template>
-- 
cgit v1.2.3


From ddd84848ffb301102fe548b99a81e8c699a894a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 24 Feb 2012 16:19:43 +0100
Subject: [IMP] xml views: added a div for the search widget for the wall. Also
 modified message display: body_text is now escaped to avoid to display html.

bzr revid: tde@openerp.com-20120224151943-3kf572t86dj0ijst
---
 addons/mail/static/src/xml/mail.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index a6303aa8a58..393ab9d49b3 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -2,6 +2,8 @@
 <template>
 
     <div t-name="Wall" class="oe_mail_wall">
+        <div class="oe_mail_wall_search">
+        </div>
         <div class="oe_mail_wall_left">
             <div class="oe_mail_wall_act">
                 <div class="oe_mail_wall_tweet">
@@ -82,7 +84,7 @@
                     - <span class="oe_mail_msg_need_action">Need action by <a href="#"><t t-raw="record.need_action_user_id[1]"/></a></span>
                 </t>
                 <br />
-                <span class="oe_mail_msg_body"><t t-raw="record.body_text"/></span><br />
+                <span class="oe_mail_msg_body"><t t-esc="record.body_text"/></span><br />
                 <span class="oe_mail_msg_date"><t t-raw="record.date"/></span>
            </p>
         </div>
-- 
cgit v1.2.3


From d3dd68e08e6ed3cd9259639cbd49ec67534a9b55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 27 Feb 2012 12:07:54 +0100
Subject: [IMP] ThreadDisplay: now shows a "More button" (no action attached
 currently). Updated css for style. Emails are managed. Also refactored
 templates for cleaner architecture.

bzr revid: tde@openerp.com-20120227110754-9v207ey8m3k5rv9j
---
 addons/mail/static/src/xml/mail.xml | 80 ++++++++++++++++++++++++-------------
 1 file changed, 53 insertions(+), 27 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 393ab9d49b3..9f0448a9469 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -25,6 +25,22 @@
         </div>
     </div>
 
+    <t t-name="WallHeader">
+        <div class="tmp_oe_mail_thread_header">
+            Discussion about document <t t-raw="record_model"/> (id: <t t-raw="record_id"/>)
+        </div>
+        <div class="tmp_oe_mail_thread_content">
+        </div>
+    </t>
+    
+    <t t-name="MoreButton">
+        <div class="oe_mail_thread_msg_more">
+            <button class="oe_mail_button_more" type="button">More
+                <t t-if="msg_left"> (<t t-raw="msg_left"/> left)</t>
+            </button>
+        </div>
+    </t>
+
     <t t-name="WallThreadContainer">
         <div class="oe_mail_wall_thread_header">
             Discussion about document <t t-raw="record_model"/> (id: <t t-raw="record_id"/>)
@@ -57,45 +73,55 @@
             <div class="oe_mail_msg_image">
             </div>
             <div class="oe_mail_msg_content">
-                    <textarea class="oe_mail_action_textarea" onfocus="this.value='';">Enter your comment here...</textarea><br />
-                    <button type="button" class="oe_mail_button_comment">Post comment</button>
+                <textarea class="oe_mail_action_textarea" onfocus="this.value='';">Enter your comment here...</textarea><br />
+                <button type="button" class="oe_mail_button_comment">Post comment</button>
             </div>
         </div>
         <div class="oe_mail_thread_display">
         </div>
     </div>
 
-    <t t-name="ThreadMsg">
+    <div t-name="ThreadMsg" t-attf-class="{record.type} oe_mail_thread_msg">
         <div class="oe_mail_msg_image">
             <img t-att-src="record.mini_url"/>
         </div>
         <div class="oe_mail_msg_content">
-            <p class="oe_mail_msg_p">
-                <t t-if="record.type == 'notification'">
-                    <span class="oe_mail_msg_author">OpenERP System Notification</span>
-                </t>
-                <t t-if="record.type == 'comment'">
-                    <span class="oe_mail_msg_author"><a href="#"><t t-raw="record.user_id[1]"/></a></span>
-                </t>
-                <t t-if="record.type == 'email'">
-                    <span class="oe_mail_msg_author"><t t-raw="record.user_id[1]"/></span>
-                </t>
-                <t t-if="record.need_action_user_id != false">
-                    - <span class="oe_mail_msg_need_action">Need action by <a href="#"><t t-raw="record.need_action_user_id[1]"/></a></span>
-                </t>
-                <br />
-                <span class="oe_mail_msg_body"><t t-esc="record.body_text"/></span><br />
-                <span class="oe_mail_msg_date"><t t-raw="record.date"/></span>
-           </p>
+            <t t-if="record.type == 'email'">
+                <t t-call="EmailDisplay" />
+            </t>
+            <t t-if="record.type == 'notification' || record.type == 'comment'">
+                <t t-call="NotificationDisplay" />
+            </t>
         </div>
+    </div>
+    
+    <t t-name="NotificationDisplay">
+        <p class="oe_mail_msg_p">
+            <t t-if="record.type == 'notification'">
+                <span class="oe_mail_msg_author">OpenERP System Notification</span>
+            </t>
+            <t t-if="record.type == 'comment'">
+                <span class="oe_mail_msg_author">
+                    <a href="#" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
+                </span>
+            </t>
+            <t t-if="record.need_action_user_id != false">
+                - <span class="oe_mail_msg_need_action">Need action by <a href="#"><t t-raw="record.need_action_user_id[1]"/></a></span>
+            </t>
+            wrote on <span class="oe_mail_msg_date"><t t-raw="record.date"/></span>
+            <br />
+            <span class="oe_mail_msg_body"><t t-esc="record.body_text"/></span>
+        </p>
     </t>
-
-    <t t-name="WallHeader">
-        <div class="tmp_oe_mail_thread_header">
-            Discussion about document <t t-raw="record_model"/> (id: <t t-raw="record_id"/>)
-        </div>
-        <div class="tmp_oe_mail_thread_content">
-        </div>
+    
+    <t t-name="EmailDisplay">
+        <p class="oe_mail_msg_p oe_mail_msg_p_email_header">
+            From: <t t-esc="email_from"/> on <span class="oe_mail_msg_date"><t t-raw="record.date"/></span><br />
+            To: <t t-sec="mail_to"/><br />
+        </p>
+        <p class="oe_mail_msg_p">
+            <span class="oe_mail_msg_body"><t t-esc="record.body_text"/></span>
+        </p>
     </t>
 
 </template>
-- 
cgit v1.2.3


From 32669277bce52ddbf5e452f84616cbe48bf1ea80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 27 Feb 2012 17:04:42 +0100
Subject: [IMP] ThreadDisplay: 1/ body_text is escaped by hand and displayed as
  html, to preserver internal links 2/ basic version of fonctionality 'show
 more / show less' when messages are too long 3/ some code cleaning

bzr revid: tde@openerp.com-20120227160442-43g2b2e1wcrjhufq
---
 addons/mail/static/src/xml/mail.xml | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 9f0448a9469..386197a0fce 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -32,14 +32,6 @@
         <div class="tmp_oe_mail_thread_content">
         </div>
     </t>
-    
-    <t t-name="MoreButton">
-        <div class="oe_mail_thread_msg_more">
-            <button class="oe_mail_button_more" type="button">More
-                <t t-if="msg_left"> (<t t-raw="msg_left"/> left)</t>
-            </button>
-        </div>
-    </t>
 
     <t t-name="WallThreadContainer">
         <div class="oe_mail_wall_thread_header">
@@ -79,6 +71,11 @@
         </div>
         <div class="oe_mail_thread_display">
         </div>
+        <div class="oe_mail_thread_more">
+            <div class="oe_mail_thread_msg">
+                <t t-call="MoreButton"/>
+            </div>
+        </div>
     </div>
 
     <div t-name="ThreadMsg" t-attf-class="{record.type} oe_mail_thread_msg">
@@ -110,7 +107,7 @@
             </t>
             wrote on <span class="oe_mail_msg_date"><t t-raw="record.date"/></span>
             <br />
-            <span class="oe_mail_msg_body"><t t-esc="record.body_text"/></span>
+            <span class="oe_mail_msg_body"><t t-raw="record.body_text"/></span>
         </p>
     </t>
     
@@ -120,8 +117,16 @@
             To: <t t-sec="mail_to"/><br />
         </p>
         <p class="oe_mail_msg_p">
-            <span class="oe_mail_msg_body"><t t-esc="record.body_text"/></span>
+            <span class="oe_mail_msg_body"><t t-raw="record.body_text"/></span>
         </p>
     </t>
+    
+    <t t-name="MoreButton">
+        <div class="oe_mail_thread_msg_more">
+            <button class="oe_mail_button_more" type="button">More
+                <t t-if="msg_left"> (<t t-raw="msg_left"/> left)</t>
+            </button>
+        </div>
+    </t>
 
 </template>
-- 
cgit v1.2.3


From 504e476fc05800249b3cd2cccf31b89b9a32410e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 28 Feb 2012 12:07:40 +0100
Subject: [IMP] Wall widget: removed unused xml; added more button; added more
 action (displays more discussions); added comments

bzr revid: tde@openerp.com-20120228110740-gcbm02ej6bee4rsl
---
 addons/mail/static/src/xml/mail.xml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 386197a0fce..b2cc1e8e0c7 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -13,6 +13,11 @@
             </div>
             <div class="oe_mail_wall_threads">
             </div>
+            <div class="oe_mail_wall_more">
+                <button class="oe_mail_wall_button_more" type="button">See more discussions
+                    <t t-if="msg_left"> (<t t-raw="msg_left"/> left)</t>
+                </button>
+            </div>
         </div>
         <div class="oe_mail_wall_right">
             <div class="oe_mail_followers">
@@ -25,14 +30,6 @@
         </div>
     </div>
 
-    <t t-name="WallHeader">
-        <div class="tmp_oe_mail_thread_header">
-            Discussion about document <t t-raw="record_model"/> (id: <t t-raw="record_id"/>)
-        </div>
-        <div class="tmp_oe_mail_thread_content">
-        </div>
-    </t>
-
     <t t-name="WallThreadContainer">
         <div class="oe_mail_wall_thread_header">
             Discussion about document <t t-raw="record_model"/> (id: <t t-raw="record_id"/>)
-- 
cgit v1.2.3


From a39bdef62a811ba9fdbab1809ddf15396caa02bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 28 Feb 2012 18:14:37 +0100
Subject: [IMP] quickly updated js and xml for new behavior of
 need_action_user_id. Still un progress, but was for testing.

bzr revid: tde@openerp.com-20120228171437-0a2lmj2d1kf9rfqu
---
 addons/mail/static/src/xml/mail.xml | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index b2cc1e8e0c7..5d36df9fd57 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -99,9 +99,6 @@
                     <a href="#" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
                 </span>
             </t>
-            <t t-if="record.need_action_user_id != false">
-                - <span class="oe_mail_msg_need_action">Need action by <a href="#"><t t-raw="record.need_action_user_id[1]"/></a></span>
-            </t>
             wrote on <span class="oe_mail_msg_date"><t t-raw="record.date"/></span>
             <br />
             <span class="oe_mail_msg_body"><t t-raw="record.body_text"/></span>
-- 
cgit v1.2.3


From 0ba944dc469c9845880ab97216cfb6a054ec6b0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 29 Feb 2012 09:59:53 +0100
Subject: [IMP] Thread widget: More button does not display when there are no
 more comments to fetch.

bzr revid: tde@openerp.com-20120229085953-v2w99pgzd8sefffn
---
 addons/mail/static/src/xml/mail.xml | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index b2cc1e8e0c7..ef795c9f3e3 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -15,7 +15,6 @@
             </div>
             <div class="oe_mail_wall_more">
                 <button class="oe_mail_wall_button_more" type="button">See more discussions
-                    <t t-if="msg_left"> (<t t-raw="msg_left"/> left)</t>
                 </button>
             </div>
         </div>
@@ -69,9 +68,10 @@
         <div class="oe_mail_thread_display">
         </div>
         <div class="oe_mail_thread_more">
-            <div class="oe_mail_thread_msg">
-                <t t-call="MoreButton"/>
-            </div>
+            <button class="oe_mail_button_more" type="button">More</button>
+        </div>
+        <div class="oe_mail_thread_nomore">
+            You have loaded all messages in this thread.
         </div>
     </div>
 
@@ -117,13 +117,5 @@
             <span class="oe_mail_msg_body"><t t-raw="record.body_text"/></span>
         </p>
     </t>
-    
-    <t t-name="MoreButton">
-        <div class="oe_mail_thread_msg_more">
-            <button class="oe_mail_button_more" type="button">More
-                <t t-if="msg_left"> (<t t-raw="msg_left"/> left)</t>
-            </button>
-        </div>
-    </t>
 
 </template>
-- 
cgit v1.2.3


From 44ca05c1293aec5e91d8d97569ddaaf46d887920 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 29 Feb 2012 11:16:17 +0100
Subject: [CL] Wall: Cleaned a bit mail.xml: removed unused 'dusplay followers'
 on wall

bzr revid: tde@openerp.com-20120229101617-ubru2sqmjznomrwf
---
 addons/mail/static/src/xml/mail.xml | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index ef795c9f3e3..66a8e5b0835 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -19,13 +19,6 @@
             </div>
         </div>
         <div class="oe_mail_wall_right">
-            <div class="oe_mail_followers">
-                <div class="oe_mail_followers_actions">
-                    <button class="oe_mail_button_followers" type="button">Display followers</button>
-                </div>
-                <div class="oe_mail_followers_display">
-                </div>
-            </div>
         </div>
     </div>
 
-- 
cgit v1.2.3


From 4847f720442c3fa6faefa60398d245c5814eb2c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 29 Feb 2012 15:23:31 +0100
Subject: [REF] Wall small cleaning of code

bzr revid: tde@openerp.com-20120229142331-zr42yxqy8i0xv7js
---
 addons/mail/static/src/xml/mail.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 66a8e5b0835..1e4e301bc2e 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -17,6 +17,9 @@
                 <button class="oe_mail_wall_button_more" type="button">See more discussions
                 </button>
             </div>
+            <div class="oe_mail_wall_nomore">
+                You have loaded all discussions.
+            </div>
         </div>
         <div class="oe_mail_wall_right">
         </div>
-- 
cgit v1.2.3


From 5b2b9fb1abe76a0f1b0bb2c0231bca26e5ee218a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 2 Mar 2012 18:07:49 +0100
Subject: [ADD] Added a thread model in display. Seems working but needs
 refactoring in the next few days.

bzr revid: tde@openerp.com-20120302170749-gaxx90sxy7bi97b3
---
 addons/mail/static/src/xml/mail.xml | 51 ++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 32 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 1e4e301bc2e..3020e9b5580 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -14,11 +14,8 @@
             <div class="oe_mail_wall_threads">
             </div>
             <div class="oe_mail_wall_more">
-                <button class="oe_mail_wall_button_more" type="button">See more discussions
-                </button>
-            </div>
-            <div class="oe_mail_wall_nomore">
-                You have loaded all discussions.
+                <button class="oe_mail_wall_button_more" type="button">See more discussions</button>
+                <p class="oe_mail_wall_nomore">You have loaded all discussions.</p>
             </div>
         </div>
         <div class="oe_mail_wall_right">
@@ -33,11 +30,11 @@
         </div>
     </t>
 
-    <div t-name="Thread" class="oe_mail_thread_main">
+    <div t-name="RecordThread" class="oe_mail_recthread">
         <div class="separator horizontal">OpenSocial</div>
-        <div class="oe_mail_thread_left">
+        <div class="oe_mail_recthread_left">
         </div>
-        <div class="oe_mail_thread_right">
+        <div class="oe_mail_recthread_right">
             <div class="oe_mail_actions">
                 <button type="button" class="oe_mail_button_follow">Follow</button>
                 <button type="button" class="oe_mail_button_unfollow">Unfollow</button>
@@ -52,22 +49,18 @@
         </div>
     </div>
 
-    <div t-name="ThreadDisplay" class="oe_mail_thread">
+    <div t-name="Thread" class="oe_mail_thread">
         <div class="oe_mail_thread_act">
-            <div class="oe_mail_msg_image">
-            </div>
+            <div class="oe_mail_msg_image">User_image</div>
             <div class="oe_mail_msg_content">
                 <textarea class="oe_mail_action_textarea" onfocus="this.value='';">Enter your comment here...</textarea><br />
                 <button type="button" class="oe_mail_button_comment">Post comment</button>
             </div>
         </div>
-        <div class="oe_mail_thread_display">
-        </div>
+        <div class="oe_mail_thread_display"></div>
         <div class="oe_mail_thread_more">
-            <button class="oe_mail_button_more" type="button">More</button>
-        </div>
-        <div class="oe_mail_thread_nomore">
-            You have loaded all messages in this thread.
+            <button class="oe_mail_button_more" type="button">Load more messages</button>
+            <p class="oe_mail_p_nomore">You have loaded all messages in this thread.</p>
         </div>
     </div>
 
@@ -76,31 +69,25 @@
             <img t-att-src="record.mini_url"/>
         </div>
         <div class="oe_mail_msg_content">
-            <t t-if="record.type == 'email'">
-                <t t-call="EmailDisplay" />
-            </t>
-            <t t-if="record.type == 'notification' || record.type == 'comment'">
-                <t t-call="NotificationDisplay" />
-            </t>
+            <t t-if="record.type == 'email'"><t t-call="EmailDisplay" /></t>
+            <t t-if="record.type == 'notification' || record.type == 'comment'"><t t-call="NoteDisplay" /></t>
         </div>
+        <t t-if="record.type == 'tmp'"><t t-call="ThreadDisplay" /></t>
     </div>
     
-    <t t-name="NotificationDisplay">
+    <t t-name="NoteDisplay">
         <p class="oe_mail_msg_p">
-            <t t-if="record.type == 'notification'">
-                <span class="oe_mail_msg_author">OpenERP System Notification</span>
-            </t>
-            <t t-if="record.type == 'comment'">
-                <span class="oe_mail_msg_author">
-                    <a href="#" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
-                </span>
-            </t>
+            <span class="oe_mail_msg_author">
+                <a href="#" class="intlink" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
+                <t t-if="record.type == 'notification'">via OpenERP System Notification</t>
+            </span>
             <t t-if="record.need_action_user_id != false">
                 - <span class="oe_mail_msg_need_action">Need action by <a href="#"><t t-raw="record.need_action_user_id[1]"/></a></span>
             </t>
             wrote on <span class="oe_mail_msg_date"><t t-raw="record.date"/></span>
             <br />
             <span class="oe_mail_msg_body"><t t-raw="record.body_text"/></span>
+            <t t-if="record.tr_body_text"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body_text"/></span></t>
         </p>
     </t>
     
-- 
cgit v1.2.3


From bb352a172f3460770d412432df3e27e12f1d588f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 5 Mar 2012 20:20:52 +0100
Subject: [FIX] Wall widget: fixed the Wall 'load more' feature. Also cleaned
 the code.

bzr revid: tde@openerp.com-20120305192052-wabvan89nt0hrj8o
---
 addons/mail/static/src/xml/mail.xml | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 3020e9b5580..aeb7618e05e 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -23,9 +23,6 @@
     </div>
 
     <t t-name="WallThreadContainer">
-        <div class="oe_mail_wall_thread_header">
-            Discussion about document <t t-raw="record_model"/> (id: <t t-raw="record_id"/>)
-        </div>
         <div class="oe_mail_wall_thread_content">
         </div>
     </t>
-- 
cgit v1.2.3


From 61a41ba305c938084407bd2d478c5b4a3ad1b8ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 6 Mar 2012 09:34:19 +0100
Subject: [FIX] Wall widget: fixed class names for comment textarea and button.

bzr revid: tde@openerp.com-20120306083419-iuy7x0casszq8ldi
---
 addons/mail/static/src/xml/mail.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index aeb7618e05e..a51921dfc46 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -7,8 +7,8 @@
         <div class="oe_mail_wall_left">
             <div class="oe_mail_wall_act">
                 <div class="oe_mail_wall_tweet">
-                    <textarea class="oe_mail_action_textarea" onfocus="this.value='';">Enter your comment here...</textarea><br />
-                    <button class="oe_mail_button_comment" type="button">Post comment</button>
+                    <textarea class="oe_mail_wall_action_textarea" onfocus="this.value='';">Enter your comment here...</textarea><br />
+                    <button class="oe_mail_wall_button_comment" type="button">Post comment</button>
                 </div>
             </div>
             <div class="oe_mail_wall_threads">
-- 
cgit v1.2.3


From 6ce4a48ce9aade35c6574da9383f52414fb4ea6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 8 Mar 2012 11:40:55 +0100
Subject: [CLEAN] Cleaned a bit of unecessary xml/css

bzr revid: tde@openerp.com-20120308104055-knvdgvj4a2z0k5fd
---
 addons/mail/static/src/xml/mail.xml | 2 --
 1 file changed, 2 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index a51921dfc46..5b4812129e5 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -23,8 +23,6 @@
     </div>
 
     <t t-name="WallThreadContainer">
-        <div class="oe_mail_wall_thread_content">
-        </div>
     </t>
 
     <div t-name="RecordThread" class="oe_mail_recthread">
-- 
cgit v1.2.3


From 0f18e4cf20d9f3e4d212022f70139b55aa952a5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 8 Mar 2012 17:41:38 +0100
Subject: [REF] Thread and Wall widgets: html/css refactoring, based on MIT
 first design.

bzr revid: tde@openerp.com-20120308164138-lar56562dibp8q4s
---
 addons/mail/static/src/xml/mail.xml | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 5b4812129e5..295d46b96ba 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -7,7 +7,7 @@
         <div class="oe_mail_wall_left">
             <div class="oe_mail_wall_act">
                 <div class="oe_mail_wall_tweet">
-                    <textarea class="oe_mail_wall_action_textarea" onfocus="this.value='';">Enter your comment here...</textarea><br />
+                    <textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="Add a personnal message here..."/><br />
                     <button class="oe_mail_wall_button_comment" type="button">Post comment</button>
                 </div>
             </div>
@@ -33,11 +33,10 @@
             <div class="oe_mail_actions">
                 <button type="button" class="oe_mail_button_follow">Follow</button>
                 <button type="button" class="oe_mail_button_unfollow">Unfollow</button>
+                <button type="button" class="oe_mail_button_followers">Display followers</button>
             </div>
             <div class="oe_mail_followers">
-                <div class="oe_mail_followers_actions">
-                    <button type="button" class="oe_mail_button_followers">Display followers</button>
-                </div>
+                <h4>Followers</h4>
                 <div class="oe_mail_followers_display">
                 </div>
             </div>
@@ -46,9 +45,9 @@
 
     <div t-name="Thread" class="oe_mail_thread">
         <div class="oe_mail_thread_act">
-            <div class="oe_mail_msg_image">User_image</div>
+            <img class="oe_mail_msg_image oe_mail_oe_left" alt="User img"/>
             <div class="oe_mail_msg_content">
-                <textarea class="oe_mail_action_textarea" onfocus="this.value='';">Enter your comment here...</textarea><br />
+                <textarea class="oe_mail oe_mail_action_textarea" placeholder="Add your comment here..."/><br />
                 <button type="button" class="oe_mail_button_comment">Post comment</button>
             </div>
         </div>
@@ -60,9 +59,7 @@
     </div>
 
     <div t-name="ThreadMsg" t-attf-class="{record.type} oe_mail_thread_msg">
-        <div class="oe_mail_msg_image">
-            <img t-att-src="record.mini_url"/>
-        </div>
+        <img class="oe_mail_msg_image oe_mail_oe_left" t-att-src="record.mini_url"/>
         <div class="oe_mail_msg_content">
             <t t-if="record.type == 'email'"><t t-call="EmailDisplay" /></t>
             <t t-if="record.type == 'notification' || record.type == 'comment'"><t t-call="NoteDisplay" /></t>
@@ -71,15 +68,14 @@
     </div>
     
     <t t-name="NoteDisplay">
-        <p class="oe_mail_msg_p">
-            <span class="oe_mail_msg_author">
-                <a href="#" class="intlink" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
+        <p class="oe_mail_msg">
+            <span class="oe_mail_oe_fade">
+                <a href="#" class="intlink oe_mail_oe_intlink" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
                 <t t-if="record.type == 'notification'">via OpenERP System Notification</t>
-            </span>
+            
             <t t-if="record.need_action_user_id != false">
-                - <span class="oe_mail_msg_need_action">Need action by <a href="#"><t t-raw="record.need_action_user_id[1]"/></a></span>
-            </t>
-            wrote on <span class="oe_mail_msg_date"><t t-raw="record.date"/></span>
+                - <span class="oe_mail_oe_warning">Need action by <a href="#" class="intlink" data-res-model='res.users' t-attf-data-res-id='{record.need_action_user_id[0]}'><t t-raw="record.need_action_user_id[1]"/></a></span>
+            </t>on <t t-raw="record.date"/></span>
             <br />
             <span class="oe_mail_msg_body"><t t-raw="record.body_text"/></span>
             <t t-if="record.tr_body_text"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body_text"/></span></t>
@@ -87,9 +83,10 @@
     </t>
     
     <t t-name="EmailDisplay">
-        <p class="oe_mail_msg_p oe_mail_msg_p_email_header">
-            From: <t t-esc="email_from"/> on <span class="oe_mail_msg_date"><t t-raw="record.date"/></span><br />
-            To: <t t-sec="mail_to"/><br />
+        <p class="oe_mail_msg oe_mail_msg_p_email_header">
+            <span class="oe_mail_oe_bold">From:</span> <t t-esc="email_from"/> on <span class="oe_mail_oe_fade"><t t-raw="record.date"/></span><br />
+            <span>To:</span> <t t-sec="mail_to"/><br />
+            <span>Subject:</span> <t t-sec="subject"/><br />
         </p>
         <p class="oe_mail_msg_p">
             <span class="oe_mail_msg_body"><t t-raw="record.body_text"/></span>
-- 
cgit v1.2.3


From 4f220ff718de78e65716d4b0f782887dc7e06218 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 12 Mar 2012 11:52:17 +0100
Subject: [IMP] Thread widget: use name_get to display the record name between
 the avatar and the message body. Updated comment display.

bzr revid: tde@openerp.com-20120312105217-sjm1lrminn70i6h4
---
 addons/mail/static/src/xml/mail.xml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 1a04d4e44c0..7f5fb7c5814 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -69,18 +69,14 @@
     
     <t t-name="NoteDisplay">
         <p class="oe_mail_msg">
-            <span class="oe_mail_oe_fade">
-                <a href="#" class="intlink oe_mail_oe_intlink" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
-                <t t-if="record.type == 'notification'">via OpenERP System Notification</t>            
-<!--
-            <t t-if="record.need_action_user_id != false">
-                - <span class="oe_mail_oe_warning">Need action by <a href="#" class="intlink" data-res-model='res.users' t-attf-data-res-id='{record.need_action_user_id[0]}'><t t-raw="record.need_action_user_id[1]"/></a></span>
-            </t>
--->
-            on <t t-raw="record.date"/></span>
-            <br />
+            <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{res_model}' t-attf-data-res-id='{res_id}'><t t-raw="name"/></a>
             <span class="oe_mail_msg_body"><t t-raw="record.body_text"/></span>
             <t t-if="record.tr_body_text"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body_text"/></span></t>
+            <br />
+            <span class="oe_mail_oe_fade">
+                <a href="#" class="intlink oe_mail_oe_intlink" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
+                on <t t-raw="record.date"/>
+            </span>
         </p>
     </t>
     
-- 
cgit v1.2.3


From ff171895d238a5ccc13c4b846294b1567accaf42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 12 Mar 2012 16:25:29 +0100
Subject: [IMP] Thread widget: improved usability: added a reply link toggling
 comment textarea; commenting can be done via the enter key

bzr revid: tde@openerp.com-20120312152529-lbcz0byljetpeezj
---
 addons/mail/static/src/xml/mail.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 7f5fb7c5814..1873d9352b8 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -47,8 +47,7 @@
         <div class="oe_mail_thread_act">
             <img class="oe_mail_msg_image oe_mail_oe_left" alt="User img"/>
             <div class="oe_mail_msg_content">
-                <textarea class="oe_mail oe_mail_action_textarea" placeholder="Add your comment here..."/><br />
-                <button type="button" class="oe_mail_button_comment">Post comment</button>
+                <textarea class="oe_mail oe_mail_action_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/><br />
             </div>
         </div>
         <div class="oe_mail_thread_display"></div>
@@ -77,6 +76,9 @@
                 <a href="#" class="intlink oe_mail_oe_intlink" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
                 on <t t-raw="record.date"/>
             </span>
+            <t t-if="display.show_reply"><span class="oe_mail_oe_space"><a href="#" class="oe_mail_msg_reply">Reply</a></span></t>
+            <t t-if="display.show_delete"><span class="oe_mail_oe_space"><a href="#" class="oe_mail_msg_reply">Delete</a></span></t>
+            <t t-if="display.show_hide"><span class="oe_mail_oe_space"><a href="#" class="oe_mail_msg_reply">Hide</a></span></t>
         </p>
     </t>
     
-- 
cgit v1.2.3


From 543d76dca3638c664b19cdd3943eec476c3ca061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 12 Mar 2012 18:33:23 +0100
Subject: [IMP] Thread widget: small user experience improvements (reply
 comment hidden by default; comment textarea is cleaned after posting the
 comment; em tag not escaped in mesages; fixed class name of links delete and
 hide.

bzr revid: tde@openerp.com-20120312173323-z1xnabsjzxj3vyxa
---
 addons/mail/static/src/xml/mail.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 1873d9352b8..724241e70b3 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -77,8 +77,8 @@
                 on <t t-raw="record.date"/>
             </span>
             <t t-if="display.show_reply"><span class="oe_mail_oe_space"><a href="#" class="oe_mail_msg_reply">Reply</a></span></t>
-            <t t-if="display.show_delete"><span class="oe_mail_oe_space"><a href="#" class="oe_mail_msg_reply">Delete</a></span></t>
-            <t t-if="display.show_hide"><span class="oe_mail_oe_space"><a href="#" class="oe_mail_msg_reply">Hide</a></span></t>
+            <t t-if="display.show_delete"><span class="oe_mail_oe_space"><a href="#" class="oe_mail_msg_delete">Delete</a></span></t>
+            <t t-if="display.show_hide"><span class="oe_mail_oe_space"><a href="#" class="oe_mail_msg_hide">Hide</a></span></t>
         </p>
     </t>
     
-- 
cgit v1.2.3


From 09a01870ffa7dc4d102d4c60850d7374c8f60b1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 13 Mar 2012 18:22:33 +0100
Subject: [IMP] Thread widget: cleaned follow/unfollow buttons behavior (text
 change when mouseover/mouseleave, update followers display)

bzr revid: tde@openerp.com-20120313172233-3zgm41f7m7mxzmie
---
 addons/mail/static/src/xml/mail.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 724241e70b3..c2eef5499f7 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -31,8 +31,8 @@
         </div>
         <div class="oe_mail_recthread_right">
             <div class="oe_mail_actions">
-                <button type="button" class="oe_mail_button_follow">Follow</button>
-                <button type="button" class="oe_mail_button_unfollow">Unfollow</button>
+                <button type="button" class="oe_mail_button_follow">Not following</button>
+                <button type="button" class="oe_mail_button_unfollow">Following</button>
                 <button type="button" class="oe_mail_button_followers">Display followers</button>
             </div>
             <div class="oe_mail_followers">
-- 
cgit v1.2.3


From c1e13fdff20f7946b584505f9e1041c6e2c154a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 13 Mar 2012 18:41:05 +0100
Subject: [IMP] Threzad widget: added unlink mechanism. Still WIP tough.

bzr revid: tde@openerp.com-20120313174105-ffncns931oa0ry4o
---
 addons/mail/static/src/xml/mail.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index c2eef5499f7..c9ab259ddf8 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -77,8 +77,8 @@
                 on <t t-raw="record.date"/>
             </span>
             <t t-if="display.show_reply"><span class="oe_mail_oe_space"><a href="#" class="oe_mail_msg_reply">Reply</a></span></t>
-            <t t-if="display.show_delete"><span class="oe_mail_oe_space"><a href="#" class="oe_mail_msg_delete">Delete</a></span></t>
-            <t t-if="display.show_hide"><span class="oe_mail_oe_space"><a href="#" class="oe_mail_msg_hide">Hide</a></span></t>
+            <t t-if="display.show_delete"><span class="oe_mail_oe_space"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete">Delete</a></span></t>
+            <t t-if="display.show_hide"><span class="oe_mail_oe_space"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide">Hide</a></span></t>
         </p>
     </t>
     
-- 
cgit v1.2.3


From 533b61106a9fa57d4dfae4451f5065ab131f9828 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 21 Mar 2012 14:41:44 +0100
Subject: [REM] Removed unnecessary div container

bzr revid: tde@openerp.com-20120321134144-t0r523xwfcz0b6jk
---
 addons/mail/static/src/xml/mail.xml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index c9ab259ddf8..d6558eb2c14 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -6,10 +6,8 @@
         </div>
         <div class="oe_mail_wall_left">
             <div class="oe_mail_wall_act">
-                <div class="oe_mail_wall_tweet">
-                    <textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="Add a personnal message here..."/><br />
-                    <button class="oe_mail_wall_button_comment" type="button">Post comment</button>
-                </div>
+                <textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="Add a personnal message here..."/><br />
+                <button class="oe_mail_wall_button_comment" type="button">Post comment</button>
             </div>
             <div class="oe_mail_wall_threads">
             </div>
@@ -18,8 +16,7 @@
                 <p class="oe_mail_wall_nomore">You have loaded all discussions.</p>
             </div>
         </div>
-        <div class="oe_mail_wall_right">
-        </div>
+        <div class="oe_mail_wall_right"></div>
     </div>
 
     <t t-name="WallThreadContainer">
-- 
cgit v1.2.3


From 6c573d00616ec4da24e831a4f4d37ffa7ce326e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 21 Mar 2012 15:07:26 +0100
Subject: [IMP] Now uses ul and li for creating comment lists.

bzr revid: tde@openerp.com-20120321140726-0d6y7d22t0mh879j
---
 addons/mail/static/src/xml/mail.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index d6558eb2c14..70d3f1ef6f6 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -23,16 +23,16 @@
     </t>
 
     <div t-name="RecordThread" class="oe_mail_recthread">
-        <div class="separator horizontal">OpenSocial</div>
+        <h4>History and Comments</h4>
         <div class="oe_mail_recthread_left">
         </div>
         <div class="oe_mail_recthread_right">
-            <div class="oe_mail_actions">
+            <div class="oe_mail_recthread_actions">
                 <button type="button" class="oe_mail_button_follow">Not following</button>
                 <button type="button" class="oe_mail_button_unfollow">Following</button>
                 <button type="button" class="oe_mail_button_followers">Display followers</button>
             </div>
-            <div class="oe_mail_followers">
+            <div class="oe_mail_recthread_followers">
                 <h4>Followers</h4>
                 <div class="oe_mail_followers_display">
                 </div>
@@ -40,11 +40,11 @@
         </div>
     </div>
 
-    <div t-name="Thread" class="oe_mail_thread">
+    <ul t-name="Thread" class="oe_mail_thread oe_mail">
         <div class="oe_mail_thread_act">
             <img class="oe_mail_msg_image oe_mail_oe_left" alt="User img"/>
             <div class="oe_mail_msg_content">
-                <textarea class="oe_mail oe_mail_action_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/><br />
+                <textarea class="oe_mail_action_textarea oe_mail" placeholder="Add your comment here..." onfocus="this.value = '';"/><br />
             </div>
         </div>
         <div class="oe_mail_thread_display"></div>
@@ -52,16 +52,16 @@
             <button class="oe_mail_button_more" type="button">Load more messages</button>
             <p class="oe_mail_p_nomore">You have loaded all messages in this thread.</p>
         </div>
-    </div>
+    </ul>
 
-    <div t-name="ThreadMsg" t-attf-class="{record.type} oe_mail_thread_msg">
+    <li t-name="ThreadMsg" t-attf-class="{record.type} oe_mail_thread_msg oe_mail">
         <img class="oe_mail_msg_image oe_mail_oe_left" t-att-src="record.mini_url"/>
         <div class="oe_mail_msg_content">
             <t t-if="record.type == 'email'"><t t-call="EmailDisplay" /></t>
             <t t-if="record.type == 'notification' || record.type == 'comment'"><t t-call="NoteDisplay" /></t>
         </div>
         <t t-if="record.type == 'tmp'"><t t-call="ThreadDisplay" /></t>
-    </div>
+    </li>
     
     <t t-name="NoteDisplay">
         <p class="oe_mail_msg">
-- 
cgit v1.2.3


From 4ea3a7a13183f8ff87bfd0eccfe275722fe632ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 21 Mar 2012 18:20:18 +0100
Subject: [ADD] Added delete / hide for OpenSocial, on widget and in API. TODO:
 when deleting a comment, delete its childs.

bzr revid: tde@openerp.com-20120321172018-6pq33317302ttg9b
---
 addons/mail/static/src/xml/mail.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 70d3f1ef6f6..2faf2d1950e 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -65,7 +65,7 @@
     
     <t t-name="NoteDisplay">
         <p class="oe_mail_msg">
-            <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{res_model}' t-attf-data-res-id='{res_id}'><t t-raw="name"/></a>
+            <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="thread.name"/></a>
             <span class="oe_mail_msg_body"><t t-raw="record.body_text"/></span>
             <t t-if="record.tr_body_text"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body_text"/></span></t>
             <br />
@@ -73,9 +73,13 @@
                 <a href="#" class="intlink oe_mail_oe_intlink" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
                 on <t t-raw="record.date"/>
             </span>
-            <t t-if="display.show_reply"><span class="oe_mail_oe_space"><a href="#" class="oe_mail_msg_reply">Reply</a></span></t>
-            <t t-if="display.show_delete"><span class="oe_mail_oe_space"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete">Delete</a></span></t>
-            <t t-if="display.show_hide"><span class="oe_mail_oe_space"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide">Hide</a></span></t>
+            <t t-if="display['show_reply']"><span class="oe_mail_oe_space"><a href="#" class="oe_mail_msg_reply oe_mail_oe_intlink">Reply</a></span></t>
+            <t t-if="display['show_delete']">
+                <t t-if="thread._is_author(record.user_id[0])"><span class="oe_mail_oe_space"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink">Delete</a></span></t>
+            </t>
+            <t t-if="display['show_hide']">
+                <t t-if="!(thread._is_author(record.user_id[0]))"><span class="oe_mail_oe_space"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide oe_mail_oe_intlink">Hide</a></span></t>
+            </t>
         </p>
     </t>
     
-- 
cgit v1.2.3


From 6652baba0cbcfde0fef3fbaf4a6618111e33d94d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 22 Mar 2012 17:32:24 +0100
Subject: [IMP] Checks threads have new messages when initializing; TODO: code
 cleaning ...

bzr revid: tde@openerp.com-20120322163224-svqkt5g41w6jf3zv
---
 addons/mail/static/src/xml/mail.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 2faf2d1950e..bcaff9570c5 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -50,7 +50,6 @@
         <div class="oe_mail_thread_display"></div>
         <div class="oe_mail_thread_more">
             <button class="oe_mail_button_more" type="button">Load more messages</button>
-            <p class="oe_mail_p_nomore">You have loaded all messages in this thread.</p>
         </div>
     </ul>
 
-- 
cgit v1.2.3


From 5ac5299eaa1e096487ca457ca4aab8d60cc11540 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 27 Mar 2012 11:15:04 +0200
Subject: [IMP] Thread widget: 'load more' button hidden by default, shown only
 if necessary. Otherwise the display was a bit screwed.

bzr revid: tde@openerp.com-20120327091504-8ydi6csctn0nwcuz
---
 addons/mail/static/src/xml/mail.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index bcaff9570c5..b9de27ca6e9 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -64,7 +64,7 @@
     
     <t t-name="NoteDisplay">
         <p class="oe_mail_msg">
-            <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="thread.name"/></a>
+            <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
             <span class="oe_mail_msg_body"><t t-raw="record.body_text"/></span>
             <t t-if="record.tr_body_text"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body_text"/></span></t>
             <br />
-- 
cgit v1.2.3


From 43e49d754f7fd0b0e0dad1cf54591236d00e3365 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 30 Mar 2012 17:11:47 +0200
Subject: [REF] Wall widget: refactored and cleaned code. Better management of
 domains. Removed 'You have loaded all discussion'.

bzr revid: tde@openerp.com-20120330151147-d09fl1ps97vex8cz
---
 addons/mail/static/src/xml/mail.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index b9de27ca6e9..a8e674c48bb 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -13,7 +13,6 @@
             </div>
             <div class="oe_mail_wall_more">
                 <button class="oe_mail_wall_button_more" type="button">See more discussions</button>
-                <p class="oe_mail_wall_nomore">You have loaded all discussions.</p>
             </div>
         </div>
         <div class="oe_mail_wall_right"></div>
-- 
cgit v1.2.3


From 31a4b68d38ef70fa8362ad92992859473a775bf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 3 Apr 2012 22:35:52 +0200
Subject: [FIX] thread widget: fixes email display

bzr revid: tde@openerp.com-20120403203552-24qlp8nxrok6voji
---
 addons/mail/static/src/xml/mail.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index a8e674c48bb..5788a4cd69c 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -83,11 +83,11 @@
     
     <t t-name="EmailDisplay">
         <p class="oe_mail_msg oe_mail_msg_p_email_header">
-            <span class="oe_mail_oe_bold">From:</span> <t t-esc="email_from"/> on <span class="oe_mail_oe_fade"><t t-raw="record.date"/></span><br />
-            <span>To:</span> <t t-sec="mail_to"/><br />
-            <span>Subject:</span> <t t-sec="subject"/><br />
+            <span class="oe_mail_oe_bold">From:</span> <t t-esc="record.email_from"/> on <span class="oe_mail_oe_fade"><t t-raw="record.date"/></span><br />
+            <span class="oe_mail_oe_bold">To:</span> <t t-esc="record.email_to"/><br />
+            <span class="oe_mail_oe_bold">Subject:</span> <t t-esc="record.subject"/><br />
         </p>
-        <p class="oe_mail_msg_p">
+        <p class="oe_mail_msg">
             <span class="oe_mail_msg_body"><t t-raw="record.body_text"/></span>
         </p>
     </t>
-- 
cgit v1.2.3


From 73e9efa863e258806018cdd0422c13db2dbff345 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 5 Apr 2012 23:42:41 +0200
Subject: [IMP] thread widget: improved layout (notification/email background
 color)

bzr revid: tde@openerp.com-20120405214241-rm72q22x1m0oq3z0
---
 addons/mail/static/src/xml/mail.xml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 5788a4cd69c..b2c72792b04 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -52,13 +52,15 @@
         </div>
     </ul>
 
-    <li t-name="ThreadMsg" t-attf-class="{record.type} oe_mail_thread_msg oe_mail">
-        <img class="oe_mail_msg_image oe_mail_oe_left" t-att-src="record.mini_url"/>
-        <div class="oe_mail_msg_content">
-            <t t-if="record.type == 'email'"><t t-call="EmailDisplay" /></t>
-            <t t-if="record.type == 'notification' || record.type == 'comment'"><t t-call="NoteDisplay" /></t>
+    <li t-name="ThreadMsg" t-attf-class="oe_mail_thread_msg oe_mail">
+        <div t-attf-class="{record.type}">
+            <img class="oe_mail_msg_image oe_mail_oe_left" t-att-src="record.mini_url"/>
+            <div class="oe_mail_msg_content">
+                <t t-if="record.type == 'email'"><t t-call="EmailDisplay" /></t>
+                <t t-if="record.type == 'notification' || record.type == 'comment'"><t t-call="NoteDisplay" /></t>
+            </div>
+            <t t-if="record.type == 'tmp'"><t t-call="ThreadDisplay" /></t>
         </div>
-        <t t-if="record.type == 'tmp'"><t t-call="ThreadDisplay" /></t>
     </li>
     
     <t t-name="NoteDisplay">
-- 
cgit v1.2.3


From 3fa154178f348c3d06295d5ab5f2e86b9e9fc1aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 6 Apr 2012 13:33:50 +0200
Subject: [FIX] Fixed email not displaying their bodies in feeds.

bzr revid: tde@openerp.com-20120406113350-u3uahnk4kj26ca0d
---
 addons/mail/static/src/xml/mail.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index b2c72792b04..0f49902b6b3 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -66,8 +66,8 @@
     <t t-name="NoteDisplay">
         <p class="oe_mail_msg">
             <a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
-            <span class="oe_mail_msg_body"><t t-raw="record.body_text"/></span>
-            <t t-if="record.tr_body_text"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body_text"/></span></t>
+            <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
+            <t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t>
             <br />
             <span class="oe_mail_oe_fade">
                 <a href="#" class="intlink oe_mail_oe_intlink" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
@@ -90,7 +90,8 @@
             <span class="oe_mail_oe_bold">Subject:</span> <t t-esc="record.subject"/><br />
         </p>
         <p class="oe_mail_msg">
-            <span class="oe_mail_msg_body"><t t-raw="record.body_text"/></span>
+            <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
+            <t t-if="record.tr_body"><span class="oe_mail_msg_body_short"><t t-raw="record.tr_body"/></span></t>
         </p>
     </t>
 
-- 
cgit v1.2.3