From 38a28e7ae555694901e3a17a9dc04fbf88da4b3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Wed, 17 Oct 2012 11:43:22 +0200
Subject: [WIP] openchatter: css and dom refactor

bzr revid: fva@openerp.com-20121017094322-h0z9jjuod5q9up1y
---
 addons/mail/static/src/xml/mail.xml | 136 +++++++++++++++---------------------
 1 file changed, 56 insertions(+), 80 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 7ef47986542..14e656cc6fe 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template>
 
+    <!-- this template contains the mail widget and is used to namespace the css -->
+    <t t-name="mail">
+        <div class="oe_mail">
+        </div>
+    </t>
+
     <!--
         mail.compose_message template
         This template holds the composition form to write a note or send
@@ -9,24 +15,22 @@
         for main thread composition form in document form view.
         -->
     <t t-name="mail.compose_message">
-        <div class="oe_mail_compose_textarea">
-            <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 -->
-                <div class="oe_mail_post_header">
-                    <t t-call="mail.thread.list_recipients"/>
-                    <a class="oe_cancel oe_e">X</a>
-                </div>
-                <textarea class="field_text" placeholder="Add your comment here..."/>
-                <div class="oe_mail_post_footer">
-                    <div class="oe_mail_compose_attachment_list"/>
-                    <button class="oe_full">Full mail message</button>
-                    <button class="oe_post">Post message</button>
+        <div class="oe_msg oe_msg_composer">
+            <div class="oe_msg_left">
+                <img class="oe_msg_icon" alt="User img"/>
+            </div>
+            <div class="oe_msg_center">
+                <div class="oe_msg_content">
+                    <textarea class="field_text" placeholder="Add your comment here..."/>
+                </div><div class="oe_msg_footer">
+                    <div class="oe_msg_attachment_list"/>
+                    <button class="oe_post">Post</button>
                     <t t-call="mail.compose_message.add_attachment"/>
+                    <t t-call="mail.thread.list_recipients"/>
+                    <!--<a class="oe_cancel oe_e">X</a>-->
+                    <button class="oe_full oe_right">Full</button>
                 </div>
             </div>
-            <div class="oe_clear"/>
         </div>
     </t>
 
@@ -170,92 +174,64 @@
         </ul>
     </div>
 
-    <!--
-        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.
-        -->
-    <div t-name="mail.thread" class="oe_mail oe_mail_thread oe_semantic_html_override">
-        <div class="oe_mail_thread_action">
-            <!-- contains the composition box (form + image) -->
-        </div>
-        <ul class="oe_mail_thread_display">
-            <!-- contains the threads -->
-        </ul>
+    <div t-name="mail.thread" t-attf-class="oe_thread #{widget.root?'oe_root_thread':''} ">
     </div>
 
     <!-- default layout -->
-    <li t-name="mail.thread.message" t-attf-class="oe_mail oe_mail_thread_msg #{widget.unread?'oe_mail_unread':'oe_mail_read'}">
-        <div t-attf-class="oe_mail_msg_#{widget.type} oe_semantic_html_override">
+    <t t-name="mail.thread.message">
+        <div t-attf-class="oe_msg oe_msg_#{widget.type} oe_msg#{widget.unread?'unread':'read'}">
             <!-- message actions (read/unread, reply, delete...) -->
-            <ul class="oe_header">
-                <li class="placeholder-mail-vote"><t t-call="mail.thread.message.vote"/></li>
-                <li t-if="!widget.options.thread.display_on_flat" title="Read" class="oe_read"><a class="oe_read oe_e">W</a></li>
-                <li t-if="!widget.options.thread.display_on_flat" title="Set back to unread" class="oe_unread"><a class="oe_unread oe_e">h</a></li>
-                <li title="Quick reply"><a class="oe_reply oe_e">)</a></li>
-                <t t-if="(widget.is_author and widget.options.message.show_dd_delete) or widget.type == 'email'">
-                    <li>
-                        <span class="oe_dropdown_toggle">
-                            <a class="oe_e" title="More options">í</a>
-                            <ul class="oe_dropdown_menu">
-                                <li t-if="widget.is_author and widget.options.message.show_dd_delete"><a class="oe_mail_msg_delete">Delete</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='{widget.subtype}'>Hide '<t t-esc="widget.subtype"/>' for this document</a>
-                                </li> -->
-                                <li t-if="widget.type == 'email'"><a class="oe_mail_msg_details" t-attf-href="#model=mail.message&amp;id=#{widget.id}" >Details</a></li>
-                            </ul>
-                        </span>
-                    </li>
-                </t>
-            </ul>
+            <div class='oe_msg_right'>
+                <div class="oe_msg_icons">
+                    <a t-if="!widget.options.thread.display_on_flat" title="Read" class="oe_read oe_e">W</a>
+                    <!--<li t-if="!widget.options.thread.display_on_flat" title="Set back to unread" class="oe_unread"><a class="oe_unread oe_e">h</a></li>-->
+                    <a title="Reply" class="oe_reply oe_e">)</a>
+                </div>
+            </div>
 
-            <a t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}" t-att-title="widget.author_id[1]">
-                <img class="oe_mail_icon oe_mail_frame oe_left" t-att-src="widget.avatar"/>
-            </a>
+            <div class='oe_msg_left'>
+                <a t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}" t-att-title="widget.author_id[1]">
+                    <img class="oe_msg_icon" t-att-src="widget.avatar"/>
+                </a>
+            </div>
 
-            <div class="oe_mail_msg_content">
+            <div class="oe_msg_center">
                 <!-- message itself -->
-                <div class="oe_mail_msg">
-                    <h1 t-if="widget.subject" class="oe_mail_msg_title">
+                <div class="oe_msg_content">
+                    <h1 t-if="widget.subject" class="oe_msg_title">
                         <t t-raw="widget.subject"/>
                     </h1>
-                    <ul class="oe_mail_msg_footer">
-                        <li t-if="widget.author_id"><a t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a></li>
-                        <li><span t-att-title="widget.date"><t t-raw="widget.timerelative"/></span></li>
-                        <li t-if="widget.attachment_ids.length > 0">
-                            <a class="oe_mail_msg_view_attachments">
-                                <t t-if="widget.attachment_ids.length == 1">1 Attachment</t>
-                                <t t-if="widget.attachment_ids.length > 1"><t t-raw="widget.attachment_ids.length"/> Attachments</t>
-                            </a>
-                        </li>
-                    </ul>
-                    <div class="oe_clear"/>
-                    <div class="oe_mail_msg_body">
+                    <div class="oe_msg_body">
                         <t t-if="widget.options.message.show_record_name and widget.record_name and (!widget.subject) and widget.options.thread._parents.length&lt;=widget.options.thread.thread_level and widget.model!='res.partner'">
                             <a class="oe_mail_action_model" t-attf-href="#model=#{widget.model}&amp;id=#{widget.res_id}"><t t-raw="widget.record_name"/></a>
                         </t>
                         <t t-raw="widget.body"/>
                     </div>
                     <t t-if="widget.attachment_ids.length > 0">
-                        <div class="oe_clear"></div>
                         <t t-call="mail.thread.message.attachments"/>
                     </t>
                 </div>
+                <div class="oe_msg_footer">
+                    <a t-if="widget.author_id" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a>
+                    <span t-att-title="widget.date"><t t-raw="widget.timerelative"/></span>
+                        <a t-if="widget.attachment_ids.length > 0" class="oe_mail_msg_view_attachments">
+                            <t t-if="widget.attachment_ids.length == 1">1 Attachment</t>
+                            <t t-if="widget.attachment_ids.length > 1"><t t-raw="widget.attachment_ids.length"/> Attachments</t>
+                        </a>
+                    <t t-call="mail.thread.message.vote"/>
+                </div>
             </div>
         </div>
-        <div class="oe_thread_placeholder"></div>
-    </li>
+    </t>
 
     <!-- expandable message layout -->
-    <li t-name="mail.thread.expandable" class="oe_mail oe_mail_thread_msg oe_mail_unread">
-        <div t-attf-class="oe_mail_msg_#{widget.type} oe_semantic_html_override">
-            <div class="oe_mail_msg_content oe_mail_msg_more_message">
-                <a class="oe_mail_fetch_more">Load more messages <span t-if="widget.nb_messages>0">(<t t-raw="widget.nb_messages"/> messages not display)</span>...</a>
+    <t t-name="mail.thread.expandable">
+        <div t-attf-class="oe_msg oe_msg_#{widget.type} oe_msg_unread">
+            <div class="oe_msg_content oe_msg_more_message">
+                <a class="oe_msg_fetch_more">Load more messages <span t-if="widget.nb_messages>0">(<t t-raw="widget.nb_messages"/> messages not display)</span>...</a>
             </div>
         </div>
-    </li>
+    </t>
 
     <!-- mail.thread.message.vote
         Template used to display Like/Unlike in a mail.message
@@ -270,13 +246,13 @@
                 <t t-esc="widget.vote_user_ids.length"/> people
             </t>
             <t t-if='widget.vote_user_ids.length > 0'>
-                agree
+                concur
             </t>
         </span>
         <button t-attf-class="oe_mail_msg_vote oe_tag">
             <span>
-                <t t-if="!widget.has_voted">Agree</t>
-                <t t-if="widget.has_voted">Unagree</t>
+                <t t-if="!widget.has_voted">Concur</t>
+                <t t-if="widget.has_voted">Respectfully disagree</t>
             </span>
         </button>
     </span>
-- 
cgit v1.2.3


From fc47385ded8680996ecdcaaf622ec27e63514d50 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 17 Oct 2012 15:37:50 +0200
Subject: [IMP]mail: js/dom in progress

