From 7a4ca1338c43b63c4d7976519ffe7a374d922fc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Apr 2012 10:42:41 +0200
Subject: [ADD] Chatter widget: added links to hide a thread or a subtype. Only
 links, not functional currently, because logic is not implemented.

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

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index f034b04311d..7fe1d39a661 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -58,6 +58,12 @@
 
     <li t-name="ThreadMsg" t-attf-class="oe_mail oe_mail_thread_msg">
         <div t-attf-class="oe_mail_msg_#{record.type}">
+            <img class="oe_mail_msg_menu_icon" src="/mail/static/src/img/wheel_menu.png" alt="menu"/>
+            <ul class="oe_mail_msg_menu">
+                <li><a href="#" class="oe_mail_msg_hide_thread">Hide this thread</a></li>
+                <li><a href="#" class="oe_mail_msg_hide_type">Hide this type: <t t-esc="record.message_subtype"/>
+                </a></li>
+            </ul>
             <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>
-- 
cgit v1.2.3


From cf00272efe100c65f084a3c43aff986048d89ea7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Apr 2012 12:38:50 +0200
Subject: [IMP] Propagated content_subtype / subtype change. Also updated
 comments in code and slighty cleaned it.

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

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 7fe1d39a661..de21d510202 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -61,7 +61,7 @@
             <img class="oe_mail_msg_menu_icon" src="/mail/static/src/img/wheel_menu.png" alt="menu"/>
             <ul class="oe_mail_msg_menu">
                 <li><a href="#" class="oe_mail_msg_hide_thread">Hide this thread</a></li>
-                <li><a href="#" class="oe_mail_msg_hide_type">Hide this type: <t t-esc="record.message_subtype"/>
+                <li><a href="#" class="oe_mail_msg_hide_type">Hide this type: <t t-esc="record.subtype"/>
                 </a></li>
             </ul>
             <img class="oe_mail_msg_image oe_mail_oe_left" t-att-src="record.mini_url"/>
-- 
cgit v1.2.3


From c4e6874e234e0db39f69ffab94927d1d1b9d69e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Apr 2012 14:09:48 +0200
Subject: [IMP] mail.thread: added the hiding method. However, this won t work
 with automatic subscriptions. Will need to be managed. Updating mail.js to be
 able to hide subtypes.

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

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index de21d510202..76d60341254 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -60,8 +60,8 @@
         <div t-attf-class="oe_mail_msg_#{record.type}">
             <img class="oe_mail_msg_menu_icon" src="/mail/static/src/img/wheel_menu.png" alt="menu"/>
             <ul class="oe_mail_msg_menu">
-                <li><a href="#" class="oe_mail_msg_hide_thread">Hide this thread</a></li>
-                <li><a href="#" class="oe_mail_msg_hide_type">Hide this type: <t t-esc="record.subtype"/>
+                <li><a href="#" class="oe_mail_msg_hide_thread" t-attf-data-id='{record.id}'>Hide this thread</a></li>
+                <li><a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide this type: <t t-esc="record.subtype"/>
                 </a></li>
             </ul>
             <img class="oe_mail_msg_image oe_mail_oe_left" t-att-src="record.mini_url"/>
-- 
cgit v1.2.3


From c4addb4d5ac05ae39e64a8cad460a22d159e9859 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Apr 2012 17:58:27 +0200
Subject: [ADD] Thread widget: added a 'reply by email' link. Open the
 mail.compose.message wizard. WIP: must add default values, such as email_to,
 ... Will be done asap.

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

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 76d60341254..05adf4b5141 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -45,6 +45,7 @@
 
     <ul t-name="Thread" class="oe_mail oe_mail_thread">
         <div class="oe_mail_thread_act">
+            <a href="#" class="oe_mail_compose">Repley by e-mail</a><br />
             <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 />
-- 
cgit v1.2.3


From 931302eca050ab540f6031bd7b4e23a7983ed12f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 10 May 2012 14:10:58 +0200
Subject: [IMP] Thread widget: cleaned links, added reply by e-mail links.
 Added in mail.compose.message wizard support for a 'message_id' in context
 have a document with reply behavior. Also cleaned a bit the mail;js code.
 Updated a detail in a default temporary data in hr_recruitment.

bzr revid: tde@openerp.com-20120510121058-a2emjtvm227603ou
---
 addons/mail/static/src/xml/mail.xml | 46 +++++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 17 deletions(-)

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 05adf4b5141..32f3e5665e0 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -45,11 +45,14 @@
 
     <ul t-name="Thread" class="oe_mail oe_mail_thread">
         <div class="oe_mail_thread_act">
-            <a href="#" class="oe_mail_compose">Repley by e-mail</a><br />
             <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 />
             </div>
+            <p><a href="#" class="oe_mail_compose oe_mail_oe_right">
+                Send an e-mail
+                <img src='/mail/static/src/img/email_icon.png' alt='Send an e-mail'/>
+            </a></p>
         </div>
         <div class="oe_mail_thread_display"></div>
         <div class="oe_mail_thread_more">
@@ -67,8 +70,10 @@
             </ul>
             <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>
+                <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>
+                <br />Message-id: <t t-esc="record.message_id"/>
+                <br />References: <t t-esc="record.references"/>
             </div>
             <t t-if="record.type == 'tmp'"><t t-call="ThreadDisplay" /></t>
         </div>
@@ -86,13 +91,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']"><a href="#" class="oe_mail_oe_space oe_mail_msg_reply oe_mail_oe_intlink"> Reply</a> </t>
-            <t t-if="display['show_delete']">
-                <t t-if="thread._is_author(record.user_id[0])"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_oe_space oe_mail_msg_delete oe_mail_oe_intlink"> Delete </a></t>
-            </t>
-            <t t-if="display['show_hide']">
-                <t t-if="!(thread._is_author(record.user_id[0]))"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_oe_space oe_mail_msg_hide oe_mail_oe_intlink">Hide</a></t>
-            </t>
+            <span class="oe_mail_oe_right">
+                <t t-call="MessageDisplayManageLinks"/>
+            </span>
         </p>
     </t>
     
@@ -101,7 +102,6 @@
             <t t-if="params.thread_level > 0">
                 <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>
             </t>
-            <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 />
@@ -110,13 +110,25 @@
             <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 />
-            <t t-if="display['show_delete']">
-                <t t-if="thread._is_author(record.user_id[0])"><a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete oe_mail_oe_intlink"> Delete </a></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>
+            <span class="oe_mail_oe_right">
+                <t t-call="MessageDisplayManageLinks"/>
+            </span>
         </p>
     </t>
 
