diff options
| author | Géry Debongnie <ged@odoo.com> | 2015-12-01 16:00:28 +0100 |
|---|---|---|
| committer | Géry Debongnie <ged@odoo.com> | 2015-12-07 16:14:46 +0100 |
| commit | 27a455fc9255359058d1dc27cdc9ab89624b1cc1 (patch) | |
| tree | f53e8b0e04c7130d49f5be1458200ecdf5e1c8b6 /addons/mail/static/src/xml | |
| parent | 60c1b51c4437d630dfbe4ec0baa87c974a863544 (diff) | |
[IMP] mail: various improvement
- don't display subject for messages coming from chatter
- better tooltip on the leave channel button in client action sidebar
- don't squash nearby messages in chatter
- reduce margin of date separator in chat windows
Diffstat (limited to 'addons/mail/static/src/xml')
| -rw-r--r-- | addons/mail/static/src/xml/client_action.xml | 2 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/thread.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/mail/static/src/xml/client_action.xml b/addons/mail/static/src/xml/client_action.xml index e3c2c1aeee2..11b32ee0e8d 100644 --- a/addons/mail/static/src/xml/client_action.xml +++ b/addons/mail/static/src/xml/client_action.xml @@ -83,7 +83,7 @@ <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"/> + t-att-title="_t('Leave this channel')" t-att-data-channel-id="channel.id"/> </div> </t> <div t-if="!disable_add_channel" class="o_mail_add_channel" t-attf-data-type="#{channel_type}"> diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml index 48ba98659b2..f1a364999b5 100644 --- a/addons/mail/static/src/xml/thread.xml +++ b/addons/mail/static/src/xml/thread.xml @@ -111,7 +111,7 @@ </t> <t t-call="mail.ChatThread.MessageTracking"/> </t> - <p t-if="options.display_subject && message.subject && message.message_type != 'notification'" class="o_mail_subject">Subject: <t t-esc="message.subject"/></p> + <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"> <div class="o_mail_body_short"> |