bzr revid: chm@openerp.com-20121017133750-rqyyoprdkbg5fcom
---
 addons/mail/static/src/xml/mail.xml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 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 46e438cea51..6e292f147de 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -2,7 +2,7 @@
 <template>
 
     <!-- this template contains the mail widget and is used to namespace the css -->
-    <t t-name="mail">
+    <t t-name="mail.Widget">
         <div class="oe_mail">
         </div>
     </t>
@@ -152,9 +152,9 @@
     <!--
         display message on the wall when there are no message
         -->
-    <li t-name="mail.wall_no_message" class="oe_wall_no_message">
-        You have no messages
-    </li>
+    <t t-name="mail.wall_no_message">
+        <div class="oe_wall_no_message">You have no messages</div>
+    </t>
 
     <!--
         record_thread main template
@@ -168,12 +168,13 @@
         </ul>
     </div>
 
-    <div t-name="mail.thread" t-attf-class="oe_thread #{widget.root?'oe_root_thread':''} ">
-    </div>
+    <t t-name="mail.thread">
+        <div t-attf-class="oe_thread #{widget.root?'oe_root_thread':''}"/>
+    </t>
 
     <!-- default layout -->
     <t t-name="mail.thread.message">
-        <div t-attf-class="oe_msg oe_msg_#{widget.type} oe_msg#{widget.unread?'unread':'read'}">
+        <div t-attf-class="oe_msg oe_msg_#{widget.datasets.type} oe_msg_#{widget.datasets.to_read?'unread':'read'}">
             <!-- message actions (read/unread, reply, delete...) -->
             <div class='oe_msg_right'>
                 <div class="oe_msg_icons">
-- 
cgit v1.2.3


From 241c53ce3621eb05fee55004ed4c3910c2546bf7 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 17 Oct 2012 16:20:05 +0200
Subject: [IMP]mail: js/dom in progress

bzr revid: chm@openerp.com-20121017142005-yoxn406gva3flz3o
---
 addons/mail/static/src/xml/mail.xml | 1 -
 1 file changed, 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 6e292f147de..470478c0c21 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -178,7 +178,6 @@
             <!-- message actions (read/unread, reply, delete...) -->
             <div class='oe_msg_right'>
                 <div class="oe_msg_icons">
-                    <span class="placeholder-mail-vote"><t t-call="mail.thread.message.vote"/></span>
                     <span class="placeholder-mail-star"><t t-call="mail.thread.message.star"/></span>
                     <a t-if="widget.datasets.show_read_unread" title="Read" class="oe_read oe_e">W</a>
                     <a t-if="widget.datasets.show_read_unread" title="Set back to unread" class="oe_unread oe_e">h</a>
-- 
cgit v1.2.3


From de47c4cb526af08382eda3ccb945256682b54337 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 17 Oct 2012 17:03:27 +0200
Subject: [IMP]mail: js/dom in progress

bzr revid: chm@openerp.com-20121017150327-eo8z8kqaa2dnoc10
---
 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 470478c0c21..03603b65a49 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -178,7 +178,7 @@
             <!-- message actions (read/unread, reply, delete...) -->
             <div class='oe_msg_right'>
                 <div class="oe_msg_icons">
-                    <span class="placeholder-mail-star"><t t-call="mail.thread.message.star"/></span>
+                    <t t-call="mail.thread.message.star"/>
                     <a t-if="widget.datasets.show_read_unread" title="Read" class="oe_read oe_e">W</a>
                     <a t-if="widget.datasets.show_read_unread" title="Set back to unread" class="oe_unread oe_e">h</a>
                     <a t-if="widget.datasets.show_reply" title="Reply" class="oe_reply oe_e">)</a>
-- 
cgit v1.2.3


From 81bc720be8c1915f8b8a9d172f06e5309adf0d47 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 17 Oct 2012 17:09:41 +0200
Subject: [IMP]mail: js/dom in progress

bzr revid: chm@openerp.com-20121017150941-bqwwxndhiytcu3pu
---
 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 03603b65a49..4952c72546b 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -59,7 +59,7 @@
         Template used to display attachments in a mail.message
         -->
     <t t-name="mail.thread.message.attachments">
-        <ul t-attf-class="oe_msg_attachments #{widget.datasets.attachment_ids[0] and widget.options.thread.show_attachment_link?'':'oe_hidden'}">
+        <ul t-attf-class="oe_msg_attachments #{widget.datasets.attachment_ids[0]?'':'oe_hidden'}">
             <t t-foreach="widget.datasets.attachment_ids" t-as="attachment">
                 <li>
                     <span t-if="(attachment.upload or attachment.percent_loaded&lt;100)" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}" t-attf-name="{attachment.name || attachment.filename}">
-- 
cgit v1.2.3


From b1f8696c15f7c5c9172f3b70d815a7c8b9a67ed0 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 18 Oct 2012 10:04:11 +0200
Subject: [IMP] mail, openchatter: textarea compact/expandable

bzr revid: chm@openerp.com-20121018080411-xggdwzkvrs7zeojn
---
 addons/mail/static/src/xml/mail.xml | 13 ++++++++++++-
 1 file changed, 12 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 4952c72546b..6a76c7aa323 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -17,7 +17,7 @@
     <t t-name="mail.compose_message">
         <div class="oe_msg oe_msg_composer">
             <div class="oe_msg_left">
-                <img class="oe_msg_icon" alt="User img"/>
+                <img class="oe_msg_icon" alt="User img" t-attf-src="#{widget.datasets.avatar}"/>
             </div>
             <div class="oe_msg_center">
                 <div class="oe_msg_content">
@@ -34,6 +34,17 @@
         </div>
     </t>
 
+    <!--
+        mail.compose_message.compact template
+        This template holds the composition form to write a message, this box is converted into
+        mail.compose_message when focus on textarea
+        -->
+    <t t-name="mail.compose_message.compact">
+        <div class="oe_msg oe_msg_composer_compact">
+            <textarea class="field_text oe_compact" placeholder="Add your comment here..."/>
+        </div>
+    </t>
+
     <!--
         mail.compose_message.add_attachment template
         Small template to be inserted in the composition for add attachments
-- 
cgit v1.2.3


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

bzr revid: fva@openerp.com-20121018120253-mc260x4ljfzrhrsh
---
 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 6a76c7aa323..450e9a834e2 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -246,7 +246,7 @@
         -->
     <t t-name="mail.compose_message.button_top_bar">
         <div class="oe_topbar_compose_full_email">
-            <button class="oe_button oe_highlight">Write an email</button>
+            <!-- <button class="oe_button oe_highlight">Write an email</button> -->
         </div>
     </t>
 
-- 
cgit v1.2.3


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

bzr revid: fva@openerp.com-20121018125328-7oxxd28kbzmm9k03
---
 addons/mail/static/src/xml/mail.xml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 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 450e9a834e2..1980c9661f7 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -185,7 +185,7 @@
 
     <!-- default layout -->
     <t t-name="mail.thread.message">
-        <div t-attf-class="oe_msg oe_msg_#{widget.datasets.type} oe_msg_#{widget.datasets.to_read?'unread':'read'}">
+        <div t-attf-class="oe_msg oe_with_buttons oe_msg_#{widget.datasets.type} oe_msg_#{widget.datasets.to_read?'unread':'read'}">
             <!-- message actions (read/unread, reply, delete...) -->
             <div class='oe_msg_right'>
                 <div class="oe_msg_icons">
@@ -204,7 +204,7 @@
 
             <div class="oe_msg_center">
                 <!-- message itself -->
-                <div class="oe_mail_msg">
+                <div class="oe_msg_content">
                     <h1 t-if="widget.datasets.subject" class="oe_msg_title">
                         <t t-raw="widget.datasets.subject"/>
                     </h1>
@@ -277,10 +277,8 @@
     <!-- mail.thread.message.star
         Template used to display stared/unstared message in a mail.message
     -->
-    <span t-name="mail.thread.message.star">
-        <span class="oe_left">
-            <button t-attf-class="oe_mail_starbox oe_tag #{widget.datasets.has_stared?'oe_stared':''}">*</button>
-        </span>
-    </span>
+    <t t-name="mail.thread.message.star">
+         <a t-attf-class="oe_mail_starbox #{widget.datasets.has_stared?'oe_stared':''}">*</a>
+    </t>
 
 </template>
-- 
cgit v1.2.3


From 0a210d1a353ec565badb81632110aa7507f5c170 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 18 Oct 2012 18:39:23 +0200
Subject: [IMP] mail: improve js for dom css

bzr revid: chm@openerp.com-20121018163923-yk2splqzvnr02q9g
---
 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 1980c9661f7..5008e60a1ed 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -82,7 +82,7 @@
                     <a t-if="(!attachment.upload or attachment.percent_loaded&gt;=100)" t-att-href="attachment.url" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}">
                         <t t-raw="attachment.name || attachment.filename"/>
                     </a>
-                    <t t-if="widget.options.thread.show_attachment_delete and (!attachment.upload or attachment.percent_loaded&gt;=100)">
+                    <t t-if="widget.options.show_attachment_delete and (!attachment.upload or attachment.percent_loaded&gt;=100)">
                         <a class="oe_right oe_mail_attachment_delete" title="Delete this attachment" t-attf-data-id="{attachment.id}">x</a>
                     </t>
 
@@ -209,7 +209,7 @@
                         <t t-raw="widget.datasets.subject"/>
                     </h1>
                     <div class="oe_msg_body">
-                        <t t-if="widget.options.message.show_record_name and widget.datasets.record_name and (!widget.datasets.subject) and !widget.options.thread.thread_level and !widget.options.thread.display_on_thread[0] and widget.datasets.model!='res.partner'">
+                        <t t-if="widget.options.show_record_name and widget.datasets.record_name and (!widget.datasets.subject) and !widget.options.thread_level and !widget.options.display_on_thread[0] and widget.datasets.model!='res.partner'">
                             <a class="oe_mail_action_model" t-attf-href="#model=#{widget.datasets.model}&amp;id=#{widget.datasets.res_id}"><t t-raw="widget.datasets.record_name"/></a>
                         </t>
                         <t t-raw="widget.datasets.body"/>