+    <t t-name="MessageDisplayManageLinks">
+        <t t-if="display['show_reply']">
+            <a href="#" class="oe_mail_oe_space oe_mail_oe_intlink oe_mail_msg_reply">Reply</a>
+        </t>
+        <t t-if="display['show_delete']"><t t-if="thread._is_author(record.user_id[0])">
+            <a href="#" t-attf-data-id='{record.id}' class="oe_mail_oe_space oe_mail_oe_intlink oe_mail_msg_delete">Delete</a>
+        </t></t>
+        <t t-if="display['show_hide']">
+            <a href="#" t-attf-data-id='{record.id}' class="oe_mail_oe_space oe_mail_oe_intlink oe_mail_msg_hide">Remove from Wall</a>
+        </t>
+        <t t-if="display['show_reply_by_email']"><t t-if="record.type == 'email'">
+            <a href="#" t-attf-data-id='{record.id}' class="oe_mail_oe_space oe_mail_oe_intlink oe_mail_msg_reply_by_email">Reply by e-mail</a>
+        </t></t>
+    </t>
+
 </template>
-- 
cgit v1.2.3


From d54b9df3119c4861080edfba89d0bff199bb52c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 10 May 2012 14:17:49 +0200
Subject: [IMP] Thread widget: added use of expander extension instead of the
 custom hardcoded stuff.

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

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 32f3e5665e0..cc423767b81 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -84,9 +84,7 @@
             <t t-if="params.thread_level > 0">
                 <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>
             </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_msg_body"><t t-raw="record.body"/></span><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"/>
@@ -107,9 +105,7 @@
             <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"/></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_msg_body"><t t-raw="record.body"/></span><br />
             <span class="oe_mail_oe_right">
                 <t t-call="MessageDisplayManageLinks"/>
             </span>
-- 
cgit v1.2.3


From 7c597fa28b42fd24a91d4e8d15ad1f2ccd51194c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 10 May 2012 16:26:40 +0200
Subject: [REM] Remove debug data in thread widget.

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

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index cc423767b81..fe9ea52ae3e 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -72,8 +72,6 @@
             <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>
-                <br />Message-id: <t t-esc="record.message_id"/>
-                <br />References: <t t-esc="record.references"/>
             </div>
             <t t-if="record.type == 'tmp'"><t t-call="ThreadDisplay" /></t>
         </div>
-- 
cgit v1.2.3


From be0d26923df1d1e563592ac5d03a42a65dbc1f52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 14 May 2012 12:08:20 +0200
Subject: [IMP] Thread widget: reply by e-mail not shown on Wall; renamed wall
 widget parameter to is_wall.

bzr revid: tde@openerp.com-20120514100820-9m4jua07sydjakey
---
 addons/mail/static/src/xml/mail.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index fe9ea52ae3e..dc80ccc06fe 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -49,10 +49,9 @@
             <div class="oe_mail_msg_content">
                 <textarea class="oe_mail oe_mail_action_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/><br />
             </div>
-            <p><a href="#" class="oe_mail_compose oe_mail_oe_right">
-                Send an e-mail
+            <a href="#" class="oe_mail_compose oe_mail_oe_right">Send an e-mail
                 <img src='/mail/static/src/img/email_icon.png' alt='Send an e-mail'/>
-            </a></p>
+            </a>
         </div>
         <div class="oe_mail_thread_display"></div>
         <div class="oe_mail_thread_more">
-- 
cgit v1.2.3


From 42c41a7ee45ed6922c91b83179e9fa436eba897c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 14 May 2012 14:15:30 +0200
Subject: [IMP] Thread widget: updated actions menu in messages

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

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index dc80ccc06fe..eccf9a6de87 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -63,9 +63,13 @@
         <div t-attf-class="oe_mail_msg_#{record.type}">
             <img class="oe_mail_msg_menu_icon" src="/mail/static/src/img/wheel_menu.png" alt="menu"/>
             <ul class="oe_mail_msg_menu">
-                <li><a href="#" class="oe_mail_msg_hide_thread" t-attf-data-id='{record.id}'>Hide this thread</a></li>
-                <li><a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide this type: <t t-esc="record.subtype"/>
-                </a></li>
+                <t t-if="display['show_delete']"><t t-if="thread._is_author(record.user_id[0])">
+                    <li><a href="#" class="oe_mail_oe_intlink oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
+                </t></t>
+                <t t-if="display['show_hide']">
+                    <li><a href="#" class="oe_mail_oe_intlink oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove from Wall</a></li>
+                    <li><a href="#" class="oe_mail_oe_intlink oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide this type: <t t-esc="record.subtype"/></a></li>
+                </t>
             </ul>
             <img class="oe_mail_msg_image oe_mail_oe_left" t-att-src="record.mini_url"/>
             <div class="oe_mail_msg_content">
-- 
cgit v1.2.3


From a99837b6adc8f2c9fa6c4bf849e120db0955e305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 14 May 2012 16:47:39 +0200
Subject: [REF] Thread widget code: moved some functions

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

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index eccf9a6de87..b8adba6d01a 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -68,7 +68,7 @@
                 </t></t>
                 <t t-if="display['show_hide']">
                     <li><a href="#" class="oe_mail_oe_intlink oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove from Wall</a></li>
-                    <li><a href="#" class="oe_mail_oe_intlink oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide this type: <t t-esc="record.subtype"/></a></li>
+                    <li><a href="#" class="oe_mail_oe_intlink oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a></li>
                 </t>
             </ul>
             <img class="oe_mail_msg_image oe_mail_oe_left" t-att-src="record.mini_url"/>
-- 
cgit v1.2.3


From 12d8dceaa97212c38da0d27ee4b198c35ff24873 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 15 May 2012 14:23:06 +0200
Subject: [IMP] Thread widget: small tweaks (reply link now not shown anymore
 on record threaded view; post comment textarea now not shown anymoreon record
 threaded view; oe_mail_oe_right css class => oe_righit)

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

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index a11a5a2c6b8..1f95369339f 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -50,7 +50,7 @@
             <div class="oe_mail_msg_content">
                 <textarea class="oe_mail oe_mail_action_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/><br />
             </div>
-            <a href="#" class="oe_mail_compose oe_mail_oe_right">Send an e-mail
+            <a href="#" class="oe_mail_compose oe_right">Send an e-mail
                 <img src='/mail/static/src/img/email_icon.png' alt='Send an e-mail'/>
             </a>
         </div>
