[MERGE] Forward port of branch saas-7 up to c298cf3

3 files changed, 14 insertions, 14 deletions

diff --git a/addons/mail/static/src/xml/client_action.xml b/addons/mail/static/src/xml/client_action.xml
index 1a7c22a1496..497dc6dc0e8 100644
--- a/addons/mail/static/src/xml/client_action.xml
+++ b/addons/mail/static/src/xml/client_action.xml
@@ -77,7 +77,7 @@
             <t t-set="counter" t-value="channel.needaction_counter"/>
             <div t-if="channel.type === channel_type" t-att-data-channel-id="channel.id"
                  t-attf-class="o_mail_chat_channel_item #{channel.unread_counter ? ' o_unread_message' : ''} #{(active_channel_id == channel.id) ? 'o_active': ''}">
-                <span><i t-if="display_status" t-att-class="'o_user_status fa ' + (channel.status == 'online' ? 'fa-circle' : 'fa-circle-o')"/></span>
+                <span><i t-if="display_status" t-att-class="'o_user_status fa ' + (channel.status == 'online' ? 'fa-circle' : (channel.status == 'away' ? 'fa-clock-o' : 'fa-circle-o'))" t-attf-title="#{channel.status}"/></span>
                 <span t-if="display_hash" class="o_mail_hash">#</span>
                 <t t-esc="channel.name"/>
                 <i t-if="channel.mass_mailing" class="fa fa-envelope-o"/>
diff --git a/addons/mail/static/src/xml/composer.xml b/addons/mail/static/src/xml/composer.xml
index d199c0d5fdf..71afe4d1695 100644
--- a/addons/mail/static/src/xml/composer.xml
+++ b/addons/mail/static/src/xml/composer.xml
@@ -6,9 +6,9 @@
         <div class="o_composer">
             <textarea class="o_composer_input" placeholder="Write something..."/>
             <div class="btn-group o_composer_buttons">
+                <button class="btn btn-sm btn-primary o_composer_button_send" type="button"><t t-esc="widget.options.send_text"/></button> 
                 <button class="btn btn-sm btn-icon fa fa-smile-o o_composer_button_emoji" type="button" data-toggle="popover"/>
                 <button class="btn btn-sm btn-icon fa fa-paperclip o_composer_button_add_attachment" type="button"/>
-                <button class="btn btn-sm btn-primary o_composer_button_send" type="button">Send</button> 
             </div>
         </div>
 
diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml
index f1a364999b5..0952fcf0e7f 100644
--- a/addons/mail/static/src/xml/thread.xml
+++ b/addons/mail/static/src/xml/thread.xml
@@ -21,12 +21,12 @@
     <!-- When a channel is empty-->
     <div t-name="mail.EmptyChannel">
         <t t-if="options.channel_id==='channel_inbox'">
-            <div class="o_thread_title">Congratulation, your inbox is empty</div>
-            <div>New messages will appear here.</div>
+            <div class="o_thread_title">Congratulations, your inbox is empty</div>
+            <div>New messages appear here.</div>
         </t>
         <t t-if="options.channel_id==='channel_starred'">
-            <div class="o_thread_title">No message starred</div>
-            <div> You can mark any message as 'starred', and it will show up in this channel.</div>
+            <div class="o_thread_title">No starred message</div>
+            <div> You can mark any message as 'starred', and it shows up in this channel.</div>
         </t>
     </div>
 
@@ -52,7 +52,7 @@
                     <img t-if="message.avatar_src &amp;&amp; message.display_author"
                         t-att-src="message.avatar_src"
                         data-oe-model="res.partner"
-                        t-att-data-oe-id="message.author_id[0]"
+                        t-att-data-oe-id="message.author_redirect ? message.author_id[0] : ''"
                         t-attf-class="o_thread_message_avatar #{message.author_redirect ? 'o_mail_redirect' : ''}"/>
                 </t>
                 <t t-if="message.mailto || !message.author_id[0]">
@@ -67,7 +67,7 @@
                     t-att-class="'fa o_thread_message_star ' + (message.is_starred ? 'fa-star' : 'fa-star-o')"
                     t-att-data-message-id="message.id" t-att-title="_t('Mark as Todo')"/>
             </div>
-            <div class="o_thread_message_core">
+            <div t-att-class="'o_thread_message_core' + (message.is_note ? ' o_mail_note' : '')">
                 <p t-if="message.display_author" class="o_mail_info">
                     <t t-if="message.is_note">
                         Note by
@@ -79,7 +79,7 @@
                         </a>
                     </strong>
                     <strong t-if="!message.mailto &amp;&amp; message.author_id[0]"
-                            data-oe-model="res.partner" t-att-data-oe-id="message.author_id[0]"
+                            data-oe-model="res.partner" t-att-data-oe-id="message.author_redirect ? message.author_id[0] : ''"
                             t-attf-class="#{message.author_redirect ? 'o_mail_redirect' : ''}">
                         <t t-esc="message.displayed_author"/>
                     </strong>
@@ -91,10 +91,10 @@
                         - <t t-esc="message.hour"/>
                     </small>
                     <t t-if="message.model &amp;&amp; (message.model != 'mail.channel') &amp;&amp; options.display_document_link">
-                        on <a class="o_mail_redirect" href="#" t-att-data-oe-model="message.model" t-att-data-oe-id="message.res_id"><t t-esc="message.record_name"/></a>
+                        on <a t-att-href="message.url" t-att-data-oe-model="message.model" t-att-data-oe-id="message.res_id"><t t-esc="message.record_name"/></a>
                     </t>
                     <t t-if="message.origin_id &amp;&amp; (message.origin_id !== options.channel_id)">
-                        (from <a class="o_channel_redirect" t-att-data-oe-id="message.origin_id" href="#">#<t t-esc="message.origin_name"/></a>)
+                        (from <a t-att-data-oe-id="message.origin_id" href="#">#<t t-esc="message.origin_name"/></a>)
                     </t>
                     <span>
                         <i t-if="options.display_stars &amp;&amp; message.message_type != 'notification'"
@@ -102,7 +102,7 @@
                             t-att-data-message-id="message.id" t-att-title="_t('Mark as Todo')"/>
                         <i t-if="message.is_needaction &amp;&amp; options.display_needactions"
                            class="fa fa-check o_thread_message_needaction"
-                           t-att-data-message-id="message.id" t-att-title="_t('Mark as Done')"/>
+                           t-att-data-message-id="message.id" t-att-title="_t('Mark as Read')"/>
                     </span>
                 </p>
                 <t t-if="message.tracking_value_ids &amp;&amp; message.tracking_value_ids.length &gt; 0">
@@ -113,7 +113,7 @@
                 </t>
                 <p t-if="options.display_subject &amp;&amp; message.display_subject" class="o_mail_subject">Subject: <t t-esc="message.subject"/></p>
                 <t t-if="!(message.tracking_value_ids &amp;&amp; message.tracking_value_ids.length &gt; 0)">
-                    <t t-if="message.body_short">
+                    <t t-if="options.shorten_messages &amp;&amp; message.body_short">
                         <div class="o_mail_body_short">
                             <t t-raw="message.body_short"/>
                         </div>
@@ -121,7 +121,7 @@
                             <t t-raw="message.body"/>
                         </div>
                     </t>
-                    <t t-if="! message.body_short">
+                    <t t-if="!options.shorten_messages || !message.body_short">
                         <t t-raw="message.body"/>
                     </t>
                 </t>