summaryrefslogtreecommitdiff
path: root/addons/mail/static/src/xml
diff options
context:
space:
mode:
authorAaron Bohy <aab@odoo.com>2015-11-18 11:16:18 +0100
committerAaron Bohy <aab@odoo.com>2015-11-23 16:29:08 +0100
commitfaf5cea9480bfdd0635bccbc3a9ea88c19ceeb64 (patch)
tree58fdebc6cc9b1b2a1148ad6fbcf80b3c35fd113e /addons/mail/static/src/xml
parent00630c5fd7844304122f7cbae59c5f329515fea5 (diff)
[FIX] mail: various UI improvements
- emoji are no more clickable in threads (they are only in the popover) - correctly update channel needaction counter - don't display 'New message' notification when the channel in detached - display in the ui channels that send emails and other channels - prevent notifications in mass mailing channels - increase bottom padding in client action thread
Diffstat (limited to 'addons/mail/static/src/xml')
-rw-r--r--addons/mail/static/src/xml/client_action.xml4
1 files changed, 3 insertions, 1 deletions
diff --git a/addons/mail/static/src/xml/client_action.xml b/addons/mail/static/src/xml/client_action.xml
index 89d7395073d..e3c2c1aeee2 100644
--- a/addons/mail/static/src/xml/client_action.xml
+++ b/addons/mail/static/src/xml/client_action.xml
@@ -78,7 +78,9 @@
<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 t-if="display_hash" class="o_mail_hash">#</span> <t t-esc="channel.name"/>
+ <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"/>
<t t-call="mail.chat.SidebarNeedaction"/>
<span t-attf-class="fa fa-times pull-right o_mail_partner_unpin #{counter ? 'hide' : ''}"
t-att-title="_t('Close')" t-att-data-channel-id="channel.id"/>