@@ -91,7 +91,7 @@
                 <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>
-            <span class="oe_mail_oe_right">
+            <span class="oe_right">
                 <t t-call="MessageDisplayManageLinks"/>
             </span>
         </p>
@@ -108,7 +108,7 @@
         </p>
         <p class="oe_mail_msg">
             <span class="oe_mail_msg_body"><t t-raw="record.body"/></span><br />
-            <span class="oe_mail_oe_right">
+            <span class="oe_right">
                 <t t-call="MessageDisplayManageLinks"/>
             </span>
         </p>
-- 
cgit v1.2.3


From 027f8e7fb7a366aa4906caba1c55e1d64c52617b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 14 Jun 2012 10:40:33 +0200
Subject: [TMP] mail.js: tmp update, will be probably discarded.

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

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 25c45a63dfb..80a43fd16a2 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -44,6 +44,11 @@
         </div>
     </div>
 
+    <t t-name="mail.compose_message">
+        <div class="caca"><p>cacaproutboudin</p>
+        </div>
+    </t>
+
     <ul t-name="Thread" class="oe_mail oe_mail_thread">
         <div class="oe_mail_thread_act">
             <img class="oe_mail_msg_image oe_left" alt="User img"/>
-- 
cgit v1.2.3


From c82893480236746fd29362f236df3d6b59b8b2fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 15 Jun 2012 10:36:56 +0200
Subject: [IMP] Chatter widgets: cleaned some name and templates, added some
 comments, cleaned a bit the draft of sending message embedded form view.

bzr revid: tde@openerp.com-20120615083656-mdyl8c49htxr5hq9
---
 addons/mail/static/src/xml/mail.xml | 43 +++++++++++++++++++++++++++++--------
 1 file changed, 34 insertions(+), 9 deletions(-)

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 80a43fd16a2..b0fa456d36c 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -1,37 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template>
 
-    <div t-name="Wall" class="oe_mail_wall">
+    <!-- 
+        wall main template
+        Template used to display the communication history in the
+        wall.
+        -->
+    <div t-name="mail.wall" class="oe_mail_wall">
         <table class="oe_view_manager_header">
             <tr class="oe_header_row">
                 <td><h2 class="oe_view_title">All Feeds</h2></td>
                 <td><div class="oe_view_manager_view_search" t-opentag="true"/></td>
             </tr>
         </table>
-        <div class="oe_mail_wall_left">
+        <div class="oe_mail_wall_main">
             <div class="oe_mail_wall_act">
                 <img class="oe_mail_msg_image oe_left" alt="User img"/>
                 <textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="What are you working on?"/>
                 <button class="oe_right oe_mail_wall_button_comment" type="button">Post comment</button>
             </div>
-            <div class="oe_clear"></div>
+            <div class="oe_clear"/>
             <div class="oe_mail_wall_threads">
+                <!-- contains threads -->
             </div>
             <div class="oe_mail_wall_more">
                 <button class="oe_mail_wall_button_more" type="button">See more discussions</button>
             </div>
         </div>
-        <div class="oe_mail_wall_right"></div>
+        <div class="oe_mail_wall_aside">
+                <!-- contains currently nothing -->
+        </div>
     </div>
 
-    <t t-name="WallThreadContainer">
+    <!--
+        thread_container template for the wall
+        Each discussion thread is be contained inside this template
+        -->
+    <t t-name="mail.wall.thread_container">
     </t>
 
-    <div t-name="RecordThread" class="oe_mail_recthread">
+    <!--
+        record_thread main template
+        Template used to display the communciation history in documents
+        form view.
+        -->
+    <div t-name="mail.record_thread" class="oe_mail_recthread">
         <h4>History and Comments</h4>
-        <div class="oe_mail_recthread_left">
+        <div class="oe_mail_recthread_main">
+            <!-- contains the document thread -->
         </div>
-        <div class="oe_mail_recthread_right">
+        <div class="oe_mail_recthread_aside">
             <div class="oe_mail_recthread_actions">
                 <button type="button" class="oe_mail_button_follow oe_mail_button_mouseout">Not following</button>
                 <button type="button" class="oe_mail_button_unfollow oe_mail_button_mouseout">Following</button>
@@ -44,9 +62,16 @@
         </div>
     </div>
 
+    <!--
+        compose_message template
+        This template holds the composition form to write a note or send
+        an e-mail.
+        -->
     <t t-name="mail.compose_message">
-        <div class="caca"><p>cacaproutboudin</p>
+        <div class="oe_mail_compose_message">
+            <!-- contains the composition form -->
         </div>
+        <div class="oe_clear"/>
     </t>
 
     <ul t-name="Thread" class="oe_mail oe_mail_thread">
-- 
cgit v1.2.3


From 73dc2aee923b8056478bb5b2c72be8baf51cddb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 18 Jun 2012 17:06:08 +0200
Subject: [IMP] mail.compose.message widget: first integration in chatter.

bzr revid: tde@openerp.com-20120618150608-0go3xc0l3yil14ps
---
 addons/mail/static/src/xml/mail.xml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index b0fa456d36c..8f4a74e6fad 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -68,14 +68,18 @@
         an e-mail.
         -->
     <t t-name="mail.compose_message">
-        <div class="oe_mail_compose_message">
-            <!-- contains the composition form -->
+        <div>
+            <img class="oe_mail_msg_image oe_left" alt="User img"/>
+            <div class="oe_mail_msg_content">
+                <!-- contains the composition form -->
+            </div>
+            <div class="oe_clear"/>
         </div>
-        <div class="oe_clear"/>
     </t>
 
     <ul t-name="Thread" class="oe_mail oe_mail_thread">
         <div class="oe_mail_thread_act">
+<!--
             <img class="oe_mail_msg_image 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 = '';"/>
@@ -83,6 +87,7 @@
             <a href="#" class="oe_mail_compose oe_right">Send an e-mail
                 <img src='/mail/static/src/img/email_icon.png' alt='Send an e-mail'/>
             </a>
+-->
         </div>
         <div class="oe_mail_thread_display"></div>
         <div class="oe_mail_thread_more">
-- 
cgit v1.2.3


From 209efb9e4661d5c1950fd5dc61e5877c481cf8d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 19 Jun 2012 15:13:39 +0200
Subject: [IMP] Chatter widgets: removed unnecessary CSS classes (in xml and
 css); added a template for subscribers.

