diff options
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/chatter.xml | 2 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/composer.xml | 16 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/systray.xml | 15 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/thread.xml | 4 |
5 files changed, 21 insertions, 18 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/chatter.xml b/addons/mail/static/src/xml/chatter.xml index cf6096bc8a9..408e425381d 100644 --- a/addons/mail/static/src/xml/chatter.xml +++ b/addons/mail/static/src/xml/chatter.xml @@ -54,7 +54,7 @@ <!-- Add a button to open the full composer dialog --> <t t-jquery=".o_composer_button_add_attachment" t-operation="after"> - <button class="btn btn-sm btn-icon fa fa-pencil-square-o o_composer_button_full_composer" type="button"/> + <button tabindex="6" class="btn btn-sm btn-icon fa fa-pencil-square-o o_composer_button_full_composer" type="button"/> </t> </t> diff --git a/addons/mail/static/src/xml/composer.xml b/addons/mail/static/src/xml/composer.xml index 25f9ba6bfda..1c1f36499bb 100644 --- a/addons/mail/static/src/xml/composer.xml +++ b/addons/mail/static/src/xml/composer.xml @@ -5,23 +5,23 @@ <div class="o_composer_attachments_list"/> <t t-if="widget.extended"> <div class="o_composer_subject"> - <input type="text" placeholder="Subject"></input> + <input tabindex="1" type="text" placeholder="Subject"></input> <div class="btn-group o_composer_buttons"> - <button class="btn btn-sm btn-primary o_composer_button_send" type="button"><t t-esc="widget.options.send_text"/></button> - <button class="btn btn-sm btn-icon fa fa-smile-o o_composer_button_emoji" type="button" data-toggle="popover"/> - <button class="btn btn-sm btn-icon fa fa-paperclip o_composer_button_add_attachment" type="button"/> + <button tabindex="3" class="btn btn-sm btn-primary o_composer_button_send" type="button"><t t-esc="widget.options.send_text"/></button> + <button tabindex="4" class="btn btn-sm btn-icon fa fa-smile-o o_composer_button_emoji" type="button" data-toggle="popover"/> + <button tabindex="5" class="btn btn-sm btn-icon fa fa-paperclip o_composer_button_add_attachment" type="button"/> </div> </div> </t> <div t-attf-class="o_composer #{widget.extended ? 'o_extended_composer' : ''}"> <div class="o_composer_input"> - <textarea placeholder="Write something..."/> + <textarea tabindex="2" placeholder="Write something..."/> </div> <t t-if="!widget.extended"> <div class="btn-group o_composer_buttons"> - <button class="btn btn-sm btn-primary o_composer_button_send" type="button"><t t-esc="widget.options.send_text"/></button> - <button class="btn btn-sm btn-icon fa fa-smile-o o_composer_button_emoji" type="button" data-toggle="popover"/> - <button class="btn btn-sm btn-icon fa fa-paperclip o_composer_button_add_attachment" type="button"/> + <button tabindex="3" class="btn btn-sm btn-primary o_composer_button_send" type="button"><t t-esc="widget.options.send_text"/></button> + <button tabindex="4" class="btn btn-sm btn-icon fa fa-smile-o o_composer_button_emoji" type="button" data-toggle="popover"/> + <button tabindex="5" class="btn btn-sm btn-icon fa fa-paperclip o_composer_button_add_attachment" type="button"/> </div> </t> </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> diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml index 970c8ff6a6f..ca863d9ad8f 100644 --- a/addons/mail/static/src/xml/thread.xml +++ b/addons/mail/static/src/xml/thread.xml @@ -46,7 +46,7 @@ </t> <t t-name="mail.ChatThread.Message"> - <div class="o_thread_message" t-att-data-message-id="message.id"> + <div t-att-class="'o_thread_message' + (message.expanded ? ' o_message_expanded' : '')" t-att-data-message-id="message.id"> <div t-if="options.display_avatar" class="o_thread_message_sidebar"> <t t-if="!message.mailto && message.author_id[0]"> <img t-if="message.avatar_src && message.display_author" @@ -97,7 +97,7 @@ (from <a t-att-data-oe-id="message.origin_id" href="#">#<t t-esc="message.origin_name"/></a>) </t> <span> - <i t-if="options.display_stars && message.message_type != 'notification'" + <i t-if="options.display_stars && !message.is_system_notification" t-att-class="'fa fa-lg o_thread_message_star ' + (message.is_starred ? 'fa-star' : 'fa-star-o')" t-att-data-message-id="message.id" title="Mark as Todo"/> <i t-if="message.is_needaction && options.display_needactions" |