From 2447ed07a75bde52ec644c8236242ac6cb15ea8f Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 29 Oct 2012 16:13:27 +0100
Subject: [FIX] mail: display vote

bzr revid: chm@openerp.com-20121029151327-cptuukjtkrh06bij
---
 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 caa85cd3deb..1a40fbc61ac 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -257,12 +257,11 @@
         Template used to display Like/Unlike in a mail.message
     -->
     <span t-name="mail.thread.message.vote">
-        
         <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">
+        <a href='#' class="oe_msg_vote">
             <t t-if="!widget.has_voted">like</t>
             <t t-if="widget.has_voted">unlike</t>
         </a>
-- 
cgit v1.2.3


From c25c94b8d9fdedaa97776307939b890e3b051864 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 17:52:11 +0100
Subject: [IMP] css: global mail compose button is beautifuller and better
 integrated

bzr revid: fva@openerp.com-20121029165211-dzd1najj6btorzi9
---
 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 caa85cd3deb..a34538e1248 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -248,8 +248,8 @@
         render of the button on the user bar for open wizard compose message
         -->
     <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> -->
+        <div title='Compose new Message' class="oe_topbar_item oe_topbar_compose_full_email">
+            <button class="oe_e">%</button>
         </div>
     </t>
 
-- 
cgit v1.2.3


From 566d7dd3afc38efb2171e829b9aadaf7cd064852 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 30 Oct 2012 11:03:18 +0100
Subject: [IMP] mail: activate default value for the search view

bzr revid: chm@openerp.com-20121030100318-pnvgcm2id034na93
---
 addons/mail/static/src/xml/mail.xml | 13 ++++++-------
 1 file changed, 6 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 1a40fbc61ac..179d6aae421 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -140,9 +140,7 @@
                 <td colspan="2">
                     <h2 class="oe_view_title">
                         <span class="oe_view_title_text">
-                            News Feed
-                            <t t-if="widget.options.res_model"> / </t>
-                            <t t-if="widget.options.res_model" t-esc="widget.options.res_model"/>
+                            Email box
                         </span>
                     </h2>
                 </td>
@@ -234,11 +232,12 @@
 
     <!-- expandable message layout -->
     <t t-name="mail.thread.expandable">
-        <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 t-attf-class="oe_msg oe_msg_#{widget.type} #{widget.max_limit ? 'oe_max_limit' : ''} #{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">
                 <div class='oe_separator'></div>
+                <a t-if="widget.nb_messages &lt;= 0" class="oe_msg_fetch_more">show more message</a>
                 <a t-if="widget.nb_messages === 1" class="oe_msg_fetch_more">show one more message</a>
-                <a t-if="widget.nb_messages !== 1" class="oe_msg_fetch_more">show <t t-raw="widget.nb_messages" /> more messages</a>
+                <a t-if="widget.nb_messages &gt; 1" class="oe_msg_fetch_more">show <t t-raw="widget.nb_messages" /> more messages</a>
             </div>
         </div>
     </t>
@@ -247,9 +246,9 @@
         mail.compose_message.button_top_bar
         render of the button on the user bar for open wizard compose message
         -->
-    <t t-name="mail.compose_message.button_top_bar">
+    <t t-name="mail.ComposeMessageTopButton">
         <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 49325c24d2730147c18541a7cca1968445b9f863 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 30 Oct 2012 12:33:56 +0100
Subject: [IMP] mail: reduce options on js

bzr revid: chm@openerp.com-20121030113356-374gjb6zanw4xtsw
---
 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 179d6aae421..c22a71dde30 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -195,9 +195,9 @@
 
             <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">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 class='oe_read' t-if="widget.options.show_read_unread_button"><a title="Read" class="oe_e">X</a></span>
+                    <span class='oe_unread' t-if="widget.options.show_read_unread_button"><a title="Set back to unread" class="oe_e">v</a></span>
+                    <span class='oe_reply' t-if="widget.options.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>
                 <!-- message itself -->
-- 
cgit v1.2.3


From a7d64a13e8512cd9db0dfa4223c4017df0350e12 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 30 Oct 2012 15:40:50 +0100
Subject: [FIX] mail: write on the last message on a thread, don't indeted the
 message

bzr revid: chm@openerp.com-20121030144050-61ji54ydc3deto8k
---
 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 a21fb02ad5b..ceeacaa8be1 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -206,7 +206,7 @@
                         <t t-raw="widget.subject"/>
                     </h1>
                     <div class="oe_msg_body">