bzr revid: tde@openerp.com-20120619131339-2n3bu2cpfvisinli
---
 addons/mail/static/src/xml/mail.xml | 43 ++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 8f4a74e6fad..328ca3ba352 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -53,7 +53,7 @@
             <div class="oe_mail_recthread_actions">
                 <button type="button" class="oe_mail_button_follow oe_mail_button_mouseout">Not following</button>
                 <button type="button" class="oe_mail_button_unfollow oe_mail_button_mouseout">Following</button>
-                <button type="button" class="oe_mail_button_followers">Display followers</button>
+                <button type="button" class="oe_mail_button_followers">Show followers</button>
             </div>
             <div class="oe_mail_recthread_followers">
                 <h4>Followers</h4>
@@ -62,6 +62,15 @@
         </div>
     </div>
 
+    <!--
+        record_thread.record_thread template
+        Template used to display subscibers
+        -->
+    <li t-name="mail.record_thread.subscriber">
+        <img class="oe_mail_oe_left oe_mail_msg_image" t-attf-src="{record.avatar_url}"/>
+        <a href="#" class="oe_mail_oe_intlink" data-res-model="res.users" t-attf-data-res-id="{record.id}"><t t-raw="record.name"/></a>
+    </li>
+
     <!--
         compose_message template
         This template holds the composition form to write a note or send
@@ -78,17 +87,7 @@
     </t>
 
     <ul t-name="Thread" class="oe_mail oe_mail_thread">
-        <div class="oe_mail_thread_act">
-<!--
-            <img class="oe_mail_msg_image 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 = '';"/>
-            </div>
-            <a href="#" class="oe_mail_compose oe_right">Send an e-mail
-                <img src='/mail/static/src/img/email_icon.png' alt='Send an e-mail'/>
-            </a>
--->
-        </div>
+        <div class="oe_mail_thread_act"></div>
         <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>
@@ -100,11 +99,11 @@
             <img class="oe_mail_msg_menu_icon" src="/mail/static/src/img/wheel_menu.png" alt="menu"/>
             <ul class="oe_mail_msg_menu">
                 <t t-if="display['show_delete']"><t t-if="thread._is_author(record.user_id[0])">
-                    <li><a href="#" class="oe_mail_oe_intlink oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
+                    <li><a href="#" class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
                 </t></t>
                 <t t-if="display['show_hide']">
-                    <li><a href="#" class="oe_mail_oe_intlink oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove from Wall</a></li>
-                    <li><a href="#" class="oe_mail_oe_intlink oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a></li>
+                    <li><a href="#" class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove from Wall</a></li>
+                    <li><a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a></li>
                 </t>
             </ul>
             <img t-if="record.type == 'email'" class="oe_email_icon oe_left" src="/mail/static/src/img/email_icon.png"/>
@@ -120,7 +119,7 @@
     <t t-name="NoteDisplay">
         <p class="oe_mail_msg">
             <t t-if="params.thread_level > 0">
-                <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>
+                <a href="#" class="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>
             </t>
             <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
             <t t-call="MessageDisplayManageLinks"/>
@@ -130,7 +129,7 @@
     <t t-name="EmailDisplay">
         <p class="oe_mail_msg oe_mail_msg_p_email_header">
             <t t-if="params.thread_level > 0">
-                <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>
+                <a href="#" class="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>
             </t>
         </p>
         <p><span class="oe_mail_oe_bold">From:</span> <t t-esc="record.email_from"/></p>
@@ -145,32 +144,32 @@
         <ul>
             <t t-if="display['show_reply']">
                 <li>
-                    <a href="#" class="oe_mail_oe_intlink oe_mail_msg_reply">Reply</a>
+                    <a href="#" class="oe_mail_msg_reply">Reply</a>
                     <span class="oe_mail_oe_space oe_fade"> · </span>
                 </li>
             </t>
             <t t-if="display['show_delete']"><t t-if="thread._is_author(record.user_id[0])">
                 <li>
-                    <a href="#" t-attf-data-id='{record.id}' class="oe_mail_oe_intlink oe_mail_msg_delete">Delete</a>
+                    <a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete">Delete</a>
                     <span class="oe_mail_oe_space oe_fade"> · </span>
                 </li>
             </t></t>
             <t t-if="display['show_hide']">
                 <li>
-                    <a href="#" t-attf-data-id='{record.id}' class="oe_mail_oe_intlink oe_mail_msg_hide">Remove from Wall</a>
+                    <a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide">Remove from Wall</a>
                     <span class="oe_mail_oe_space oe_fade"> · </span>
                 </li>
             </t>
             <t t-if="display['show_reply_by_email']"><t t-if="record.type == 'email'">
                 <li>
-                    <a href="#" t-attf-data-id='{record.id}' class="oe_mail_oe_intlink oe_mail_msg_reply_by_email">Reply by e-mail</a>
+                    <a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_reply_by_email">Reply by e-mail</a>
                     <span class="oe_mail_oe_space oe_fade"> · </span>
                 </li>
             </t></t>
             <li>
                 <span class="oe_fade"><t t-raw="record.date"/>
                 <t t-if="record.type != 'email'">
-                    by <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>
+                    by <a href="#" class="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>
                 </span>
             </li>
-- 
cgit v1.2.3


From e47fb55a1c998cca215021de44cbd1d765491535 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 20 Jun 2012 10:57:58 +0200
Subject: [IMP] Chatter widgets: tools_sort_comments -> in chatter mixin;
 unified intlink -> oe_mail_oe_internal_link

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

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 328ca3ba352..aebf842dc13 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -68,7 +68,7 @@
         -->
     <li t-name="mail.record_thread.subscriber">
         <img class="oe_mail_oe_left oe_mail_msg_image" t-attf-src="{record.avatar_url}"/>
-        <a href="#" class="oe_mail_oe_intlink" data-res-model="res.users" t-attf-data-res-id="{record.id}"><t t-raw="record.name"/></a>
+        <a href="#" class="oe_mail_oe_internal_link" data-res-model="res.users" t-attf-data-res-id="{record.id}"><t t-raw="record.name"/></a>
     </li>
 
     <!--
@@ -119,7 +119,7 @@
     <t t-name="NoteDisplay">
         <p class="oe_mail_msg">
             <t t-if="params.thread_level > 0">
-                <a href="#" class="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>
+                <a href="#" class="oe_mail_oe_internal_link" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
             </t>
             <span class="oe_mail_msg_body"><t t-raw="record.body"/></span>
             <t t-call="MessageDisplayManageLinks"/>
@@ -129,7 +129,7 @@
     <t t-name="EmailDisplay">
         <p class="oe_mail_msg oe_mail_msg_p_email_header">
             <t t-if="params.thread_level > 0">