-- 
cgit v1.2.3


From 7de23b01f540d52811e9263fa453831219515605 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 19 Oct 2012 12:21:17 +0200
Subject: [IMP] mail: auto open and close the compose form on the threads

bzr revid: chm@openerp.com-20121019102117-rzpdmkrbi7xhynpf
---
 addons/mail/static/src/xml/mail.xml | 13 +++++++------
 1 file changed, 7 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 651f0588868..f8c4ce92d1c 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -190,9 +190,9 @@
             <div class='oe_msg_right'>
                 <div class="oe_msg_icons">
                     <t t-call="mail.thread.message.star"/>
-                    <a t-if="widget.datasets.show_read_unread" title="Read" class="oe_read oe_e">W</a>
-                    <a t-if="widget.datasets.show_read_unread" title="Set back to unread" class="oe_unread oe_e">h</a>
-                    <a t-if="widget.datasets.show_reply" title="Reply" class="oe_reply oe_e">)</a>
+                    <a t-if="widget.datasets.show_read_unread_button" title="Read" class="oe_read oe_e">W</a>
+                    <a t-if="widget.datasets.show_read_unread_button" title="Set back to unread" class="oe_unread oe_e">h</a>
+                    <a t-if="widget.datasets.show_reply_button" title="Reply" class="oe_reply oe_e">)</a>
                 </div>
             </div>
 
@@ -258,11 +258,12 @@
             <t t-if='widget.datasets.has_voted'>
                 You
             </t>
-            <t t-if='(widget.datasets.vote_user_ids.length-(widget.datasets.has_voted?1:0)) > 0'>
+            <t t-if='(widget.datasets.vote_nb - (widget.datasets.has_voted ? 1 : 0)) > 0'>
                 <t t-if='widget.datasets.has_voted'> and </t>
-                <t t-esc="widget.datasets.vote_user_ids.length"/> people
+                <t t-esc="widget.datasets.vote_nb"/> people
             </t>
-            <t t-if='widget.datasets.vote_user_ids.length > 0'>
+            <t t-if='(widget.datasets.vote_nb - (widget.datasets.has_voted ? 1 : 0)) > 0'>
+                <t t-raw="(widget.datasets.vote_nb - (widget.datasets.has_voted ? 1 : 0))"/>
                 concur
             </t>
         </span>
-- 
cgit v1.2.3


From dfa34c02540cbb84ad6018ad62582574c4e959b9 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 19 Oct 2012 13:39:51 +0200
Subject: [IMP] mail: auto open and close the compose form on the threads

bzr revid: chm@openerp.com-20121019113951-pz44iipv45misvgk
---
 addons/mail/static/src/xml/mail.xml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 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 651f0588868..db3fb5050c9 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -174,9 +174,9 @@
         -->
     <div t-name="mail.record_thread" class="oe_mail_record_wall">
         <!-- <h4>History and Comments</h4> -->
-        <ul class="oe_mail_wall_threads">
+        <div class="oe_mail_wall_threads">
             <!-- contains the document thread -->
-        </ul>
+        </div>
     </div>
 
     <t t-name="mail.thread">
@@ -190,9 +190,9 @@
             <div class='oe_msg_right'>
                 <div class="oe_msg_icons">
                     <t t-call="mail.thread.message.star"/>
-                    <a t-if="widget.datasets.show_read_unread" title="Read" class="oe_read oe_e">W</a>
-                    <a t-if="widget.datasets.show_read_unread" title="Set back to unread" class="oe_unread oe_e">h</a>
-                    <a t-if="widget.datasets.show_reply" title="Reply" class="oe_reply oe_e">)</a>
+                    <a t-if="widget.datasets.show_read_unread_button" title="Read" class="oe_read oe_e">W</a>
+                    <a t-if="widget.datasets.show_read_unread_button" title="Set back to unread" class="oe_unread oe_e">h</a>
+                    <a t-if="widget.datasets.show_reply_button" title="Reply" class="oe_reply oe_e">)</a>
                 </div>
             </div>
 
@@ -258,11 +258,12 @@
             <t t-if='widget.datasets.has_voted'>
                 You
             </t>
-            <t t-if='(widget.datasets.vote_user_ids.length-(widget.datasets.has_voted?1:0)) > 0'>
+            <t t-if='(widget.datasets.vote_nb - (widget.datasets.has_voted ? 1 : 0)) > 0'>
                 <t t-if='widget.datasets.has_voted'> and </t>
-                <t t-esc="widget.datasets.vote_user_ids.length"/> people
+                <t t-esc="widget.datasets.vote_nb"/> people
             </t>
-            <t t-if='widget.datasets.vote_user_ids.length > 0'>
+            <t t-if='(widget.datasets.vote_nb - (widget.datasets.has_voted ? 1 : 0)) > 0'>
+                <t t-raw="(widget.datasets.vote_nb - (widget.datasets.has_voted ? 1 : 0))"/>
                 concur
             </t>
         </span>
-- 
cgit v1.2.3


From 9bcada763f0fc09a2a943bcae8bfd199d51f6226 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Fri, 19 Oct 2012 13:40:39 +0200
Subject: [WIP] mail: css of right buttons

bzr revid: fva@openerp.com-20121019114039-x442lscvj2oggyja
---
 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 f8c4ce92d1c..f6e69bc0ac8 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -185,7 +185,7 @@
 
     <!-- default layout -->
     <t t-name="mail.thread.message">
-        <div t-attf-class="oe_msg oe_with_buttons oe_msg_#{widget.datasets.type} oe_msg_#{widget.datasets.to_read?'unread':'read'}">
+        <div t-attf-class="oe_msg oe_msg_#{widget.datasets.type} oe_msg_#{widget.datasets.to_read?'unread':'read'}">
             <!-- message actions (read/unread, reply, delete...) -->
             <div class='oe_msg_right'>
                 <div class="oe_msg_icons">
-- 
cgit v1.2.3


From 63d5acfa6b1a1a910d173e980edc7b2b66eae212 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Fri, 19 Oct 2012 15:32:05 +0200
Subject: [IMP] mail: buttons are at the right place

bzr revid: fva@openerp.com-20121019133205-06uavw1esxh5our5
---
 addons/mail/static/src/xml/mail.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 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 f6e69bc0ac8..39cd5bbce38 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -185,14 +185,14 @@
 
     <!-- default layout -->
     <t t-name="mail.thread.message">
-        <div t-attf-class="oe_msg oe_msg_#{widget.datasets.type} oe_msg_#{widget.datasets.to_read?'unread':'read'}">
+        <div t-attf-class="oe_msg oe_lvl_#{widget.datasets.thread_level} oe_msg_#{widget.datasets.type} oe_msg_#{widget.datasets.to_read?'unread':'read'}">
             <!-- message actions (read/unread, reply, delete...) -->
             <div class='oe_msg_right'>
                 <div class="oe_msg_icons">
                     <t t-call="mail.thread.message.star"/>
-                    <a t-if="widget.datasets.show_read_unread_button" title="Read" class="oe_read oe_e">W</a>
-                    <a t-if="widget.datasets.show_read_unread_button" title="Set back to unread" class="oe_unread oe_e">h</a>
-                    <a t-if="widget.datasets.show_reply_button" title="Reply" class="oe_reply oe_e">)</a>
+                    <span class='oe_read' t-if="widget.datasets.show_read_unread_button"><a title="Read" class="oe_e">W</a></span>
+                    <span class='oe_unread' t-if="widget.datasets.show_read_unread_button"><a title="Set back to unread" class="oe_e">h</a></span>
+                    <span class='oe_reply' t-if="widget.datasets.show_reply_button"><a title="Reply" class="oe_e">)</a></span>
                 </div>
             </div>
 
@@ -279,6 +279,6 @@
         Template used to display stared/unstared message in a mail.message
     -->
     <t t-name="mail.thread.message.star">
-         <a t-attf-class="oe_mail_starbox #{widget.datasets.has_stared?'oe_stared':''}">*</a>
+        <span><a t-attf-class="oe_mail_starbox #{widget.datasets.has_stared?'oe_stared':''}">*</a></span>
     </t>
 </template>
-- 
cgit v1.2.3


From 9daba198cd5b79c093ef8a14c9c3d7797e9108c5 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 19 Oct 2012 16:32:28 +0200
Subject: [IMP] mail: reduce code js

bzr revid: chm@openerp.com-20121019143228-rzc4k2s7pxa0glk9
---
 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 db3fb5050c9..54dbc4f9ded 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -82,7 +82,7 @@
                     <a t-if="(!attachment.upload or attachment.percent_loaded&gt;=100)" t-att-href="attachment.url" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}">
                         <t t-raw="attachment.name || attachment.filename"/>
                     </a>
-                    <t t-if="widget.options.show_attachment_delete and (!attachment.upload or attachment.percent_loaded&gt;=100)">
+                    <t t-if="(!attachment.upload or attachment.percent_loaded&gt;=100)">
                         <a class="oe_right oe_mail_attachment_delete" title="Delete this attachment" t-attf-data-id="{attachment.id}">x</a>
                     </t>
 
-- 
cgit v1.2.3


From 7c842393f8b6c9687a378102e33005fef04bae9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Fri, 19 Oct 2012 18:03:11 +0200
Subject: [IMP] mail: a more minimalist design

bzr revid: fva@openerp.com-20121019160311-ssqosr9wdkmcmeaw
---
 addons/mail/static/src/xml/mail.xml | 4 +++-
 1 file changed, 3 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 39cd5bbce38..50247fd6164 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -219,7 +219,7 @@
                     </t>
                 </div>
                 <div class="oe_msg_footer">