-                        <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'">
+                        <t t-if="widget.show_record_name">
                             <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"/>
-- 
cgit v1.2.3


From 1bbc2c00633516a5901de3243ee1fb905a51b916 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 31 Oct 2012 15:56:10 +0100
Subject: [IMP] mail: js, compose, expandable and message extend messageglobal

bzr revid: chm@openerp.com-20121031145610-e8m9l7lsmzzjru9k
---
 addons/mail/static/src/xml/mail.xml | 12 ++++++------
 1 file changed, 6 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 ceeacaa8be1..5cd4c045469 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -38,7 +38,7 @@
             </div>
         </div>
         <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..."/>
+            <textarea class="field_text oe_compact" placeholder="Write to this group followers..."/>
         </div>
         <span t-if="!(widget.show_compact_message and !widget.show_composer) and !widget.show_composer" class="oe_placeholder_compose"></span>
     </t>
@@ -72,18 +72,18 @@
         <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 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}">
+                    <span t-if="attachment.upload" 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>
                         <t t-raw="attachment.name || attachment.filename"/>
                     </span>
-                    <t t-if="(!attachment.upload or attachment.percent_loaded&gt;=100)">
+                    <t t-if="!attachment.upload">
                         <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))">
+                    <t t-if="(widget.show_delete_attachment and !attachment.upload)">
                         <a class="oe_right oe_mail_attachment_delete oe_e" title="Delete this attachment" t-attf-data-id="{attachment.id}">[</a>
                     </t>
                 </div>
@@ -146,14 +146,14 @@
                 </td>
                 <td><div class="oe_view_manager_view_search" t-opentag="true"/></td>
             </tr>
-            <tr class="oe_header_row">
+            <tr class="oe_header_row" t-if="widget.context.view_mailbox" >
                 <td colspan="2">
                     <button type="button" class="oe_write_full oe_highlight">
                         Compose a new message
                     </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>
+                        <a href='#'  class='oe_write_onwall oe_bold' help='Your followers can read this message'>Write on this document</a>
                     </span>
                 </td>
             </tr>
-- 
cgit v1.2.3


From fb222404e5c0b2c5d43c57dab931294ad2edd25d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Fri, 2 Nov 2012 14:54:26 +0100
Subject: [IMP] mail: tried to have alwsays read/unread buttons; some code
 cleaning; added demo data.

bzr revid: tde@openerp.com-20121102135426-5np5wtupzdhx0dz4
---
 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 5cd4c045469..2654778d84c 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -1,8 +1,9 @@
 <?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.Widget">
+    <!--
+        mail.Widget template used to namespace the css -->
+    <t t-name="mail.Root">
         <div class="oe_mail">
         </div>
     </t>
@@ -185,7 +186,7 @@
 
     <!-- default layout -->
     <t t-name="mail.thread.message">
-        <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 t-attf-class="oe_msg #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''} oe_msg_#{widget.type}">
 
             <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]">
@@ -195,8 +196,8 @@
 
             <div class="oe_msg_center">
                 <div class='oe_msg_icons'>
-                    <span class='oe_read' t-if="widget.options.show_read_unread_button"><a title="Read" class="oe_e">X</a></span>
-                    <span class='oe_unread' t-if="widget.options.show_read_unread_button"><a title="Set back to unread" class="oe_e">v</a></span>
+                    <span class='oe_read' t-if="widget.options.show_read"><a title="Read" class="oe_e">X</a></span>
+                    <span class='oe_unread' t-if="widget.options.show_unread"><a title="Set back to unread" class="oe_e">v</a></span>
                     <span class='oe_reply' t-if="widget.options.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>
@@ -232,7 +233,7 @@
 
     <!-- expandable message layout -->
     <t t-name="mail.thread.expandable">
-        <div t-attf-class="oe_msg oe_msg_#{widget.type} #{widget.max_limit ? 'oe_max_limit' : ''} #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''} oe_msg_unread">
+        <div t-attf-class="oe_msg oe_msg_#{widget.type} #{widget.max_limit ? 'oe_max_limit' : ''} #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''}">
             <div class="oe_msg_content oe_msg_more_message">
                 <div class='oe_separator'></div>
                 <a t-if="widget.nb_messages &lt;= 0" class="oe_msg_fetch_more">show more message</a>
-- 
cgit v1.2.3


From 34994beb5973abd7db3a968e7a01bf53d1d28c0c Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 5 Nov 2012 14:04:54 +0100
Subject: [IMP] mail: change name of actions in mailbox/messages

