diff options
Diffstat (limited to 'addons/mail/static/src/xml')
| -rw-r--r-- | addons/mail/static/src/xml/chatter.xml | 2 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/composer.xml | 4 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/thread.xml | 9 |
3 files changed, 9 insertions, 6 deletions
diff --git a/addons/mail/static/src/xml/chatter.xml b/addons/mail/static/src/xml/chatter.xml index f8ce3057e14..6207cdb3980 100644 --- a/addons/mail/static/src/xml/chatter.xml +++ b/addons/mail/static/src/xml/chatter.xml @@ -53,7 +53,7 @@ </t> <!-- Add a button to open the full composer dialog --> - <t t-jquery=".o_composer_buttons" t-operation="append"> + <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"/> </t> </t> diff --git a/addons/mail/static/src/xml/composer.xml b/addons/mail/static/src/xml/composer.xml index 9a1e679c4ba..d199c0d5fdf 100644 --- a/addons/mail/static/src/xml/composer.xml +++ b/addons/mail/static/src/xml/composer.xml @@ -4,11 +4,11 @@ <div t-name="mail.ChatComposer" class="o_chat_composer"> <div class="o_composer_attachments_list"/> <div class="o_composer"> - <textarea class="o_composer_input" placeholder="Write something"/> + <textarea class="o_composer_input" placeholder="Write something..."/> <div class="btn-group o_composer_buttons"> - <button class="btn btn-sm btn-primary o_composer_button_send" type="button">Send</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 class="btn btn-sm btn-primary o_composer_button_send" type="button">Send</button> </div> </div> diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml index 70996dd7d47..ebf6687c1a3 100644 --- a/addons/mail/static/src/xml/thread.xml +++ b/addons/mail/static/src/xml/thread.xml @@ -9,9 +9,13 @@ <t t-if="options.display_load_more && options.display_order == ORDER.DESC" t-call="mail.ChatThread.LoadMore"/> </t> - <t t-if="!messages.length && options.display_help"> + <t t-if="options.display_empty_channel"> <t t-call="mail.EmptyChannel" /> </t> + <t t-if="options.display_no_match"> + <div class="o_thread_title">No matches found</div> + <div>No message matches your search. Try to change your search filters.</div> + </t> </t> <!-- When a channel is empty--> @@ -107,7 +111,7 @@ </t> <t t-call="mail.ChatThread.MessageTracking"/> </t> - <p t-if="message.subject" class="o_mail_subject">Subject: <t t-esc="message.subject"/></p> + <p t-if="options.display_subject && message.subject && message.message_type != 'notification'" 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"> @@ -115,7 +119,6 @@ </div> <div class="o_mail_body_long"> <t t-raw="message.body"/> - <span class="oe_mail_expand"><a href="#">... read less</a></span> </div> </t> <t t-if="! message.body_short"> |