-                    <a t-if="widget.datasets.author_id" t-attf-href="#model=res.partner&amp;id=#{widget.datasets.author_id[0]}"><t t-raw="widget.datasets.author_id[1]"/></a>
+                    from <a t-if="widget.datasets.author_id" t-attf-href="#model=res.partner&amp;id=#{widget.datasets.author_id[0]}"><t t-raw="widget.datasets.author_id[1]"/></a>
                     <span t-att-title="widget.datasets.date"><t t-raw="widget.datasets.timerelative"/></span>
                         <a t-if="widget.datasets.attachment_ids.length > 0" class="oe_mail_msg_view_attachments">
                             <t t-if="widget.datasets.attachment_ids.length == 1">1 Attachment</t>
@@ -254,6 +254,7 @@
         Template used to display Like/Unlike in a mail.message
     -->
     <span t-name="mail.thread.message.vote">
+        <!--
         <span class="oe_left oe_mail_vote_count">
             <t t-if='widget.datasets.has_voted'>
                 You
@@ -273,6 +274,7 @@
                 <t t-if="widget.datasets.has_voted">Respectfully disagree</t>
             </span>
         </button>
+        -->
     </span>
 
     <!-- mail.thread.message.star
-- 
cgit v1.2.3


From 5bd53c249791473013bbcd53d03dd30f3736ac73 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 22 Oct 2012 10:10:48 +0200
Subject: [IMP] mail.js: delete datasets

bzr revid: chm@openerp.com-20121022081048-5ohjli1c3io3iv1b
---
 addons/mail/static/src/xml/mail.xml | 72 ++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 36 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 54dbc4f9ded..07fefa0304b 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -17,7 +17,7 @@
     <t t-name="mail.compose_message">
         <div class="oe_msg oe_msg_composer">
             <div class="oe_msg_left">
-                <img class="oe_msg_icon" alt="User img" t-attf-src="#{widget.datasets.avatar}"/>
+                <img class="oe_msg_icon" alt="User img" t-attf-src="#{widget.avatar}"/>
             </div>
             <div class="oe_msg_center">
                 <div class="oe_msg_content">
@@ -70,8 +70,8 @@
         Template used to display attachments in a mail.message
         -->
     <t t-name="mail.thread.message.attachments">
-        <ul t-attf-class="oe_msg_attachments #{widget.datasets.attachment_ids[0]?'':'oe_hidden'}">
-            <t t-foreach="widget.datasets.attachment_ids" t-as="attachment">
+        <ul t-attf-class="oe_msg_attachments #{widget.attachment_ids[0]?'':'oe_hidden'}">
+            <t t-foreach="widget.attachment_ids" t-as="attachment">
                 <li>
                     <span t-if="(attachment.upload or attachment.percent_loaded&lt;100)" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}" t-attf-name="{attachment.name || attachment.filename}">
                         <div class="oe_upload_in_process">
@@ -105,13 +105,13 @@
     <t t-name="mail.thread.list_recipients">
         <div class="oe_mail_list_recipients">
             Post to:
-            <span t-if="!widget.datasets.is_private" class="oe_all_follower">All Followers</span> 
-            <t t-if="!widget.datasets.is_private and widget.datasets.partner_ids.length"> and </t>
+            <span t-if="!widget.is_private" class="oe_all_follower">All Followers</span> 
+            <t t-if="!widget.is_private and widget.partner_ids.length"> and </t>
             <t t-set="inc" t-value="0"/>
-            <t t-if="widget.datasets.partner_ids.length" t-foreach="widget.datasets.partner_ids" t-as="partner"><span t-attf-class="oe_partner_follower #{inc>=3?'oe_hidden':''}"><t t-if="inc" t-raw="', '"/><a t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a></span><t t-set="inc" t-value="inc+1"/>
+            <t t-if="widget.partner_ids.length" t-foreach="widget.partner_ids" t-as="partner"><span t-attf-class="oe_partner_follower #{inc>=3?'oe_hidden':''}"><t t-if="inc" t-raw="', '"/><a t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a></span><t t-set="inc" t-value="inc+1"/>
             </t>
-            <t t-if="widget.datasets.partner_ids.length>=3">
-                <span class="oe_more">, <a><t t-raw="widget.datasets.partner_ids.length-3"/> others...</a></span>
+            <t t-if="widget.partner_ids.length>=3">
+                <span class="oe_more">, <a><t t-raw="widget.partner_ids.length-3"/> others...</a></span>
                 <a class="oe_more_hidden">&lt;&lt;&lt;</a>
             </t>
         </div>
@@ -185,45 +185,45 @@
 
     <!-- default layout -->
     <t t-name="mail.thread.message">
-        <div t-attf-class="oe_msg oe_with_buttons oe_msg_#{widget.datasets.type} oe_msg_#{widget.datasets.to_read?'unread':'read'}">
+        <div t-attf-class="oe_msg oe_with_buttons oe_msg_#{widget.type} oe_msg_#{widget.to_read?'unread':'read'}">
             <!-- message actions (read/unread, reply, delete...) -->
             <div class='oe_msg_right'>
                 <div class="oe_msg_icons">
                     <t t-call="mail.thread.message.star"/>
-                    <a t-if="widget.datasets.show_read_unread_button" title="Read" class="oe_read oe_e">W</a>
-                    <a t-if="widget.datasets.show_read_unread_button" title="Set back to unread" class="oe_unread oe_e">h</a>
-                    <a t-if="widget.datasets.show_reply_button" title="Reply" class="oe_reply oe_e">)</a>
+                    <a t-if="widget.show_read_unread_button" title="Read" class="oe_read oe_e">W</a>
+                    <a t-if="widget.show_read_unread_button" title="Set back to unread" class="oe_unread oe_e">h</a>
+                    <a t-if="widget.show_reply_button" title="Reply" class="oe_reply oe_e">)</a>
                 </div>
             </div>
 
             <div class='oe_msg_left'>
-                <a t-attf-href="#model=res.partner&amp;id=#{widget.datasets.author_id[0]}" t-att-title="widget.datasets.author_id[1]">
-                    <img class="oe_msg_icon" t-att-src="widget.datasets.avatar"/>
+                <a t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}" t-att-title="widget.author_id[1]">
+                    <img class="oe_msg_icon" t-att-src="widget.avatar"/>
                 </a>
             </div>
 
             <div class="oe_msg_center">
                 <!-- message itself -->
                 <div class="oe_msg_content">
-                    <h1 t-if="widget.datasets.subject" class="oe_msg_title">
-                        <t t-raw="widget.datasets.subject"/>
+                    <h1 t-if="widget.subject" class="oe_msg_title">
+                        <t t-raw="widget.subject"/>
                     </h1>
                     <div class="oe_msg_body">
-                        <t t-if="widget.options.show_record_name and widget.datasets.record_name and (!widget.datasets.subject) and !widget.options.thread_level and !widget.options.display_on_thread[0] and widget.datasets.model!='res.partner'">
-                            <a class="oe_mail_action_model" t-attf-href="#model=#{widget.datasets.model}&amp;id=#{widget.datasets.res_id}"><t t-raw="widget.datasets.record_name"/></a>
+                        <t t-if="widget.options.show_record_name and widget.record_name and (!widget.subject) and !widget.options.thread_level and !widget.options.display_on_thread[0] and widget.model!='res.partner'">
+                            <a class="oe_mail_action_model" t-attf-href="#model=#{widget.model}&amp;id=#{widget.res_id}"><t t-raw="widget.record_name"/></a>
                         </t>
-                        <t t-raw="widget.datasets.body"/>
+                        <t t-raw="widget.body"/>
                     </div>
-                    <t t-if="widget.datasets.attachment_ids.length > 0">
+                    <t t-if="widget.attachment_ids.length > 0">
                         <t t-call="mail.thread.message.attachments"/>
                     </t>
                 </div>
                 <div class="oe_msg_footer">
-                    <a t-if="widget.datasets.author_id" t-attf-href="#model=res.partner&amp;id=#{widget.datasets.author_id[0]}"><t t-raw="widget.datasets.author_id[1]"/></a>
-                    <span t-att-title="widget.datasets.date"><t t-raw="widget.datasets.timerelative"/></span>
-                        <a t-if="widget.datasets.attachment_ids.length > 0" class="oe_mail_msg_view_attachments">
-                            <t t-if="widget.datasets.attachment_ids.length == 1">1 Attachment</t>
-                            <t t-if="widget.datasets.attachment_ids.length > 1"><t t-raw="widget.datasets.attachment_ids.length"/> Attachments</t>
+                    <a t-if="widget.author_id" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a>
+                    <span t-att-title="widget.date"><t t-raw="widget.timerelative"/></span>
+                        <a t-if="widget.attachment_ids.length > 0" class="oe_mail_msg_view_attachments">
+                            <t t-if="widget.attachment_ids.length == 1">1 Attachment</t>
+                            <t t-if="widget.attachment_ids.length > 1"><t t-raw="widget.attachment_ids.length"/> Attachments</t>
                         </a>
                     <t t-call="mail.thread.message.vote"/>
                 </div>
@@ -233,9 +233,9 @@
 
     <!-- expandable message layout -->
     <t t-name="mail.thread.expandable">
-        <div t-attf-class="oe_msg oe_msg_#{widget.datasets.type} oe_msg_unread">
+        <div t-attf-class="oe_msg oe_msg_#{widget.type} oe_msg_unread">
             <div class="oe_msg_content oe_msg_more_message">
-                <a class="oe_msg_fetch_more">Load more messages <span t-if="widget.datasets.nb_messages>0">(<t t-raw="widget.datasets.nb_messages"/> messages not display)</span>...</a>
+                <a class="oe_msg_fetch_more">Load more messages <span t-if="widget.nb_messages>0">(<t t-raw="widget.nb_messages"/> messages not display)</span>...</a>
             </div>
         </div>
     </t>
