diff options
| author | Martin Trigaux <mat@odoo.com> | 2015-12-01 10:30:44 +0100 |
|---|---|---|
| committer | Martin Trigaux <mat@odoo.com> | 2015-12-01 10:30:44 +0100 |
| commit | 90254beedbb6a9bdf055ae582af866073eab4f2c (patch) | |
| tree | 8477905dd0a6586dedab562274247604ecc479a3 /addons/mail/static/src/xml/thread.xml | |
| parent | 2f6feef3a3dcd39ce2ca1fbcfa21616e02d1ab6d (diff) | |
| parent | 00ee6e7ba4e68cfef0b26f9d02f9584b8c972291 (diff) | |
[MERGE] forward port of branch 9.0 up to 00ee6e7b
Diffstat (limited to 'addons/mail/static/src/xml/thread.xml')
| -rw-r--r-- | addons/mail/static/src/xml/thread.xml | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml index 394627940cb..ebf6687c1a3 100644 --- a/addons/mail/static/src/xml/thread.xml +++ b/addons/mail/static/src/xml/thread.xml @@ -9,9 +9,13 @@ <t t-if="options.display_load_more && options.display_order == ORDER.DESC" t-call="mail.ChatThread.LoadMore"/> </t> - <t t-if="!messages.length && options.display_help"> + <t t-if="options.display_empty_channel"> <t t-call="mail.EmptyChannel" /> </t> + <t t-if="options.display_no_match"> + <div class="o_thread_title">No matches found</div> + <div>No message matches your search. Try to change your search filters.</div> + </t> </t> <!-- When a channel is empty--> @@ -30,11 +34,11 @@ <t t-if="options.messages_separator_position == 'top'" t-call="mail.MessagesSeparator"/> <t t-set="current_day" t-value="0"/> <t t-foreach="messages" t-as="message"> - <div t-if="current_day != message.date.split(' ')[0]" class="o_thread_date_separator"> + <div t-if="current_day != message.day" class="o_thread_date_separator"> <span class="o_thread_date"> - <t t-esc="moment(message.date, 'YYYY-MM-DD hh:mm:ss').format('LL')"/> + <t t-esc="message.day"/> </span> - <t t-set="current_day" t-value="message.date.split(' ')[0]"/> + <t t-set="current_day" t-value="message.day"/> </div> <t t-call="mail.ChatThread.Message"/> @@ -56,8 +60,8 @@ t-att-src="message.avatar_src" class="o_thread_message_avatar"/> </t> - <span t-if="!message.display_author" t-att-title="moment(message.date, 'YYYY-MM-DD hh:mm:ss').format('LLL')" class="o_thread_message_side_date"> - <t t-esc="moment(message.date, 'YYYY-MM-DD hh:mm:ss').format('hh:mm')"/> + <span t-if="!message.display_author" t-att-title="message.date" class="o_thread_message_side_date"> + <t t-esc="message.date.format('hh:mm')"/> </span> <i t-if="!message.display_author && options.display_stars && message.message_type != 'notification'" t-att-class="'fa o_thread_message_star ' + (message.is_starred ? 'fa-star' : 'fa-star-o')" @@ -83,8 +87,8 @@ <t t-esc="message.displayed_author"/> </strong> - <small t-att-title="moment(message.date, 'YYYY-MM-DD hh:mm:ss').format('LLL')"> - - <t t-esc="moment(message.date, 'YYYY-MM-DD hh:mm:ss').format('hh:mm A')"/> + <small t-att-title="message.date"> + - <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> @@ -107,7 +111,7 @@ </t> <t t-call="mail.ChatThread.MessageTracking"/> </t> - <p t-if="message.subject" class="o_mail_subject">Subject: <t t-esc="message.subject"/></p> + <p t-if="options.display_subject && message.subject && message.message_type != 'notification'" 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"> <div class="o_mail_body_short"> @@ -115,7 +119,6 @@ </div> <div class="o_mail_body_long"> <t t-raw="message.body"/> - <span class="oe_mail_expand"><a href="#">... read less</a></span> </div> </t> <t t-if="! message.body_short"> |