diff options
| author | Géry Debongnie <ged@odoo.com> | 2015-11-10 10:04:02 +0100 |
|---|---|---|
| committer | Géry Debongnie <ged@odoo.com> | 2015-11-12 08:51:56 +0100 |
| commit | bac5a1945171c4d1ed5eed21c64b14624be24ae3 (patch) | |
| tree | 01ed8241ddf643bb63937c60ba0a8a8f6bc32a69 /addons/mail/static/src/xml/thread.xml | |
| parent | 5264ccf0d0ebbfc6600ba5d3c0efc16bbe05c4d4 (diff) | |
[FIX] mail: various small UI tweaks/fixes
- put the mentionned partners and the attachment above the composer
instead of below
- debounce some links in thread.js to prevent double loading views when
double-clicking
- readd the # in front of the channelname of the title of the client action
- give the channel_id to the thread in a chat window, so it does not
display the channel name everytime it displays a message
- correctly close dm chat window when the dm channel is closed in the
main sidebar
- simplify the help messages when a channel is empty
Diffstat (limited to 'addons/mail/static/src/xml/thread.xml')
| -rw-r--r-- | addons/mail/static/src/xml/thread.xml | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml index 7d1c28e964a..b2b5fa088f1 100644 --- a/addons/mail/static/src/xml/thread.xml +++ b/addons/mail/static/src/xml/thread.xml @@ -9,13 +9,23 @@ <t t-if="options.display_load_more && options.display_order == ORDER.DESC" t-call="mail.ChatThread.LoadMore"/> </t> - <t t-if="!messages.length && options.no_content_helper"> - <div class="o_chat_help_message"> - <t t-raw="options.no_content_helper"/> - </div> + <t t-if="!messages.length && options.display_help"> + <t t-call="mail.EmptyChannel" /> </t> </t> + <!-- When a channel is empty--> + <div t-name="mail.EmptyChannel"> + <t t-if="options.channel_id==='channel_inbox'"> + <div class="o_thread_title">Congratulation, your inbox is empty</div> + <div>New messages will appear here.</div> + </t> + <t t-if="options.channel_id==='channel_starred'"> + <div class="o_thread_title">No message starred</div> + <div> You can mark any message as 'starred', and it will show up in this channel.</div> + </t> + </div> + <t t-name="mail.ChatThread.Content"> <t t-if="options.messages_separator_position == 'top'" t-call="mail.MessagesSeparator"/> <t t-set="current_day" t-value="0"/> @@ -80,7 +90,7 @@ on <a class="o_mail_redirect" href="#" t-att-data-oe-model="message.model" t-att-data-oe-id="message.res_id"><t t-esc="message.record_name"/></a> </t> <t t-if="message.origin_id && (message.origin_id !== options.channel_id)"> - (from <a class="o_channel_redirect" t-att-data-oe-id="message.origin_id" href="#"><t t-esc="message.origin_name"/>)</a> + (from <a class="o_channel_redirect" 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'" |