@@ -255,22 +255,22 @@
     -->
     <span t-name="mail.thread.message.vote">
         <span class="oe_left oe_mail_vote_count">
-            <t t-if='widget.datasets.has_voted'>
+            <t t-if='widget.has_voted'>
                 You
             </t>
-            <t t-if='(widget.datasets.vote_nb - (widget.datasets.has_voted ? 1 : 0)) > 0'>
-                <t t-if='widget.datasets.has_voted'> and </t>
-                <t t-esc="widget.datasets.vote_nb"/> people
+            <t t-if='(widget.vote_nb - (widget.has_voted ? 1 : 0)) > 0'>
+                <t t-if='widget.has_voted'> and </t>
+                <t t-esc="widget.vote_nb"/> people
             </t>
-            <t t-if='(widget.datasets.vote_nb - (widget.datasets.has_voted ? 1 : 0)) > 0'>
-                <t t-raw="(widget.datasets.vote_nb - (widget.datasets.has_voted ? 1 : 0))"/>
+            <t t-if='(widget.vote_nb - (widget.has_voted ? 1 : 0)) > 0'>
+                <t t-raw="(widget.vote_nb - (widget.has_voted ? 1 : 0))"/>
                 concur
             </t>
         </span>
         <button t-attf-class="oe_msg_vote oe_tag">
             <span>
-                <t t-if="!widget.datasets.has_voted">Concur</t>
-                <t t-if="widget.datasets.has_voted">Respectfully disagree</t>
+                <t t-if="!widget.has_voted">Concur</t>
+                <t t-if="widget.has_voted">Respectfully disagree</t>
             </span>
         </button>
     </span>
@@ -279,6 +279,6 @@
         Template used to display stared/unstared message in a mail.message
     -->
     <t t-name="mail.thread.message.star">
-         <a t-attf-class="oe_mail_starbox #{widget.datasets.has_stared?'oe_stared':''}">*</a>
+         <a t-attf-class="oe_mail_starbox #{widget.has_stared?'oe_stared':''}">*</a>
     </t>
 </template>
-- 
cgit v1.2.3


From ef906635277ba643d212344b4b3c4ae019ca79eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Mon, 22 Oct 2012 12:17:40 +0200
Subject: [IMP] mail: reordered mail icons, made lvl>0 message more compact

bzr revid: fva@openerp.com-20121022101740-5406solezsuvthr9
---
 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 50247fd6164..01cdb9b629e 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -189,10 +189,10 @@
             <!-- message actions (read/unread, reply, delete...) -->
             <div class='oe_msg_right'>
                 <div class="oe_msg_icons">
-                    <t t-call="mail.thread.message.star"/>
-                    <span class='oe_read' t-if="widget.datasets.show_read_unread_button"><a title="Read" class="oe_e">W</a></span>
-                    <span class='oe_unread' t-if="widget.datasets.show_read_unread_button"><a title="Set back to unread" class="oe_e">h</a></span>
+                    <span class='oe_unread' t-if="widget.datasets.show_read_unread_button"><a title="Read" class="oe_e">W</a></span>
+                    <span class='oe_read' t-if="widget.datasets.show_read_unread_button"><a title="Set back to unread" class="oe_e">h</a></span>
                     <span class='oe_reply' t-if="widget.datasets.show_reply_button"><a title="Reply" class="oe_e">)</a></span>
+                    <t t-call="mail.thread.message.star"/>
                 </div>
             </div>
 
-- 
cgit v1.2.3


From 09d5c74d95c6db0a2247c131d15ca17725b73c46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Mon, 22 Oct 2012 14:58:42 +0200
Subject: [IMP] mail: nice colors for the message icons

bzr revid: fva@openerp.com-20121022125842-2t4m6axslu8tln8w
---
 addons/mail/static/src/xml/mail.xml | 17 ++++++-----------
 1 file changed, 6 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 01cdb9b629e..614a3b5c325 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -187,14 +187,6 @@
     <t t-name="mail.thread.message">
         <div t-attf-class="oe_msg oe_lvl_#{widget.datasets.thread_level} oe_msg_#{widget.datasets.type} oe_msg_#{widget.datasets.to_read?'unread':'read'}">
             <!-- message actions (read/unread, reply, delete...) -->
-            <div class='oe_msg_right'>
-                <div class="oe_msg_icons">
-                    <span class='oe_unread' t-if="widget.datasets.show_read_unread_button"><a title="Read" class="oe_e">W</a></span>
-                    <span class='oe_read' t-if="widget.datasets.show_read_unread_button"><a title="Set back to unread" class="oe_e">h</a></span>
-                    <span class='oe_reply' t-if="widget.datasets.show_reply_button"><a title="Reply" class="oe_e">)</a></span>
-                    <t t-call="mail.thread.message.star"/>
-                </div>
-            </div>
 
             <div class='oe_msg_left'>
                 <a t-attf-href="#model=res.partner&amp;id=#{widget.datasets.author_id[0]}" t-att-title="widget.datasets.author_id[1]">
@@ -203,6 +195,12 @@
             </div>
 
             <div class="oe_msg_center">
+                <div class='oe_msg_icons'>
+                    <span class='oe_read' t-if="widget.datasets.show_read_unread_button"><a title="Read" class="oe_e">W</a></span>
+                    <span class='oe_unread' t-if="widget.datasets.show_read_unread_button"><a title="Set back to unread" class="oe_e">W</a></span>
+                    <span class='oe_reply' t-if="widget.datasets.show_reply_button"><a title="Reply" class="oe_e">(</a></span>
+                    <span class='oe_star'><a t-attf-class="oe_e oe_mail_starbox #{widget.datasets.has_stared?'oe_stared':''}">7</a></span>
+                </div>
                 <!-- message itself -->
                 <div class="oe_msg_content">
                     <h1 t-if="widget.datasets.subject" class="oe_msg_title">
@@ -280,7 +278,4 @@
     <!-- mail.thread.message.star
         Template used to display stared/unstared message in a mail.message
     -->
-    <t t-name="mail.thread.message.star">
-        <span><a t-attf-class="oe_mail_starbox #{widget.datasets.has_stared?'oe_stared':''}">*</a></span>
-    </t>
 </template>
-- 
cgit v1.2.3


From 739694db06c0f25277eab0404cd43f2e943af410 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 22 Oct 2012 15:32:47 +0200
Subject: [IMP] mail: concat expandable messages

bzr revid: chm@openerp.com-20121022133247-oen01b8ozq2cozhk
---
 addons/mail/static/src/xml/mail.xml | 3 +--
 1 file changed, 1 insertion(+), 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 07fefa0304b..a1c5169ad36 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -82,10 +82,9 @@
                     <a t-if="(!attachment.upload or attachment.percent_loaded&gt;=100)" t-att-href="attachment.url" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}">
                         <t t-raw="attachment.name || attachment.filename"/>
                     </a>
-                    <t t-if="(!attachment.upload or attachment.percent_loaded&gt;=100)">
+                    <t t-if="(widget.show_delete_attachment and (!attachment.upload or attachment.percent_loaded&gt;=100))">
                         <a class="oe_right oe_mail_attachment_delete" title="Delete this attachment" t-attf-data-id="{attachment.id}">x</a>
                     </t>
-
                 </li>
             </t>
         </ul>
-- 
cgit v1.2.3


From eaa40d0c0cc8f6eaeeacca7aec3e7fae8382a1d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Mon, 22 Oct 2012 16:19:32 +0200
Subject: [IMP] further work on the icons

bzr revid: fva@openerp.com-20121022141932-xbdorr3287748zfw
---
 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 2c92aabfde5..a4fbaa71305 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -197,7 +197,7 @@
                     <span class='oe_read' t-if="widget.show_read_unread_button"><a title="Read" class="oe_e">W</a></span>
                     <span class='oe_unread' t-if="widget.show_read_unread_button"><a title="Set back to unread" class="oe_e">W</a></span>
                     <span class='oe_reply' t-if="widget.show_reply_button"><a title="Reply" class="oe_e">(</a></span>
-                    <span class='oe_star'><a t-attf-class="oe_e oe_mail_starbox #{widget.has_stared?'oe_stared':''}">7</a></span>
+                    <span t-attf-class="oe_star #{widget.is_favorite?'oe_starred':''}"><a title="Add To Favorites" class="oe_e">7</a></span>
                 </div>
                 <!-- message itself -->
                 <div class="oe_msg_content">
-- 
cgit v1.2.3


From fb1a0088572e4eef11653afae5d609066a48d7a8 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 22 Oct 2012 16:48:34 +0200
Subject: [IMP] mail: indented DOM class

bzr revid: chm@openerp.com-20121022144834-qqnk9etnfuyr25fr
---
 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 a4fbaa71305..1d5f3a9e239 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -184,7 +184,7 @@
 
     <!-- default layout -->
     <t t-name="mail.thread.message">
-        <div t-attf-class="oe_msg oe_lvl_#{widget.thread_level} oe_msg_#{widget.type} oe_msg_#{widget.to_read?'unread':'read'}">
+        <div t-attf-class="oe_msg #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''} oe_msg_#{widget.type} oe_msg_#{widget.to_read?'unread':'read'}">
 
             <div class='oe_msg_left'>
                 <a t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}" t-att-title="widget.author_id[1]">
-- 
cgit v1.2.3


From 57039657e49644e950881598c2a0c949d19cf26b Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 23 Oct 2012 09:42:42 +0200
Subject: [IMP] mail: get message_ids list on the current model

bzr revid: chm@openerp.com-20121023074242-u43ibl6bvfp31st6
---
 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 1d5f3a9e239..a361daae154 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -145,6 +145,7 @@
                     <button type="button" class="oe_write_full oe_highlight">
                         Compose a new message
                     </button>