-                <a href="#" class="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>
+                <a href="#" class="oe_mail_oe_internal_link" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
             </t>
         </p>
         <p><span class="oe_mail_oe_bold">From:</span> <t t-esc="record.email_from"/></p>
@@ -169,7 +169,7 @@
             <li>
                 <span class="oe_fade"><t t-raw="record.date"/>
                 <t t-if="record.type != 'email'">
-                    by <a href="#" class="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>
+                    by <a href="#" class="oe_mail_oe_internal_link" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}'><t t-raw="record.user_id[1]"/></a>
                 </t>
                 </span>
             </li>
-- 
cgit v1.2.3


From 22f573850c9fd624da5e5889c715d244f9881163 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 21 Jun 2012 17:24:28 +0200
Subject: [WIP] Thrad widget: work about the composition form widget.

bzr revid: tde@openerp.com-20120621152428-b6bk3o5su63xy9tm
---
 addons/mail/static/src/xml/mail.xml | 38 ++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index aebf842dc13..ec3e3d6b8b2 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -87,8 +87,12 @@
     </t>
 
     <ul t-name="Thread" class="oe_mail oe_mail_thread">
-        <div class="oe_mail_thread_act"></div>
-        <div class="oe_mail_thread_display"></div>
+        <div class="oe_mail_thread_act">
+            <!-- contains the composition form -->
+        </div>
+        <div class="oe_mail_thread_display">
+            <!-- contains the threads -->
+        </div>
         <div class="oe_mail_thread_more">
             <button class="oe_mail_button_more" type="button">Load more messages</button>
         </div>
@@ -98,9 +102,15 @@
         <div t-attf-class="oe_mail_msg_#{record.type}">
             <img class="oe_mail_msg_menu_icon" src="/mail/static/src/img/wheel_menu.png" alt="menu"/>
             <ul class="oe_mail_msg_menu">
-                <t t-if="display['show_delete']"><t t-if="thread._is_author(record.user_id[0])">
-                    <li><a href="#" class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
-                </t></t>
+                <t t-if="display['show_delete']">
+<!--
+                    <t t-if="thread._is_author(record.user_id[0])">
+-->
+                        <li><a href="#" class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
+<!--
+                    </t>
+-->
+                </t>
                 <t t-if="display['show_hide']">
                     <li><a href="#" class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove from Wall</a></li>
                     <li><a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a></li>
@@ -148,12 +158,18 @@
                     <span class="oe_mail_oe_space oe_fade"> · </span>
                 </li>
             </t>
-            <t t-if="display['show_delete']"><t t-if="thread._is_author(record.user_id[0])">
-                <li>
-                    <a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete">Delete</a>
-                    <span class="oe_mail_oe_space oe_fade"> · </span>
-                </li>
-            </t></t>
+            <t t-if="display['show_delete']">
+<!--
+                <t t-if="thread._is_author(record.user_id[0])">
+-->
+                    <li>
+                        <a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_delete">Delete</a>
+                        <span class="oe_mail_oe_space oe_fade"> · </span>
+                    </li>
+<!--
+                </t>
+-->
+            </t>
             <t t-if="display['show_hide']">
                 <li>
                     <a href="#" t-attf-data-id='{record.id}' class="oe_mail_msg_hide">Remove from Wall</a>
-- 
cgit v1.2.3


From 3f25216ed8a3f0ba7d45685af743ba9142f1f10c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 4 Jul 2012 14:10:12 +0200
Subject: [IMP] Mail-Chatter: cleaned xml templates.

bzr revid: tde@openerp.com-20120704121012-x6koqqmz6v6ew7h0
---
 addons/mail/static/src/xml/mail.xml | 46 +++++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 17 deletions(-)

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 71d7a428264..167d6a86f00 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -25,9 +25,8 @@
         </table>
         <div class="oe_mail_wall_main">
             <div class="oe_mail_wall_action">
-                <img class="oe_mail_msg_image oe_left" alt="User img"/>
-                <textarea class="oe_mail oe_mail_wall_action_textarea" placeholder="What are you working on?"/>
-                <button class="oe_right oe_mail_wall_button_comment" type="button">Post comment</button>
+                <!-- call the composition form -->
+                <t t-call ="mail.compose_message"/>
             </div>
             <div class="oe_clear"/>
             <ul class="oe_mail_wall_threads">
@@ -51,7 +50,7 @@
 
     <!--
         record_thread main template
-        Template used to display the communciation history in documents
+        Template used to display the communication history in documents
         form view.
         -->
     <div t-name="mail.record_thread" class="oe_mail_recthread">
@@ -73,32 +72,43 @@
     </div>
 
     <!--
-        record_thread.record_thread template
-        Template used to display subscibers
+        record_thread.subscriber template
+        Template used to display a subscriber.
         -->
     <li t-name="mail.record_thread.subscriber">
-        <img class="oe_mail_oe_left oe_mail_msg_image" t-attf-src="{record.avatar_url}"/>
-        <a href="#" class="oe_mail_oe_internal_link" data-res-model="res.users" t-attf-data-res-id="{record.id}"><t t-raw="record.name"/></a>
+        <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
+        <a t-attf-href="#model=res.users&amp;id=#{record.id}"><t t-raw="record.name"/></a>
     </li>
 
     <!--
-        compose_message template
+        mail.compose_message template
         This template holds the composition form to write a note or send
-        an e-mail.
+        an e-mail. It contains by default a textarea, that will be replaced
+        by another composition form in the main wall composition form, or
+        for main thread composition form in document form view.
         -->
     <t t-name="mail.compose_message">
         <div>
-            <img class="oe_mail_msg_image oe_left" alt="User img"/>
+            <img class="oe_mail_icon oe_mail_frame oe_left" alt="User img"/>
             <div class="oe_mail_msg_content">
                 <!-- contains the composition form -->
+                <!-- default content: old basic textarea -->
+                <textarea class="oe_mail_compose_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/>
             </div>
             <div class="oe_clear"/>
         </div>
     </t>
 
+    <!--
+        thread template
+        This template holds a thread of comments. It begins with an actions
+        container, holding the composition form. Then come the various
+        messages. Then comes the 'more' button.
+        -->
     <ul t-name="mail.thread" class="oe_mail oe_mail_thread">
-        <div class="oe_mail_thread_act">
-            <!-- contains the composition form -->
+        <div class="oe_mail_thread_action">
+            <!-- contains the composition box (form + image) -->
+            <t t-call="mail.compose_message"/>
         </div>
         <div class="oe_mail_thread_display">
             <!-- contains the threads -->
