diff options
Diffstat (limited to 'addons/mail/static/src/xml/thread.xml')
| -rw-r--r-- | addons/mail/static/src/xml/thread.xml | 24 |
1 files changed, 12 insertions, 12 deletions
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 && 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 && 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 && (message.model != 'mail.channel') && 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 && (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 && 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 && 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 && message.tracking_value_ids.length > 0"> @@ -113,7 +113,7 @@ </t> <p t-if="options.display_subject && message.display_subject" class="o_mail_subject">Subject: <t t-esc="message.subject"/></p> <t t-if="!(message.tracking_value_ids && message.tracking_value_ids.length > 0)"> - <t t-if="message.body_short"> + <t t-if="options.shorten_messages && 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> |