+                    or
                     <button type="button" class="oe_write_onwall" help="Your followers can read this message">
                         Write to your followers
                     </button>
-- 
cgit v1.2.3


From 1e543551be1323470901121f8186bdf126ed4621 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Tue, 23 Oct 2012 11:32:35 +0200
Subject: [IMP] mail: moved buttons around, styled the more-message button

bzr revid: fva@openerp.com-20121023093235-s1y9903oxvhu89c4
---
 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 1d5f3a9e239..2ade728426e 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -194,8 +194,8 @@
 
             <div class="oe_msg_center">
                 <div class='oe_msg_icons'>
-                    <span class='oe_read' t-if="widget.show_read_unread_button"><a title="Read" class="oe_e">W</a></span>
-                    <span class='oe_unread' t-if="widget.show_read_unread_button"><a title="Set back to unread" class="oe_e">W</a></span>
+                    <span class='oe_read' t-if="widget.show_read_unread_button"><a title="Read" class="oe_e">X</a></span>
+                    <span class='oe_unread' t-if="widget.show_read_unread_button"><a title="Set back to unread" class="oe_e">v</a></span>
                     <span class='oe_reply' t-if="widget.show_reply_button"><a title="Reply" class="oe_e">(</a></span>
                     <span t-attf-class="oe_star #{widget.is_favorite?'oe_starred':''}"><a title="Add To Favorites" class="oe_e">7</a></span>
                 </div>
@@ -231,7 +231,8 @@
     <t t-name="mail.thread.expandable">
         <div t-attf-class="oe_msg oe_msg_#{widget.type} oe_msg_unread">
             <div class="oe_msg_content oe_msg_more_message">
-                <a class="oe_msg_fetch_more">Load more messages <span t-if="widget.nb_messages>0">(<t t-raw="widget.nb_messages"/> messages not display)</span>...</a>
+                <a t-if="widget.nb_messages === 1" class="oe_msg_fetch_more">load one more message</a>
+                <a t-if="widget.nb_messages !== 1" class="oe_msg_fetch_more">load <t t-raw="widget.nb_messages" /> more messages</a>
             </div>
         </div>
     </t>
-- 
cgit v1.2.3


From 5ca5acef4119b41650efb494b321fc9c2393882d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Tue, 23 Oct 2012 17:58:27 +0200
Subject: [IMP] mail: mail composer design

bzr revid: fva@openerp.com-20121023155827-au8m4bzz3hlfie3v
---
 addons/mail/static/src/xml/mail.xml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 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 64cde6e9337..125376deb57 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -21,14 +21,14 @@
             </div>
             <div class="oe_msg_center">
                 <div class="oe_msg_content">
-                    <textarea class="field_text" placeholder="Add your comment here..."/>
+                    <t t-call="mail.thread.list_recipients"/>
+                    <textarea class="field_text" placeholder=""/>
                 </div><div class="oe_msg_footer">
                     <div class="oe_msg_attachment_list"/>
                     <button class="oe_post">Post</button>
                     <t t-call="mail.compose_message.add_attachment"/>
-                    <t t-call="mail.thread.list_recipients"/>
                     <!--<a class="oe_cancel oe_e">X</a>-->
-                    <button class="oe_full oe_right">Full</button>
+                    <button class="oe_full"><span class='oe_e'>&amp;ograve</span></button>
                 </div>
             </div>
         </div>
@@ -41,7 +41,7 @@
         -->
     <t t-name="mail.compose_message.compact">
         <div class="oe_msg oe_msg_composer_compact">
-            <textarea class="field_text oe_compact" placeholder="Add your comment here..."/>
+            <textarea class="field_text oe_compact" placeholder="Write a reply..."/>
         </div>
     </t>
 
@@ -50,10 +50,10 @@
         Small template to be inserted in the composition for add attachments
         -->
     <t t-name="mail.compose_message.add_attachment">
-        <div class="oe_attachment_file">
-            <div class="oe_add">
+        <span class="oe_attachment_file">
+            <span class="oe_add">
                 <!-- uploader of file -->
-                <button><span class="oe_e">p</span></button>
+                <button class="oe_attach"><span class="oe_e">'</span></button>
                 <t t-call="HiddenInputFile">
                     <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
                     <t t-set="fileupload_action">/web/binary/upload_attachment</t>
@@ -61,8 +61,8 @@
                     <input type="hidden" name="id" value="0"/>
                     <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/>
                 </t>
-            </div>
-        </div>
+            </span>
+        </span>
     </t>
 
     <!--
@@ -70,9 +70,9 @@
         Template used to display attachments in a mail.message
         -->
     <t t-name="mail.thread.message.attachments">
-        <ul t-attf-class="oe_msg_attachments #{widget.attachment_ids[0]?'':'oe_hidden'}">
+        <div t-attf-class="oe_msg_attachments #{widget.attachment_ids[0]?'':'oe_hidden'}">
             <t t-foreach="widget.attachment_ids" t-as="attachment">
-                <li>
+                <div class="oe_attachment">
                     <span t-if="(attachment.upload or attachment.percent_loaded&lt;100)" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}" t-attf-name="{attachment.name || attachment.filename}">
                         <div class="oe_upload_in_process">
                             <span>...Upload in progress...</span>
@@ -83,11 +83,11 @@
                         <t t-raw="attachment.name || attachment.filename"/>
                     </a>
                     <t t-if="(widget.show_delete_attachment and (!attachment.upload or attachment.percent_loaded&gt;=100))">
-                        <a class="oe_right oe_mail_attachment_delete" title="Delete this attachment" t-attf-data-id="{attachment.id}">x</a>
+                        <a class="oe_right oe_mail_attachment_delete oe_e" title="Delete this attachment" t-attf-data-id="{attachment.id}">[</a>
                     </t>
-                </li>
+                </div>
             </t>
-        </ul>
+        </div>
     </t>
 
     <t t-name="mail.thread.message.private">
@@ -103,8 +103,8 @@
         -->
     <t t-name="mail.thread.list_recipients">
         <div class="oe_mail_list_recipients">
-            Post to:
-            <span t-if="!widget.is_private" class="oe_all_follower">All Followers</span> 
+            To:
+            <span t-if="!widget.is_private" class="oe_all_follower">Everyone</span> 
             <t t-if="!widget.is_private and widget.partner_ids.length"> and </t>
             <t t-set="inc" t-value="0"/>
             <t t-if="widget.partner_ids.length" t-foreach="widget.partner_ids" t-as="partner"><span t-attf-class="oe_partner_follower #{inc>=3?'oe_hidden':''}"><t t-if="inc" t-raw="', '"/><a t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a></span><t t-set="inc" t-value="inc+1"/>
-- 
cgit v1.2.3


From 875b2ede23cdc52ac9a2c96bbd22f527c428e0aa Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 24 Oct 2012 14:28:03 +0200
Subject: [IMP] mail: use widget one2many_binary and value fix

bzr revid: chm@openerp.com-20121024122803-ihr421qcvnsd3cjz
---
 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 a361daae154..8e9d07e0657 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -57,7 +57,7 @@
                 <t t-call="HiddenInputFile">
                     <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
                     <t t-set="fileupload_action">/web/binary/upload_attachment</t>
-                    <input type="hidden" name="model" value="mail.message"/>
+                    <input type="hidden" name="model" value="mail.compose.message"/>
                     <input type="hidden" name="id" value="0"/>
                     <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/>
                 </t>
-- 
cgit v1.2.3


From fc34572ee3bbdfd52f3c5cda21cbcc61729dd3be Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 24 Oct 2012 15:48:19 +0200
Subject: [IMP] mail: preview image on openchatter

bzr revid: chm@openerp.com-20121024134819-5gf165nf6cc21601
---
 addons/mail/static/src/xml/mail.xml | 21 +++++++++++++++------
 1 file changed, 15 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 3cd43996569..1e3c699e39a 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -70,8 +70,8 @@
         Template used to display attachments in a mail.message
         -->
     <t t-name="mail.thread.message.attachments">
-        <div t-attf-class="oe_msg_attachments #{widget.attachment_ids[0]?'':'oe_hidden'}">
-            <t t-foreach="widget.attachment_ids" t-as="attachment">
+        <span t-attf-class="oe_msg_attachments">
+            <t t-foreach="widget.attachment_ids" t-as="attachment" t-if="!attachment.is_image">
                 <div class="oe_attachment">
                     <span t-if="(attachment.upload or attachment.percent_loaded&lt;100)" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}" t-attf-name="{attachment.name || attachment.filename}">
                         <div class="oe_upload_in_process">
@@ -79,15 +79,24 @@
                         </div>
                         <t t-raw="attachment.name || attachment.filename"/>
                     </span>
-                    <a t-if="(!attachment.upload or attachment.percent_loaded&gt;=100)" t-att-href="attachment.url" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}">
-                        <t t-raw="attachment.name || attachment.filename"/>
-                    </a>
+                    <t t-if="(!attachment.upload or attachment.percent_loaded&gt;=100)">
+                        <a t-att-href="attachment.url" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}">
+                            <t t-raw="attachment.name || attachment.filename"/>
+                        </a>
+                    </t>
                     <t t-if="(widget.show_delete_attachment and (!attachment.upload or attachment.percent_loaded&gt;=100))">
                         <a class="oe_right oe_mail_attachment_delete oe_e" title="Delete this attachment" t-attf-data-id="{attachment.id}">[</a>
                     </t>
                 </div>
             </t>
-        </div>
+        </span>
+        <span t-attf-class="oe_msg_images">
+            <t t-foreach="widget.attachment_ids" t-as="attachment" t-if="attachment.is_image">
+                <a t-att-href="attachment.url" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}">
+                    <img t-if="attachment.is_image" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}" t-att-src="attachment.url"/>
+                </a>
+            </t>
+        </span>
     </t>
 
     <t t-name="mail.thread.message.private">