@@ -109,10 +119,11 @@
     </ul>
 
     <!-- default layout -->
-    <div t-name="mail.thread.message" class="oe_mail oe_mail_thread_msg">
+    <li t-name="mail.thread.message" class="oe_mail oe_mail_thread_msg">
         <div t-attf-class="oe_mail_msg_#{record.type}">
-            <img class="oe_email_icon oe_left" t-att-src="record.mini_url"/>
+            <img class="oe_mail_icon oe_left" t-att-src="record.mini_url"/>
             <div class="oe_mail_msg_content">
+                <!-- dropdown menu with message options and actions -->
                 <span class="oe_dropdown_toggle oe_dropdown_arrow">
                     <ul class="oe_dropdown_menu">
                         <t t-if="display['show_delete']">
@@ -131,8 +142,9 @@
                         <li t-if="record.type == 'email'"><a href="#" class="oe_mail_msg_details">Details</a></li>
                     </ul>
                 </span>
+                <!-- message itself -->
                 <div class="oe_mail_msg">
-                    <h1 t-if="record.subject &amp;&amp; record.subject != 'Reply'" class="oe_mail_msg_title">
+                    <h1 t-if="record.subject" class="oe_mail_msg_title">
                         <t t-raw="record.subject"/>
                     </h1>
                     <div t-if="params.thread_level > 0" class="oe_mail_msg_subtitle">
@@ -166,6 +178,6 @@
                 </div>
             </div>
         </div>
-    </div>
+    </li>
 
 </template>
-- 
cgit v1.2.3


From 1d3e3c53faf275ea5847da94350b5417d49a2ba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 10 Jul 2012 15:05:39 +0200
Subject: [IMP] Chatter: added 'Reply' link for emails; replaced some old
 internal_links to new #model ... res_id.

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

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 167d6a86f00..d3b803ecd5d 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -139,6 +139,7 @@
                             <li><a href="#" class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove from Wall</a></li>
                             <li><a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a></li>
                         </t>
+                        <li t-if="record.type == 'email'"><a href="#" t-attf-data-msg_id="{record.id}" class="oe_mail_msg_reply_by_email">Repzefly</a></li>
                         <li t-if="record.type == 'email'"><a href="#" class="oe_mail_msg_details">Details</a></li>
                     </ul>
                 </span>
@@ -148,11 +149,11 @@
                         <t t-raw="record.subject"/>
                     </h1>
                     <div t-if="params.thread_level > 0" class="oe_mail_msg_subtitle">
-                        <a href="#" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}' class="oe_mail_internal_link"><t t-raw="record.record_name"/></a>
+                        <a t-attf-href="#model=#{params.res_model}&amp;id=#{params.res_id}"><t t-raw="record.record_name"/></a>
                     </div>
                     <div class="oe_mail_msg_body">
-                        <a href="#" data-res-model='res.users' t-attf-data-res-id='{record.user_id[0]}' class="oe_mail_internal_link"><t t-raw="record.user_id[1]"/></a>
-                        <t t-raw="record.body"/>
+                        <a t-attf-href="#model=res.users&amp;id=#{record.user_id[0]}"><t t-raw="record.user_id[1]"/></a>
+                        <div class="oe_mail_msg_record_body"><t t-raw="record.body"/></div>
                     </div>
                     <ul class="oe_mail_msg_footer">
                       <li><span t-att-title="record.date"><t t-raw="record.timerelative"/></span></li>
-- 
cgit v1.2.3


From 9d20e26da898f47ff0c57cd256307795782e808f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 11 Jul 2012 11:38:48 +0200
Subject: [IMP] mail-Chatter: cleaned xml for side menu.

bzr revid: tde@openerp.com-20120711093848-wqrq3cc1x26t66ti
---
 addons/mail/static/src/xml/mail.xml | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index d3b803ecd5d..57545b478df 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -127,20 +127,15 @@
                 <span class="oe_dropdown_toggle oe_dropdown_arrow">
                     <ul class="oe_dropdown_menu">
                         <t t-if="display['show_delete']">
-<!--
-                            <t t-if="thread._is_author(record.user_id[0])">
--->
-                            <li><a href="#" class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
-<!--
-                            </t>
--->
-                        </t>
-                        <t t-if="display['show_hide']">
-                            <li><a href="#" class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove from Wall</a></li>
-                            <li><a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a></li>
+                                <li t-if="record.is_author"><a href="#" class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
                         </t>
-                        <li t-if="record.type == 'email'"><a href="#" t-attf-data-msg_id="{record.id}" class="oe_mail_msg_reply_by_email">Repzefly</a></li>
+                        <li t-if="display['show_hide']"><a href="#" class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove from Wall</a></li>
+                        <li t-if="display['show_hide']">
+                            <a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a>
+                        </li>
+                        <li t-if="record.type == 'email'"><a href="#" t-attf-data-msg_id="{record.id}" class="oe_mail_msg_reply_by_email">Reply by email</a></li>
                         <li t-if="record.type == 'email'"><a href="#" class="oe_mail_msg_details">Details</a></li>
+                        <li><a href="#" class="oe_mail_msg_debug">Debug data</a></li>
                     </ul>
                 </span>
                 <!-- message itself -->
-- 
cgit v1.2.3


From 340ca269e4d88450e7d7ecf9313d3a876b18f9d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 11 Jul 2012 11:54:22 +0200
Subject: [IMP] mail: chatter: reply by email not present in Wall.

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

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 57545b478df..7e88e1e5bc7 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -133,7 +133,7 @@
                         <li t-if="display['show_hide']">
                             <a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a>
                         </li>
-                        <li t-if="record.type == 'email'"><a href="#" t-attf-data-msg_id="{record.id}" class="oe_mail_msg_reply_by_email">Reply by email</a></li>
+                        <li t-if="record.type == 'email' &amp;&amp; ! thread.params.is_wall"><a href="#" t-attf-data-msg_id="{record.id}" class="oe_mail_msg_reply_by_email">Reply by email</a></li>
                         <li t-if="record.type == 'email'"><a href="#" class="oe_mail_msg_details">Details</a></li>
                         <li><a href="#" class="oe_mail_msg_debug">Debug data</a></li>
                     </ul>
-- 
cgit v1.2.3


