diff options
| author | Aaron Bohy <aab@odoo.com> | 2016-01-26 12:18:35 +0100 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2016-02-01 11:31:09 +0100 |
| commit | ef77e6821a00b5646e68aee00fa2c3e26704f21e (patch) | |
| tree | a46c1acfef89235b4ee8ae2c9177924f9fbe7921 /addons/mail/static/src/xml | |
| parent | 68c928aca73104fe29d0dd3e48aa1055d2780aae (diff) | |
[FIX] mail: systray: move Inbox counter to its own item
Clicking on that item redirects to the Inbox in Discuss.
The messaging menu's counter is now the number of conversations (public or
private channels, dm and livechat) in which there is at least one unread
message. Moreover, it is emphasized when one of those conversations is a chat.
Also make mass-mailing channels available through the messaging menu (for
consistency as its counter takes those channels into account) and allow to open
them in chat windows without input.
Diffstat (limited to 'addons/mail/static/src/xml')
| -rw-r--r-- | addons/mail/static/src/xml/chat_window.xml | 2 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/systray.xml | 15 |
2 files changed, 10 insertions, 7 deletions
diff --git a/addons/mail/static/src/xml/chat_window.xml b/addons/mail/static/src/xml/chat_window.xml index eb003cd59cd..7bb854a274c 100644 --- a/addons/mail/static/src/xml/chat_window.xml +++ b/addons/mail/static/src/xml/chat_window.xml @@ -11,7 +11,7 @@ </div> <div class="o_chat_content"> </div> - <div class="o_chat_input"> + <div t-if='!widget.options.input_less' class="o_chat_input"> <input t-att-placeholder="widget.options.placeholder"/> </div> </div> diff --git a/addons/mail/static/src/xml/systray.xml b/addons/mail/static/src/xml/systray.xml index 247096b3b6e..4a987fdf992 100644 --- a/addons/mail/static/src/xml/systray.xml +++ b/addons/mail/static/src/xml/systray.xml @@ -1,9 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <templates> + <t t-name="mail.chat.InboxItem"> + <li class="o_mail_navbar_item"> + <a href="#" title="Inbox"> + <i class="fa fa-at"/> <span class="o_notification_counter"/> + </a> + </li> + </t> + <t t-name="mail.chat.MessagingMenu"> <li class="o_mail_navbar_item"> - <a class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false" title="Messages" href="#"> + <a class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false" title="Conversations" href="#"> <i class="fa fa-comments"/> <span class="o_notification_counter"/> </a> <ul class="o_mail_navbar_dropdown dropdown-menu" role="menu"> @@ -16,11 +24,6 @@ <button type="button" class="btn btn-sm o_new_message"> New message </button> </li> <li class="o_mail_navbar_dropdown_channels"/> - <li class="o_mail_navbar_dropdown_bottom"> - <button type="button" class="btn o_redirect_to_discuss"> - @Inbox <span class="o_inbox_counter"/> - </button> - </li> </ul> </li> </t> |