diff options
| author | Géry Debongnie <ged@odoo.com> | 2016-02-10 10:46:40 +0100 |
|---|---|---|
| committer | Géry Debongnie <ged@odoo.com> | 2016-02-11 15:49:10 +0100 |
| commit | f201cb5b7ef859bb3f8535e315a3b7ed2245fa42 (patch) | |
| tree | 5e8beb06d63469b2cbbfec8557212a6f9d5cc24f /addons/mail/static/src/xml/thread.xml | |
| parent | f89eda9eb20380acef834379a74529e405ad8d63 (diff) | |
[FIX] mail: various ui improvements
- swap reply-to and mark-as-unread buttons in threads
- remove blockquote from stripped html in channel previews
- readd padding to no-content message in threads, also to no match found
message
- add 1 to chat window z-index to prevent control panel buttons to show
through it
Diffstat (limited to 'addons/mail/static/src/xml/thread.xml')
| -rw-r--r-- | addons/mail/static/src/xml/thread.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml index 6ed0700be11..5c0c958bb69 100644 --- a/addons/mail/static/src/xml/thread.xml +++ b/addons/mail/static/src/xml/thread.xml @@ -12,14 +12,14 @@ <t t-if="options.display_empty_channel"> <t t-call="mail.EmptyChannel" /> </t> - <t t-if="options.display_no_match"> + <div t-if="options.display_no_match" class="o_mail_no_content"> <div class="o_thread_title">No matches found</div> <div>No message matches your search. Try to change your search filters.</div> - </t> + </div> </t> <!-- When a channel is empty--> - <div t-name="mail.EmptyChannel"> + <div t-name="mail.EmptyChannel" class="o_mail_no_content"> <t t-if="options.channel_id==='channel_inbox'"> <div class="o_thread_title">Congratulations, your inbox is empty</div> <div>New messages appear here.</div> @@ -100,12 +100,12 @@ <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" - class="fa fa-check o_thread_message_needaction" - t-att-data-message-id="message.id" title="Mark as Read"/> <i t-if="message.record_name && message.model != 'mail.channel' && options.display_reply_icon" class="fa fa-reply o_thread_message_reply" t-att-data-message-id="message.id" title="Reply"/> + <i t-if="message.is_needaction && options.display_needactions" + class="fa fa-check o_thread_message_needaction" + t-att-data-message-id="message.id" title="Mark as Read"/> </span> </p> <t t-if="message.tracking_value_ids && message.tracking_value_ids.length > 0"> |