bzr revid: chm@openerp.com-20121105130454-j34ya62hljxcnfec
---
 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 2654778d84c..9900e8049f2 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -196,10 +196,11 @@
 
             <div class="oe_msg_center">
                 <div class='oe_msg_icons'>
-                    <span class='oe_read' t-if="widget.options.show_read"><a title="Read" class="oe_e">X</a></span>
-                    <span class='oe_unread' t-if="widget.options.show_unread"><a title="Set back to unread" class="oe_e">v</a></span>
+                    <span class='oe_read' t-if="widget.options.show_read"><a title="Done" class="oe_e">X</a></span>
+                    <span class='oe_unread' t-if="widget.is_favorite and widget.options.show_unread"><a title="Set back to Todo" class="oe_e">v</a></span>
+                    <span class='oe_unread' t-if="!widget.is_favorite and widget.options.show_unread"><a title="Set back to Inbox" class="oe_e">v</a></span>
                     <span class='oe_reply' t-if="widget.options.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>
+                    <span t-attf-class="oe_star #{widget.is_favorite?'oe_starred':''}"><a title="Mark as Todo" class="oe_e">7</a></span>
                 </div>
                 <!-- message itself -->
                 <div class="oe_msg_content">
-- 
cgit v1.2.3


From 1a222f3d6a3bb3ba30c2913515ee941774fd427f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Mon, 5 Nov 2012 19:03:55 +0100
Subject: [IMP] mail: final touches on the attachments

bzr revid: fva@openerp.com-20121105180355-tzk2d6lbhgwgg8kl
---
 addons/mail/static/src/xml/mail.xml | 52 ++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 27 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 ceeacaa8be1..65e56fa62fa 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -69,33 +69,28 @@
         Template used to display attachments in a mail.message
         -->
     <t t-name="mail.thread.message.attachments">