From 537aa86ee2017f53cbddfa0cc2e4ab99ba816d31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 11 Jul 2012 13:17:22 +0200
Subject: [IMP] mail: chatter js: added Debug data link, that toggles a div
 with some info about the message.

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

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 7e88e1e5bc7..4f077d0bc31 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -146,6 +146,21 @@
                     <div t-if="params.thread_level > 0" class="oe_mail_msg_subtitle">
                         <a t-attf-href="#model=#{params.res_model}&amp;id=#{params.res_id}"><t t-raw="record.record_name"/></a>
                     </div>
+                    <ul class="oe_mail_invisible oe_mail_debug">
+                        <li>document: (<t t-raw="record.model"/>,<t t-raw="record.res_id"/>)</li>
+                        <li>id: <t t-raw="record.id"/></li>
+                        <li>type: <t t-raw="record.type"/></li>
+                        <li>content_subtype: <t t-raw="record.content_subtype"/></li>
+                        <li>parent_id: <t t-raw="record.parent_id"/></li>
+                        <li>email_from: <t t-raw="record.email_from"/></li>
+                        <li>email_to: <t t-raw="record.email_to"/></li>
+                        <li>email_cc: <t t-raw="record.email_cc"/></li>
+                        <li>email_bcc: <t t-raw="record.email_bcc"/></li>
+                        <li>reply_to: <t t-raw="record.reply_to"/></li>
+                        <li t-if="record.type == 'email'">message_id: <t t-raw="record.message_id"/></li>
+                        <li t-if="record.type == 'email'">references: <t t-raw="record.references"/></li>
+                    </ul>
+                    <div class="oe_clear"/>
                     <div class="oe_mail_msg_body">
                         <a t-attf-href="#model=res.users&amp;id=#{record.user_id[0]}"><t t-raw="record.user_id[1]"/></a>
                         <div class="oe_mail_msg_record_body"><t t-raw="record.body"/></div>
-- 
cgit v1.2.3


From cac7de515de50da705a3f06f7cd3859066c5d704 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 11 Jul 2012 14:37:13 +0200
Subject: [IMP] mail: chatter: in side-menu, details entry points to the
 message form.

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

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 4f077d0bc31..dac6f467b00 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -134,7 +134,7 @@
                             <a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a>
                         </li>
                         <li t-if="record.type == 'email' &amp;&amp; ! thread.params.is_wall"><a href="#" t-attf-data-msg_id="{record.id}" class="oe_mail_msg_reply_by_email">Reply by email</a></li>
-                        <li t-if="record.type == 'email'"><a href="#" class="oe_mail_msg_details">Details</a></li>
+                        <li t-if="record.type == 'email'"><a t-attf-href="#model=mail.message&amp;id=#{record.id}" class="oe_mail_msg_details">Details</a></li>
                         <li><a href="#" class="oe_mail_msg_debug">Debug data</a></li>
                     </ul>
                 </span>
-- 
cgit v1.2.3


From fa488a48d5dc95547cee6b7f43edae161bc3977d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Wed, 11 Jul 2012 16:32:56 +0200
Subject: [IMP] mail: Chatter: added state in debug info.

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

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index dac6f467b00..156ee5c3d8a 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -151,6 +151,7 @@
                         <li>id: <t t-raw="record.id"/></li>
                         <li>type: <t t-raw="record.type"/></li>
                         <li>content_subtype: <t t-raw="record.content_subtype"/></li>
+                        <li>state: <t t-raw="record.state"/></li>
                         <li>parent_id: <t t-raw="record.parent_id"/></li>
                         <li>email_from: <t t-raw="record.email_from"/></li>
                         <li>email_to: <t t-raw="record.email_to"/></li>
-- 
cgit v1.2.3


From 4d7fc2da177155343a6024f2b054d719a86e79a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 12 Jul 2012 16:18:57 +0200
Subject: [IMP] mail: chatter: composition widget now correctly manage default
 email_mode and formatting values; refactored code related to those options;
 reply is possible for every message, and formatting and email mode taken into
 account accordingly.

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

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 156ee5c3d8a..5cad822992a 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -133,7 +133,7 @@
                         <li t-if="display['show_hide']">
                             <a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a>
                         </li>
-                        <li t-if="record.type == 'email' &amp;&amp; ! thread.params.is_wall"><a href="#" t-attf-data-msg_id="{record.id}" class="oe_mail_msg_reply_by_email">Reply by email</a></li>
+                        <li><a href="#" t-attf-data-msg_id="{record.id}" t-attf-data-type="{record.type}" t-attf-data-formatting="{record.content_subtype}" class="oe_mail_msg_reply_by_email">Reply by email</a></li>
                         <li t-if="record.type == 'email'"><a t-attf-href="#model=mail.message&amp;id=#{record.id}" class="oe_mail_msg_details">Details</a></li>
                         <li><a href="#" class="oe_mail_msg_debug">Debug data</a></li>
                     </ul>
@@ -158,6 +158,7 @@
                         <li>email_cc: <t t-raw="record.email_cc"/></li>
                         <li>email_bcc: <t t-raw="record.email_bcc"/></li>
                         <li>reply_to: <t t-raw="record.reply_to"/></li>
+                        <li>partner_ids: <t t-raw="record.partner_ids"/></li>
                         <li t-if="record.type == 'email'">message_id: <t t-raw="record.message_id"/></li>
                         <li t-if="record.type == 'email'">references: <t t-raw="record.references"/></li>
                     </ul>
-- 
cgit v1.2.3


From 6ab25c220605ec270c47ae24386205632f98eae4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Tue, 17 Jul 2012 13:02:51 +0200
Subject: [REM] mail: removed sbuscription hide mechanism. This will be
 re-implemented in part pi.

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

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 5cad822992a..3693525214f 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -130,9 +130,10 @@
                                 <li t-if="record.is_author"><a href="#" class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
                         </t>
                         <li t-if="display['show_hide']"><a href="#" class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove from Wall</a></li>
+<!--                    Uncomment when adding subtype hiding
                         <li t-if="display['show_hide']">
                             <a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a>
-                        </li>
+                        </li> -->
                         <li><a href="#" t-attf-data-msg_id="{record.id}" t-attf-data-type="{record.type}" t-attf-data-formatting="{record.content_subtype}" class="oe_mail_msg_reply_by_email">Reply by email</a></li>
                         <li t-if="record.type == 'email'"><a t-attf-href="#model=mail.message&amp;id=#{record.id}" class="oe_mail_msg_details">Details</a></li>
                         <li><a href="#" class="oe_mail_msg_debug">Debug data</a></li>
-- 
cgit v1.2.3


From a8ca054cf203ea01656590ee44af8ac2b44fd200 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 20 Jul 2012 15:01:27 +0200
Subject: [CLEAN] mail.js: removed debug data.