-- 
cgit v1.2.3


From 4ce75bb9bdfe805d479ccc25060d8bcc6b0ace01 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 24 Oct 2012 16:09:10 +0200
Subject: [IMP] mail: preview documents (doc, pdf...) on openchatter

bzr revid: chm@openerp.com-20121024140910-88gj3t5efhc7pzzi
---
 addons/mail/static/src/xml/mail.xml | 10 +++++++++-
 1 file changed, 9 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 1e3c699e39a..59ffc93bdf4 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -71,7 +71,7 @@
         -->
     <t t-name="mail.thread.message.attachments">
         <span t-attf-class="oe_msg_attachments">
-            <t t-foreach="widget.attachment_ids" t-as="attachment" t-if="!attachment.is_image">
+            <t t-foreach="widget.attachment_ids" t-as="attachment" t-if="!attachment.is_image and !attachment.is_document">
                 <div class="oe_attachment">
                     <span t-if="(attachment.upload or attachment.percent_loaded&lt;100)" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}" t-attf-name="{attachment.name || attachment.filename}">
                         <div class="oe_upload_in_process">
@@ -97,6 +97,14 @@
                 </a>
             </t>
         </span>
+        <span t-attf-class="oe_msg_document">
+            <t t-foreach="widget.attachment_ids" t-as="attachment" t-if="attachment.is_document">
+                <a t-att-href="attachment.url" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}">
+                    <t t-raw="attachment.name || attachment.filename"/>
+                </a>
+                <iframe t-attf-src="http://docs.google.com/viewer?url=#{ attachment.url_escape }&amp;embedded=true" width="600" height="400" style="border: none;"></iframe>
+            </t>
+        </span>
     </t>
 
     <t t-name="mail.thread.message.private">
-- 
cgit v1.2.3


From 8d9fdcc3526f1aaaf394f571e5fed8169f459cd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Wed, 24 Oct 2012 17:20:43 +0200
Subject: [IMP] mail: followers css + widget integration in inbox and formview

bzr revid: fva@openerp.com-20121024152043-q5j7hpa4rur39k03
---
 addons/mail/static/src/xml/mail.xml | 14 ++++----------
 1 file changed, 4 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 125376deb57..e1e272f1dd4 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -153,11 +153,7 @@
             </tr>
           </tbody>
         </table>
-        <!-- placeholder for the wall threads -->
-        <div class="oe_mail_wall_threads"/>
-        <div class="oe_mail_wall_aside">
-                <!-- contains currently nothing -->
-        </div>
+        <div class="oe_mail-placeholder"></div>
     </div>
 
     <!--
@@ -172,12 +168,10 @@
         Template used to display the communication history in documents
         form view.
         -->
-    <div t-name="mail.record_thread" class="oe_mail_record_wall">
-        <!-- <h4>History and Comments</h4> -->
-        <div class="oe_mail_wall_threads">
-            <!-- contains the document thread -->
+    <span t-name="mail.record_thread" class="oe_record_thread">
+        <div class="oe_mail-placeholder">
         </div>
-    </div>
+    </span>
 
     <t t-name="mail.thread">
         <div t-attf-class="oe_thread #{widget.root?'oe_root_thread':''}"/>
-- 
cgit v1.2.3


From 3e4d6ad44066690bc01caab2ed9a893f54be8fb5 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 25 Oct 2012 10:05:29 +0200
Subject: [IMP] mail: oppenchatter hidden attachment

bzr revid: chm@openerp.com-20121025080529-p2dw63h2u2ixyt26
---
 addons/mail/static/src/xml/mail.xml | 14 +++-----------
 1 file changed, 3 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 59ffc93bdf4..e806cf93a22 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -70,8 +70,8 @@
         Template used to display attachments in a mail.message
         -->
     <t t-name="mail.thread.message.attachments">
-        <span t-attf-class="oe_msg_attachments">
-            <t t-foreach="widget.attachment_ids" t-as="attachment" t-if="!attachment.is_image and !attachment.is_document">
+        <span class="oe_msg_attachments">
+            <t t-foreach="widget.attachment_ids" t-as="attachment" t-if="!attachment.is_image">
                 <div class="oe_attachment">
                     <span t-if="(attachment.upload or attachment.percent_loaded&lt;100)" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}" t-attf-name="{attachment.name || attachment.filename}">
                         <div class="oe_upload_in_process">
@@ -90,21 +90,13 @@
                 </div>
             </t>
         </span>
-        <span t-attf-class="oe_msg_images">
+        <span class="oe_msg_images">
             <t t-foreach="widget.attachment_ids" t-as="attachment" t-if="attachment.is_image">
                 <a t-att-href="attachment.url" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}">
                     <img t-if="attachment.is_image" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}" t-att-src="attachment.url"/>
                 </a>
             </t>
         </span>
-        <span t-attf-class="oe_msg_document">
-            <t t-foreach="widget.attachment_ids" t-as="attachment" t-if="attachment.is_document">
-                <a t-att-href="attachment.url" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}">
-                    <t t-raw="attachment.name || attachment.filename"/>
-                </a>
-                <iframe t-attf-src="http://docs.google.com/viewer?url=#{ attachment.url_escape }&amp;embedded=true" width="600" height="400" style="border: none;"></iframe>
-            </t>
-        </span>
     </t>
 
     <t t-name="mail.thread.message.private">
-- 
cgit v1.2.3


From a10c6c4dfdab8d7a8a1f722333d4a9c9b654f0c6 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 25 Oct 2012 10:36:31 +0200
Subject: [IMP] mail: change message_post_api (method py return id); class
 indented in DOM for expandable & compose

bzr revid: chm@openerp.com-20121025083631-ze0x0rmnj7catsmu
---
 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 e806cf93a22..0f0362e84ce 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -15,7 +15,7 @@
         for main thread composition form in document form view.
         -->
     <t t-name="mail.compose_message">
-        <div class="oe_msg oe_msg_composer">
+        <div t-attf-class="oe_msg oe_msg_composer #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''}">
             <div class="oe_msg_left">
                 <img class="oe_msg_icon" alt="User img" t-attf-src="#{widget.avatar}"/>
             </div>
@@ -40,7 +40,7 @@
         mail.compose_message when focus on textarea
         -->
     <t t-name="mail.compose_message.compact">
-        <div class="oe_msg oe_msg_composer_compact">
+        <div t-attf-class="oe_msg oe_msg_composer_compact #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''}">
             <textarea class="field_text oe_compact" placeholder="Write a reply..."/>
         </div>
     </t>
@@ -239,7 +239,7 @@
 
     <!-- expandable message layout -->
     <t t-name="mail.thread.expandable">
-        <div t-attf-class="oe_msg oe_msg_#{widget.type} oe_msg_unread">
+        <div t-attf-class="oe_msg oe_msg_#{widget.type} #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''} oe_msg_unread">
             <div class="oe_msg_content oe_msg_more_message">
                 <a t-if="widget.nb_messages === 1" class="oe_msg_fetch_more">load one more message</a>
                 <a t-if="widget.nb_messages !== 1" class="oe_msg_fetch_more">load <t t-raw="widget.nb_messages" /> more messages</a>
-- 
cgit v1.2.3


From 31965cf97a090a8d47a893e4f6c53fb2ea96e410 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 25 Oct 2012 11:59:23 +0200
Subject: [IMP] mail: insert message post, and no quote for reply

bzr revid: chm@openerp.com-20121025095923-7urqi5he10q3z1i6
---
 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 0f0362e84ce..d60ca89da2e 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -211,7 +211,7 @@
                 </div>
                 <!-- message itself -->
                 <div class="oe_msg_content">
-                    <h1 t-if="widget.subject" class="oe_msg_title">
+                    <h1 t-if="widget.subject and !widget.thread_level" class="oe_msg_title">
                         <t t-raw="widget.subject"/>
                     </h1>
                     <div class="oe_msg_body">
-- 
cgit v1.2.3


From 0805371fa9e1f17816a638b6878f7d6629d926ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Thu, 25 Oct 2012 14:43:20 +0200
Subject: [IMP] mail: compose textarea auto-resizes, various small fixes

bzr revid: fva@openerp.com-20121025124320-ztzcdf4bkgjjs57h
---
 addons/mail/static/src/xml/mail.xml | 49 +++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 24 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 96a3f578663..8d868241132 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -15,16 +15,17 @@
         for main thread composition form in document form view.
         -->
     <t t-name="mail.compose_message">
-        <div class="oe_msg oe_msg_composer">
+        <div class="oe_msg #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''} oe_msg_composer">
             <div class="oe_msg_left">
                 <img class="oe_msg_icon" alt="User img" t-attf-src="#{widget.avatar}"/>
             </div>
             <div class="oe_msg_center">
                 <div class="oe_msg_content">
                     <t t-call="mail.thread.list_recipients"/>
-                    <textarea class="field_text" placeholder=""/>
-                </div><div class="oe_msg_footer">
-                    <div class="oe_msg_attachment_list"/>
+                    <textarea class="field_text"></textarea>
+                </div>
+                <div class="oe_msg_footer">
+                    <div class="oe_msg_attachment_list"></div>
                     <button class="oe_post">Post</button>
                     <t t-call="mail.compose_message.add_attachment"/>
                     <!--<a class="oe_cancel oe_e">X</a>-->
@@ -40,7 +41,7 @@
         mail.compose_message when focus on textarea
         -->
     <t t-name="mail.compose_message.compact">
-        <div class="oe_msg oe_msg_composer_compact">
+        <div class="oe_msg #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''} oe_msg_composer_compact">
             <textarea class="field_text oe_compact" placeholder="Write a reply..."/>
         </div>
     </t>