-        <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 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>
-                        <t t-raw="attachment.name || attachment.filename"/>
-                    </span>
-                    <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>
+        <t t-foreach='widget.attachment_ids' t-as='attachment'>
+            <t t-if="widget.filetype(attachment) !== 'webimage'">
+                <div class='oe_attachment'>
+                    <img t-att-src="'/mail/static/src/img/mimetypes/' + widget.filetype(attachment) + '.png'"></img>
+                    <div class='oe_delete oe_e'>[</div>
+                    <div class='oe_name'><t t-raw='widget.breakword(attachment.name || attachment.filename)' /></div>
+                    <div class='oe_progress_bar'>
+                        uploading
+                    </div>
                 </div>
             </t>
-        </span>
-        <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 t-if="widget.filetype(attachment) === 'webimage'">
+                <div class='oe_attachment oe_preview'>
+                    <img t-att-src="attachment.url"></img>
+                    <div class='oe_delete oe_e'>[</div>
+                    <div class='oe_name'><t t-raw='widget.breakword(attachment.name || attachment.filename)' /></div>
+                    <div class='oe_progress_bar'>
+                        uploading
+                    </div>
+                </div>
             </t>
-        </span>
+        </t>
     </t>
 
     <t t-name="mail.thread.message.private">
@@ -211,15 +206,18 @@
                         </t>
                         <t t-raw="widget.body"/>
                     </div>
-                    <t t-if="widget.attachment_ids.length > 0">
-                        <t t-call="mail.thread.message.attachments"/>
-                    </t>
                 </div>
                 <div class="oe_msg_footer">
+                    <t t-if="widget.attachment_ids.length > 0">
+                        <div class="oe_msg_attachment_list">
+                            <t t-call="mail.thread.message.attachments"/>
+                        </div>
+                    </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 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">
+                            <span class='oe_subtle'>•</span>
                             <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>
-- 
cgit v1.2.3


From e9a24477a8faa6298b83acb086d2c2d85e2708a1 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 7 Nov 2012 09:24:42 +0100
Subject: [FIX] mail: display 'Compose a new message' button; Limit messages:
 30

bzr revid: chm@openerp.com-20121107082442-t48a3fqheme0r0h4
---
 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 9900e8049f2..cdd83bd4c7d 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -147,7 +147,7 @@
                 </td>
                 <td><div class="oe_view_manager_view_search" t-opentag="true"/></td>
             </tr>
-            <tr class="oe_header_row" t-if="widget.context.view_mailbox" >
+            <tr class="oe_header_row" t-if="widget.action.params.view_inbox" >
                 <td colspan="2">
                     <button type="button" class="oe_write_full oe_highlight">
                         Compose a new message
-- 
cgit v1.2.3


From 3b1478bf57f3da03e6a992e2d2c9b8df84b85c12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Wed, 7 Nov 2012 12:44:13 +0100
Subject: [IMP] mail: js dom bindings for the attachments

bzr revid: fva@openerp.com-20121107114413-399b2q2b5ziurxvp
---
 addons/mail/static/src/xml/mail.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 3451566db46..02c29a3f1c2 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -73,7 +73,7 @@
         <t t-foreach='widget.attachment_ids' t-as='attachment'>
             <t t-if="widget.filetype(attachment) !== 'webimage'">
                 <div class='oe_attachment'>
-                    <img t-att-src="'/mail/static/src/img/mimetypes/' + widget.filetype(attachment) + '.png'"></img>
+                    <a t-att-href='attachment.url'><img t-att-src="'/mail/static/src/img/mimetypes/' + widget.filetype(attachment) + '.png'"></img></a>
                     <div class='oe_delete oe_e'>[</div>
                     <div class='oe_name'><t t-raw='widget.breakword(attachment.name || attachment.filename)' /></div>
                     <div class='oe_progress_bar'>
@@ -83,7 +83,7 @@
             </t>
             <t t-if="widget.filetype(attachment) === 'webimage'">
                 <div class='oe_attachment oe_preview'>
-                    <img t-att-src="attachment.url"></img>
+                    <a t-att-href='attachment.url'><img t-att-src="attachment.url"></img></a>
                     <div class='oe_delete oe_e'>[</div>
                     <div class='oe_name'><t t-raw='widget.breakword(attachment.name || attachment.filename)' /></div>
                     <div class='oe_progress_bar'>
@@ -218,11 +218,13 @@
                     <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">
-                            <span class='oe_subtle'>•</span>
+                    <t t-if='widget.attachment_ids.length > 0'>
+                        <span class='oe_subtle'>•</span>
+                        <a class="oe_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>
                     <span class='oe_subtle'>•</span>
                     <t t-call="mail.thread.message.vote"/>
                 </div>
-- 
cgit v1.2.3


From 7bfc5c3fe4c1c7d88908d1b190ff29fbaed6b898 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Wed, 7 Nov 2012 14:54:18 +0100
Subject: [FIX] forgot to remove a call to a removed method

bzr revid: fva@openerp.com-20121107135418-xa74vzqvqlgt3469
---
 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 02c29a3f1c2..6805c3473c0 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -74,7 +74,7 @@
             <t t-if="widget.filetype(attachment) !== 'webimage'">
                 <div class='oe_attachment'>
                     <a t-att-href='attachment.url'><img t-att-src="'/mail/static/src/img/mimetypes/' + widget.filetype(attachment) + '.png'"></img></a>
-                    <div class='oe_delete oe_e'>[</div>
+                    <div class='oe_delete oe_e' title="Delete this attachment" t-attf-data-id="{attachment.id}">[</div>
                     <div class='oe_name'><t t-raw='widget.breakword(attachment.name || attachment.filename)' /></div>
                     <div class='oe_progress_bar'>
                         uploading
-- 
cgit v1.2.3


From d28124c40c2c62fdd796a08d91834d941f564dc2 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 8 Nov 2012 11:05:44 +0100
Subject: [REV] mail: remove the python read attachment and update the
 controleur for image resizing

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

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

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 6805c3473c0..30308564973 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -83,7 +83,7 @@
             </t>
             <t t-if="widget.filetype(attachment) === 'webimage'">
                 <div class='oe_attachment oe_preview'>
-                    <a t-att-href='attachment.url'><img t-att-src="attachment.url"></img></a>
+                    <a t-att-href='attachment.url'><img t-att-src="widget.attachments_resize_image(attachment.id, [100,100])"></img></a>
                     <div class='oe_delete oe_e'>[</div>
                     <div class='oe_name'><t t-raw='widget.breakword(attachment.name || attachment.filename)' /></div>
                     <div class='oe_progress_bar'>
@@ -211,9 +211,7 @@
                 </div>
                 <div class="oe_msg_footer">
                     <t t-if="widget.attachment_ids.length > 0">
-                        <div class="oe_msg_attachment_list">
-                            <t t-call="mail.thread.message.attachments"/>
-                        </div>
+                        <div class="oe_msg_attachment_list"></div>
                     </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 class='oe_subtle'>•</span>
-- 
cgit v1.2.3


From 5fde2760c6e5184871990bdf3b111cc298347ce9 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 8 Nov 2012 13:30:14 +0100
Subject: [FIX] mail: fixing js and xml

bzr revid: chm@openerp.com-20121108123014-9iauyk1laec3alba
---
 addons/mail/static/src/xml/mail.xml | 5 +++--
 1 file changed, 3 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 30308564973..1844818109d 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -39,7 +39,8 @@
             </div>
         </div>
         <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 to this group followers..."/>
+            <textarea t-if="!widget.options.view_mailbox" class="field_text oe_compact" placeholder="Write to the followers of this docmuent..."/>
+            <textarea t-if="widget.options.view_mailbox" class="field_text oe_compact" placeholder="Write to my followers..."/>
         </div>
         <span t-if="!(widget.show_compact_message and !widget.show_composer) and !widget.show_composer" class="oe_placeholder_compose"></span>
     </t>
@@ -149,7 +150,7 @@
                     </button>
                     <span class='oe_alternative'>
                         or
-                        <a href='#'  class='oe_write_onwall oe_bold' help='Your followers can read this message'>Write on this document</a>
+                        <a href='#'  class='oe_write_onwall oe_bold' help='Your followers can read this message'>Write to my followers</a>
                     </span>
                 </td>
             </tr>
-- 
cgit v1.2.3


From dece6c89ee7fcca2eb9fdf2164d1fa4f4665d8b4 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 8 Nov 2012 16:59:36 +0100
Subject: [IMP]mail: add text floowers of document, on compose message

bzr revid: chm@openerp.com-20121108155936-lvix1hf5o3pg8ym8
---
 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 1844818109d..2aeddd717b4 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -109,7 +109,7 @@
     <t t-name="mail.thread.list_recipients">
         <div class="oe_mail_list_recipients">
             To:
-            <span t-if="!widget.is_private" class="oe_all_follower">Everyone</span> 
+            <span t-if="!widget.is_private" class="oe_all_follower">Followers <t t-if="widget.parent_thread.parent_message.show_record_name" t-raw="' of &quot;' + widget.parent_thread.parent_message.record_name + '&quot;' "/></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 c22eec5f7dd9b33d68294b609df7d912f6ca9c99 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 9 Nov 2012 11:16:28 +0100
Subject: [FIX] mail: scroll, avatar, delete attachments, print

bzr revid: chm@openerp.com-20121109101628-4e8cnjr1lcmt0tdv
---
 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 2aeddd717b4..cd8fabc85d6 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -72,21 +72,21 @@
         -->
     <t t-name="mail.thread.message.attachments">
         <t t-foreach='widget.attachment_ids' t-as='attachment'>
-            <t t-if="widget.filetype(attachment) !== 'webimage'">
+            <t t-if="attachment.filetype !== 'webimage'">
                 <div class='oe_attachment'>
-                    <a t-att-href='attachment.url'><img t-att-src="'/mail/static/src/img/mimetypes/' + widget.filetype(attachment) + '.png'"></img></a>
+                    <a t-att-href='attachment.url'><img t-att-src="'/mail/static/src/img/mimetypes/' + attachment.filetype + '.png'"></img></a>
                     <div class='oe_delete oe_e' title="Delete this attachment" t-attf-data-id="{attachment.id}">[</div>
-                    <div class='oe_name'><t t-raw='widget.breakword(attachment.name || attachment.filename)' /></div>
+                    <div class='oe_name'><t t-raw='attachment.name' /></div>
                     <div class='oe_progress_bar'>
                         uploading
                     </div>
                 </div>
             </t>
-            <t t-if="widget.filetype(attachment) === 'webimage'">
+            <t t-if="attachment.filetype === 'webimage'">
                 <div class='oe_attachment oe_preview'>
                     <a t-att-href='attachment.url'><img t-att-src="widget.attachments_resize_image(attachment.id, [100,100])"></img></a>
                     <div class='oe_delete oe_e'>[</div>
-                    <div class='oe_name'><t t-raw='widget.breakword(attachment.name || attachment.filename)' /></div>
+                    <div class='oe_name'><t t-raw='attachment.name' /></div>
                     <div class='oe_progress_bar'>
                         uploading
                     </div>
-- 
cgit v1.2.3


From 3dbf5a16116887190d04108e9f5d31ec8fb449f6 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 9 Nov 2012 15:21:01 +0100
Subject: [FIX] mail: avatar, record_name, rerender with childs propagation

bzr revid: chm@openerp.com-20121109142101-izotiix03uvx29mm
---
 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 cd8fabc85d6..e9f5b163239 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -73,7 +73,7 @@
     <t t-name="mail.thread.message.attachments">
         <t t-foreach='widget.attachment_ids' t-as='attachment'>
             <t t-if="attachment.filetype !== 'webimage'">
-                <div class='oe_attachment'>
+                <div t-attf-class="oe_attachment #{attachment.upload ? 'oe_uploading' : ''}">
                     <a t-att-href='attachment.url'><img t-att-src="'/mail/static/src/img/mimetypes/' + attachment.filetype + '.png'"></img></a>
                     <div class='oe_delete oe_e' title="Delete this attachment" t-attf-data-id="{attachment.id}">[</div>
                     <div class='oe_name'><t t-raw='attachment.name' /></div>
@@ -83,7 +83,7 @@
                 </div>
             </t>
             <t t-if="attachment.filetype === 'webimage'">
-                <div class='oe_attachment oe_preview'>
+                <div t-attf-class="oe_attachment oe_preview #{attachment.upload ? 'oe_uploading' : ''}">
                     <a t-att-href='attachment.url'><img t-att-src="widget.attachments_resize_image(attachment.id, [100,100])"></img></a>
                     <div class='oe_delete oe_e'>[</div>
                     <div class='oe_name'><t t-raw='attachment.name' /></div>
@@ -109,7 +109,7 @@
     <t t-name="mail.thread.list_recipients">
         <div class="oe_mail_list_recipients">
             To:
-            <span t-if="!widget.is_private" class="oe_all_follower">Followers <t t-if="widget.parent_thread.parent_message.show_record_name" t-raw="' of &quot;' + widget.parent_thread.parent_message.record_name + '&quot;' "/></span>
+            <span t-if="!widget.is_private" class="oe_all_follower">Followers <t t-raw="' of &quot;' + widget.parent_thread.parent_message.record_name + '&quot;' "/></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 6bf37ebb14efb38b1514b5b5cab809713c20ab6e Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 12 Nov 2012 09:39:36 +0100
Subject: [FIX] mail: To: Followers of 'Undefined' became To: Followers of this
 document

bzr revid: chm@openerp.com-20121112083936-i87pc2fecce7ektg
---
 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 e9f5b163239..c868319c58e 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -109,7 +109,7 @@
     <t t-name="mail.thread.list_recipients">
         <div class="oe_mail_list_recipients">
             To:
-            <span t-if="!widget.is_private" class="oe_all_follower">Followers <t t-raw="' of &quot;' + widget.parent_thread.parent_message.record_name + '&quot;' "/></span>
+            <span t-if="!widget.is_private" class="oe_all_follower">Followers <t t-raw="' of ' + (widget.parent_thread.parent_message.record_name ? '&quot;' + widget.parent_thread.parent_message.record_name + '&quot;' : 'this document')"/></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 ccc8069a4c13c8833e4e88bc9bda15af5dad6e3d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 12 Nov 2012 19:39:19 +0100
Subject: [IMP] style of empty mail boxes

bzr revid: fp@tinyerp.com-20121112183919-oh8ccaz2w3nnvf2h
---
 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 c868319c58e..2ba1733043a 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -163,7 +163,7 @@
         display message on the wall when there are no message
         -->
     <t t-name="mail.wall_no_message">
-        <div class="oe_wall_no_message">You have no messages</div>
+        <div class="oe_view_nocontent">No messages.</div>
     </t>
 
     <!--
-- 
cgit v1.2.3


From 15b23a76aeded2cff747d1dedaeab6ae6357eb27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 15 Nov 2012 11:35:01 +0100
Subject: [REM] Chatter: removed unused template in xml.

bzr revid: tde@openerp.com-20121115103501-wt837acx8kj1ycht
---
 addons/mail/static/src/xml/mail.xml | 8 --------
 1 file changed, 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 2ba1733043a..89fbe45dc36 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -95,14 +95,6 @@
         </t>
     </t>
 
-    <t t-name="mail.thread.message.private">
-        <div>
-            <span class="oe_placeholder_checkbox_private"/>
-            <span class="oe_send_private">This email is private.</span>
-            <span class="oe_send_public">I wrote for contacts and all my followers.</span>
-        </div>
-    </t>
-
     <!--
         template to the recipients list
         -->
-- 
cgit v1.2.3