diff options
| author | Olivier Dony <odo@openerp.com> | 2016-02-03 17:15:37 +0100 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2016-02-03 17:19:16 +0100 |
| commit | d67d24d8b46e27df126429abc7572dcd455c03f4 (patch) | |
| tree | a17fa6b8a46e2a0204653f40d4299f685112ddef /addons/mail/static/src/xml | |
| parent | 9c89f83d21b6b64f0ae05fad7aaaa3e885ab8b38 (diff) | |
| parent | 93e8bf8ccfb405a79377d1abaac0043f3d7f9157 (diff) | |
[MERGE] Forward-port 9.0 up to 93e8bf8ccfb405a79377d1abaac0043f3d7f9157
Diffstat (limited to 'addons/mail/static/src/xml')
| -rw-r--r-- | addons/mail/static/src/xml/client_action.xml | 7 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/thread.xml | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/addons/mail/static/src/xml/client_action.xml b/addons/mail/static/src/xml/client_action.xml index 78371340e36..15eadb00626 100644 --- a/addons/mail/static/src/xml/client_action.xml +++ b/addons/mail/static/src/xml/client_action.xml @@ -118,6 +118,13 @@ </div> </t> + <t t-name="mail.chat.MessageSentSnackbar"> + <div class="alert o_mail_snackbar" data-dismiss="alert" role="alert"> + Message sent in "<t t-esc="record_name"/>". + </div> + </t> + + <!-- Buttons of the Control Panel --> <t t-name="mail.chat.ControlButtons"> <div> diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml index ca863d9ad8f..6ed0700be11 100644 --- a/addons/mail/static/src/xml/thread.xml +++ b/addons/mail/static/src/xml/thread.xml @@ -46,7 +46,7 @@ </t> <t t-name="mail.ChatThread.Message"> - <div t-att-class="'o_thread_message' + (message.expanded ? ' o_message_expanded' : '')" t-att-data-message-id="message.id"> + <div t-att-class="'o_thread_message' + (message.expanded ? ' o_message_expanded ' : ' ') + (message.is_selected ? 'o_thread_selected_message' : '')" t-att-data-message-id="message.id"> <div t-if="options.display_avatar" class="o_thread_message_sidebar"> <t t-if="!message.mailto && message.author_id[0]"> <img t-if="message.avatar_src && message.display_author" @@ -103,6 +103,9 @@ <i t-if="message.is_needaction && options.display_needactions" class="fa fa-check o_thread_message_needaction" t-att-data-message-id="message.id" title="Mark as Read"/> + <i t-if="message.record_name && message.model != 'mail.channel' && options.display_reply_icon" + class="fa fa-reply o_thread_message_reply" + t-att-data-message-id="message.id" title="Reply"/> </span> </p> <t t-if="message.tracking_value_ids && message.tracking_value_ids.length > 0"> |