@@ -53,7 +54,8 @@
         <span class="oe_attachment_file">
             <span class="oe_add">
                 <!-- uploader of file -->
-                <button class="oe_attach"><span class="oe_e">'</span></button>
+                <button class="oe_attach"><span class="oe_e">'</span></button> 
+                <span class='oe_attach_label'>File</span>
                 <t t-call="HiddenInputFile">
                     <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
                     <t t-set="fileupload_action">/web/binary/upload_attachment</t>
@@ -162,10 +164,10 @@
                     <button type="button" class="oe_write_full oe_highlight">
                         Compose a new message
                     </button>
-                    or
-                    <button type="button" class="oe_write_onwall" help="Your followers can read this message">
-                        Write to your followers
-                    </button>
+                    <span class='oe_alternative'>
+                        or
+                        <a href='#'  class='oe_write_onwall oe_bold' help='Your followers can read this message'>Write to your followers</a>
+                    </span>
                 </td>
             </tr>
           </tbody>
@@ -227,12 +229,14 @@
                     </t>
                 </div>
                 <div class="oe_msg_footer">
-                    from <a t-if="widget.author_id" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a>
+                    <a t-if="widget.author_id" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a> 
+                    <span class='oe_subtle'>•</span>
                     <span t-att-title="widget.date"><t t-raw="widget.timerelative"/></span>
                         <a t-if="widget.attachment_ids.length > 0" class="oe_mail_msg_view_attachments">
                             <t t-if="widget.attachment_ids.length == 1">1 Attachment</t>
                             <t t-if="widget.attachment_ids.length > 1"><t t-raw="widget.attachment_ids.length"/> Attachments</t>
                         </a>
+                    <span class='oe_subtle'>•</span>
                     <t t-call="mail.thread.message.vote"/>
                 </div>
             </div>
@@ -241,7 +245,7 @@
 
     <!-- expandable message layout -->
     <t t-name="mail.thread.expandable">
-        <div t-attf-class="oe_msg oe_msg_#{widget.type} oe_msg_unread">
+        <div t-attf-class="oe_msg #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''} oe_msg_#{widget.type} oe_msg_unread">
             <div class="oe_msg_content oe_msg_more_message">
                 <a t-if="widget.nb_messages === 1" class="oe_msg_fetch_more">load one more message</a>
                 <a t-if="widget.nb_messages !== 1" class="oe_msg_fetch_more">load <t t-raw="widget.nb_messages" /> more messages</a>
@@ -263,27 +267,24 @@
         Template used to display Like/Unlike in a mail.message
     -->
     <span t-name="mail.thread.message.vote">
-        <!--
-        <span class="oe_left oe_mail_vote_count">
+        
+        <span class="oe_mail_vote_count">
             <t t-if='widget.has_voted'>
                 You
             </t>
             <t t-if='(widget.vote_nb - (widget.has_voted ? 1 : 0)) > 0'>
                 <t t-if='widget.has_voted'> and </t>
+                <t t-raw="(widget.vote_nb - (widget.has_voted ? 1 : 0))"/>
                 <t t-esc="widget.vote_nb"/> people
             </t>
-            <t t-if='(widget.vote_nb - (widget.has_voted ? 1 : 0)) > 0'>
-                <t t-raw="(widget.vote_nb - (widget.has_voted ? 1 : 0))"/>
-                concur
+            <t t-if='widget.vote_nb'>
+                like
             </t>
         </span>
-        <button t-attf-class="oe_msg_vote oe_tag">
-            <span>
-                <t t-if="!widget.has_voted">Concur</t>
-                <t t-if="widget.has_voted">Respectfully disagree</t>
-            </span>
-        </button>
-        -->
+        <a href='#' t-attf-class="oe_msg_vote">
+            <t t-if="!widget.has_voted">like</t>
+            <t t-if="widget.has_voted">unlike</t>
+        </a>
     </span>
 
     <!-- mail.thread.message.star
-- 
cgit v1.2.3


From 7cdf99ade180b00af9caa6094d624007d47a3dde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Fri, 26 Oct 2012 11:58:21 +0200
Subject: [IMP] mail: improved display of openchatter in form views

bzr revid: fva@openerp.com-20121026095821-c3idarsd5yi9fzso
---
 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 ae8b622c978..ce3b0bed3b6 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -179,10 +179,10 @@
         Template used to display the communication history in documents
         form view.
         -->
-    <span t-name="mail.record_thread" class="oe_record_thread">
+    <div t-name="mail.record_thread" class="oe_record_thread">
         <div class="oe_mail-placeholder">
         </div>
-    </span>
+    </div>
 
     <t t-name="mail.thread">
         <div t-attf-class="oe_thread #{widget.root?'oe_root_thread':''}"/>
-- 
cgit v1.2.3


From 0975d105e20f7572b4e7eadbb64719c3d4817d98 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 26 Oct 2012 12:58:35 +0200
Subject: [IMP] mail: one template for compose_message: compact & expend +
 replace by message

bzr revid: chm@openerp.com-20121026105835-i3gca74hku1z6y2x
---
 addons/mail/static/src/xml/mail.xml | 17 +++++++----------
 1 file changed, 7 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 ae8b622c978..cbd2b263b87 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -13,9 +13,13 @@
         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.
+
+        mail.compose_message.compact template
+        This template holds the composition form to write a message, this box is converted into
+        mail.compose_message when focus on textarea
         -->
     <t t-name="mail.compose_message">
-        <div t-attf-class="oe_msg oe_msg_composer #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''}">
+        <div t-if="widget.show_composer" t-attf-class="oe_msg oe_msg_composer #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''}">
             <div class="oe_msg_left">
                 <img class="oe_msg_icon" alt="User img" t-attf-src="#{widget.avatar}"/>
             </div>
@@ -33,17 +37,10 @@
                 </div>
             </div>
         </div>
-    </t>
-
-    <!--
-        mail.compose_message.compact template
-        This template holds the composition form to write a message, this box is converted into
-        mail.compose_message when focus on textarea
-        -->
-    <t t-name="mail.compose_message.compact">
-        <div t-attf-class="oe_msg oe_msg_composer_compact #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''}">
+        <div t-if="widget.show_compact_message and !widget.show_composer" t-attf-class="oe_msg oe_msg_composer_compact #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''}">
             <textarea class="field_text oe_compact" placeholder="Write a reply..."/>
         </div>
+        <span t-if="!widget.show_compact_message and !widget.show_composer" class="oe_placeholder_self"></span>
     </t>
 
     <!--
-- 
cgit v1.2.3


From b2bc5614a9b89c235b52f0ffc8eb2c6cc6cb8a82 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 26 Oct 2012 18:39:29 +0200
Subject: [IMP] mail: code pre review

bzr revid: chm@openerp.com-20121026163929-mx125ei97h01h42o
---
 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 cbd2b263b87..05d42e0a6e2 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -72,7 +72,7 @@
         <span class="oe_msg_attachments">
             <t t-foreach="widget.attachment_ids" t-as="attachment" t-if="!attachment.is_image">
                 <div class="oe_attachment">
-                    <span t-if="(attachment.upload or attachment.percent_loaded&lt;100)" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}" t-attf-name="{attachment.name || attachment.filename}">
+                    <span t-if="(attachment.upload and attachment.percent_loaded&lt;100)" t-attf-title="{(attachment.name || attachment.filename) + (attachment.date?' \n('+attachment.date+')':'' )}" t-attf-name="{attachment.name || attachment.filename}">
                         <div class="oe_upload_in_process">
                             <span>...Upload in progress...</span>
                         </div>
-- 
cgit v1.2.3


From 81df392b715a4ebf299f52327f0dc740ce4be3ca Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 29 Oct 2012 12:22:54 +0100
Subject: [IMP] mail: openchatter, reduce DOM item

bzr revid: chm@openerp.com-20121029112254-e0az3mi3vmmk83ca
---
 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 3d0fc323de8..ecd7fa44efb 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -40,7 +40,7 @@
         <div t-if="widget.show_compact_message and !widget.show_composer" t-attf-class="oe_msg oe_msg_composer_compact #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''}">
             <textarea class="field_text oe_compact" placeholder="Write a reply..."/>
         </div>
-        <span t-if="!widget.show_compact_message and !widget.show_composer" class="oe_placeholder_self"></span>
+        <span t-if="!(widget.show_compact_message and !widget.show_composer) and !widget.show_composer" class="oe_placeholder_compose"></span>
     </t>
 
     <!--
-- 
cgit v1.2.3


From 9d0e42e3bcbb3718a010cd52107213599ca0bf21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Mon, 29 Oct 2012 15:45:03 +0100
Subject: [IMP] css: design for 'likes'

bzr revid: fva@openerp.com-20121029144503-tc124u71b2qijclx
---
 addons/mail/static/src/xml/mail.xml | 15 +++------------
 1 file changed, 3 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 ecd7fa44efb..caa85cd3deb 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -258,18 +258,9 @@
     -->
     <span t-name="mail.thread.message.vote">
         
-        <span class="oe_mail_vote_count">
-            <t t-if='widget.has_voted'>
-                You
-            </t>
-            <t t-if='(widget.vote_nb - (widget.has_voted ? 1 : 0)) > 0'>
-                <t t-if='widget.has_voted'> and </t>
-                <t t-raw="(widget.vote_nb - (widget.has_voted ? 1 : 0))"/>
-                <t t-esc="widget.vote_nb"/> people
-            </t>
-            <t t-if='widget.vote_nb'>
-                like
-            </t>
+        <span class="oe_mail_vote_count" t-if='widget.vote_nb > 0'>
+            <t t-raw='widget.vote_nb' />
+            <span class='oe_e'>8</span>
         </span>
         <a href='#' t-attf-class="oe_msg_vote">
             <t t-if="!widget.has_voted">like</t>
-- 
cgit v1.2.3