diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-02-02 14:52:15 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-02-02 14:52:15 +0100 |
| commit | 469e04e97c2aa60d9d41bd430e0aeba77ee6f9dd (patch) | |
| tree | 0119f59009274d2c569920432c9a7fabafde0974 /addons/mail/static/src/xml/client_action.xml | |
| parent | 78d20b552b4374b94aec7097c0e6a48a3dd2d961 (diff) | |
| parent | 2611a8198eaac60cf424742e4dc411700e439352 (diff) | |
[MERGE] forward port of branch saas-8 up to 2611a81
Diffstat (limited to 'addons/mail/static/src/xml/client_action.xml')
| -rw-r--r-- | addons/mail/static/src/xml/client_action.xml | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/addons/mail/static/src/xml/client_action.xml b/addons/mail/static/src/xml/client_action.xml index e76e56a7810..c897df820fb 100644 --- a/addons/mail/static/src/xml/client_action.xml +++ b/addons/mail/static/src/xml/client_action.xml @@ -19,13 +19,13 @@ <div class="o_mail_chat_sidebar"> <div t-attf-class="o_mail_chat_channel_item #{(active_channel_id == 'channel_inbox') ? 'o_active': ''}" data-channel-id="channel_inbox"> - @ Inbox + <span class="o_channel_name"> <i class="fa fa-at"/> Inbox </span> <t t-set="counter" t-value="needaction_counter"/> <t t-call="mail.chat.SidebarNeedaction"/> </div> <div t-attf-class="o_mail_chat_channel_item #{(active_channel_id == 'channel_starred') ? 'o_active': ''}" data-channel-id="channel_starred"> - <span class="fa fa-star-o"/> Starred + <span class="o_channel_name"> <i class="fa fa-star-o"/> Starred </span> </div> <t t-set="channel_type" t-value="'public'"/> @@ -57,7 +57,7 @@ </div> </t> <t t-name="mail.chat.SidebarNeedaction"> - <span t-attf-class="o_mail_sidebar_needaction badge pull-right #{(!counter ? 'hide' : '')}"> + <span t-attf-class="o_mail_sidebar_needaction badge #{(!counter ? 'hide' : '')}"> <t t-esc="counter"/> </span> </t> @@ -82,18 +82,20 @@ <t t-name="mail.chat.SidebarItems"> <t t-foreach="channels" t-as="channel"> <t t-set="counter" t-value="channel.is_chat ? channel.unread_counter : channel.needaction_counter"/> - <div t-if="channel.type === channel_type" t-att-data-channel-id="channel.id" + <div t-if="channel.type === channel_type" t-att-data-channel-id="channel.id" t-att-title="channel.name" t-attf-class="o_mail_chat_channel_item #{channel.unread_counter ? ' o_unread_message' : ''} #{(active_channel_id == channel.id) ? 'o_active': ''}"> - <span t-if="display_status"> - <t t-call="mail.chat.UserStatus"> - <t t-set="status" t-value="channel.status"/> - </t> + <span class="o_channel_name"> + <span t-if="display_status"> + <t t-call="mail.chat.UserStatus"> + <t t-set="status" t-value="channel.status"/> + </t> + </span> + <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" title="Sends messages by email"/> </span> - <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" title="Sends messages by email"/> <t t-call="mail.chat.SidebarNeedaction"/> - <span t-attf-class="fa fa-times pull-right o_mail_partner_unpin #{counter ? 'hide' : ''}" + <span t-attf-class="fa fa-times o_mail_partner_unpin #{counter ? 'hide' : ''}" title="Leave this channel" t-att-data-channel-id="channel.id"/> </div> </t> |