diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-01-12 15:30:29 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-01-12 15:30:29 +0100 |
| commit | 7fa6f73302709d7e7b6b19ebd16d338b3dd0e2db (patch) | |
| tree | 1487b6fe232e0b9477a6e68018d5bc5d3432372f /addons/mail/static/src/xml | |
| parent | 2a834c22b0570b3a0d5ec5b4a8a0b378e3a6e12b (diff) | |
| parent | cb79297a41b7747a9318fd4794dce422ee931060 (diff) | |
[MERGE] forward port of branch 9.0 up to cb79297
Diffstat (limited to 'addons/mail/static/src/xml')
| -rw-r--r-- | addons/mail/static/src/xml/chatter.xml | 6 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/client_action.xml | 15 |
2 files changed, 14 insertions, 7 deletions
diff --git a/addons/mail/static/src/xml/chatter.xml b/addons/mail/static/src/xml/chatter.xml index 6207cdb3980..cf6096bc8a9 100644 --- a/addons/mail/static/src/xml/chatter.xml +++ b/addons/mail/static/src/xml/chatter.xml @@ -154,7 +154,13 @@ <span t-att-for="'input_mail_followers_subtype_'+record.id+(dialog ? '_in_dialog': '')"> <t t-esc="record.name"/> </span> + <i t-if="display_warning" class="fa fa-warning text-warning"/> </li> </t> + <t t-name="mail.Followers.subtypes.warning"> + <span class="text-warning"> + <i class="fa fa-warning"/> Be careful with channels following internal notifications + </span> + </t> </templates> diff --git a/addons/mail/static/src/xml/client_action.xml b/addons/mail/static/src/xml/client_action.xml index 18fef4a4ed6..da2e29057e0 100644 --- a/addons/mail/static/src/xml/client_action.xml +++ b/addons/mail/static/src/xml/client_action.xml @@ -4,14 +4,15 @@ <!-- Client Action --> <t t-name="mail.client_action"> <div class="o_mail_chat"> - <t t-if="widget.notification_bar"> - <div class="o_mail_annoying_notification_bar"> - <span class="o_mail_request_permission">Odoo needs your permission to <a href="#"> enable desktop notifications</a>.</span> - <span class="fa fa-close"></span> - </div> - </t> <div class="o_mail_chat_sidebar"/> - <div class="o_mail_chat_content"/> + <div class="o_mail_chat_content"> + <t t-if="widget.notification_bar"> + <div class="o_mail_annoying_notification_bar"> + <span class="o_mail_request_permission">Odoo needs your permission to <a href="#"> enable desktop notifications</a>.</span> + <span class="fa fa-close"></span> + </div> + </t> + </div> </div> </t> <t t-name="mail.chat.Sidebar"> |