bzr revid: tde@openerp.com-20120720130127-7kquweauwh4bv7zi
---
 addons/mail/static/src/xml/mail.xml | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 5d76096fb9a..bf8d7fd1475 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -136,7 +136,6 @@
                         </li> -->
                         <li><a href="#" t-attf-data-msg_id="{record.id}" t-attf-data-type="{record.type}" t-attf-data-formatting="{record.content_subtype}" class="oe_mail_msg_reply_by_email">Reply by email</a></li>
                         <li t-if="record.type == 'email'"><a t-attf-href="#model=mail.message&amp;id=#{record.id}" class="oe_mail_msg_details">Details</a></li>
-                        <li><a href="#" class="oe_mail_msg_debug">Debug data</a></li>
                     </ul>
                 </span>
                 <!-- message itself -->
@@ -147,27 +146,12 @@
                     <div t-if="params.thread_level > 0" class="oe_mail_msg_subtitle">
                         <a t-attf-href="#model=#{params.res_model}&amp;id=#{params.res_id}"><t t-raw="record.record_name"/></a>
                     </div>
-                    <ul class="oe_mail_invisible oe_mail_debug">
-                        <li>document: (<t t-raw="record.model"/>,<t t-raw="record.res_id"/>)</li>
-                        <li>id: <t t-raw="record.id"/></li>
-                        <li>type: <t t-raw="record.type"/></li>
-                        <li>content_subtype: <t t-raw="record.content_subtype"/></li>
-                        <li>state: <t t-raw="record.state"/></li>
-                        <li>parent_id: <t t-raw="record.parent_id"/></li>
-                        <li>email_from: <t t-raw="record.email_from"/></li>
-                        <li>email_to: <t t-raw="record.email_to"/></li>
-                        <li>email_cc: <t t-raw="record.email_cc"/></li>
-                        <li>email_bcc: <t t-raw="record.email_bcc"/></li>
-                        <li>reply_to: <t t-raw="record.reply_to"/></li>
-                        <li>partner_ids: <t t-raw="record.partner_ids"/></li>
-                        <li t-if="record.type == 'email'">message_id: <t t-raw="record.message_id"/></li>
-                        <li t-if="record.type == 'email'">references: <t t-raw="record.references"/></li>
-                    </ul>
                     <div class="oe_clear"/>
                     <div class="oe_mail_msg_body">
                         <a t-attf-href="#model=res.users&amp;id=#{record.user_id[0]}"><t t-raw="record.user_id[1]"/></a>
                         <div class="oe_mail_msg_record_body"><t t-raw="record.body"/></div>
                     </div>
+                    <div class="oe_clear"/>
                     <ul class="oe_mail_msg_footer">
                       <li><span t-att-title="record.date"><t t-raw="record.timerelative"/></span></li>
                       <li t-if="display['show_reply']"><a href="#" class="oe_mail_msg_reply">Reply</a></li>
-- 
cgit v1.2.3


From 83f15b73630a202d250db8d19283bb9bf6435e0b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Mon, 30 Jul 2012 09:52:10 +0200
Subject: small_layout_change_in_wall

bzr revid: fp@openerp.com-20120730075210-mdzu549s018i72rz
---
 addons/mail/static/src/xml/mail.xml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index bf8d7fd1475..86d115f29c8 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -33,7 +33,7 @@
                 <!-- contains threads -->
             </ul>
             <div class="oe_mail_wall_more">
-                <button class="oe_mail_wall_button_more" type="button">See more discussions</button>
+                <button class="oe_mail_wall_button_more" type="button">See more...</button>
             </div>
         </div>
         <div class="oe_mail_wall_aside">
@@ -129,7 +129,7 @@
                         <t t-if="display['show_delete']">
                                 <li t-if="record.is_author"><a href="#" class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
                         </t>
-                        <li t-if="display['show_hide']"><a href="#" class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove from Wall</a></li>
+                        <li t-if="display['show_hide']"><a href="#" class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Hide</a></li>
 <!--                    Uncomment when adding subtype hiding
                         <li t-if="display['show_hide']">
                             <a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a>
@@ -143,16 +143,17 @@
                     <h1 t-if="record.subject" class="oe_mail_msg_title">
                         <t t-raw="record.subject"/>
                     </h1>
-                    <div t-if="params.thread_level > 0" class="oe_mail_msg_subtitle">
-                        <a t-attf-href="#model=#{params.res_model}&amp;id=#{params.res_id}"><t t-raw="record.record_name"/></a>
-                    </div>
-                    <div class="oe_clear"/>
                     <div class="oe_mail_msg_body">
-                        <a t-attf-href="#model=res.users&amp;id=#{record.user_id[0]}"><t t-raw="record.user_id[1]"/></a>
-                        <div class="oe_mail_msg_record_body"><t t-raw="record.body"/></div>
+                        
+                        <div class="oe_mail_msg_record_body">
+                            <a t-attf-href="#model=#{params.res_model}&amp;id=#{params.res_id}" t-if="(params.thread_level > 0) &amp; (!record.subject)"><t t-raw="record.record_name"/></a>
+                            <t t-raw="record.body"/>
+                        </div>
                     </div>
                     <div class="oe_clear"/>
                     <ul class="oe_mail_msg_footer">
+                      <li t-if="record.subject &amp; params.thread_level > 0"><a t-attf-href="#model=#{params.res_model}&amp;id=#{params.res_id}"><t t-raw="record.record_name"/></a></li>
+                      <li><a t-attf-href="#model=res.users&amp;id=#{record.user_id[0]}"><t t-raw="record.user_id[1]"/></a></li>
                       <li><span t-att-title="record.date"><t t-raw="record.timerelative"/></span></li>
                       <li t-if="display['show_reply']"><a href="#" class="oe_mail_msg_reply">Reply</a></li>
                       <!-- uncomment when merging vote
@@ -160,8 +161,8 @@
                       -->
                       <li t-if="record.attachment_ids.length > 0">
                           <a href="#" class="oe_mail_msg_view_attachments">
-                              <t t-if="record.attachment_ids.length == 1">Attachment</t>
-                              <t t-if="record.attachment_ids.length > 1">Attachments (<t t-raw="record.attachment_ids.length"/>)</t>
+                              <t t-if="record.attachment_ids.length == 1">1 Attachment</t>
+                              <t t-if="record.attachment_ids.length > 1"><t t-raw="record.attachment_ids.length"/> Attachments</t>
                           </a>
                       </li>
                     </ul>
-- 
cgit v1.2.3