diff options
Diffstat (limited to 'addons/mail/static/src/xml')
| -rw-r--r-- | addons/mail/static/src/xml/composer.xml | 4 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/discuss.xml | 15 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/thread.xml | 18 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/thread_window.xml | 7 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/user_menu.xml | 11 |
5 files changed, 44 insertions, 11 deletions
diff --git a/addons/mail/static/src/xml/composer.xml b/addons/mail/static/src/xml/composer.xml index ff4680d7851..b9de0194e93 100644 --- a/addons/mail/static/src/xml/composer.xml +++ b/addons/mail/static/src/xml/composer.xml @@ -71,6 +71,10 @@ </t> <t t-name="mail.MentionSuggestions.Partner" t-extend="mail.MentionSuggestions"> <t t-jquery=".o_mention_proposition" t-operation="append"> + <t t-call="mail.UserStatus"> + <t t-set="status" t-value="suggestion.im_status"/> + <t t-set="partnerID" t-value="suggestion.id"/> + </t> <span class="o_mention_name"><t t-esc="suggestion.name"/></span> <t t-if="suggestion.email"> <span class="o_mention_info">(<t t-esc="suggestion.email"/>)</span> diff --git a/addons/mail/static/src/xml/discuss.xml b/addons/mail/static/src/xml/discuss.xml index 98430c81ce1..10fb71a5110 100644 --- a/addons/mail/static/src/xml/discuss.xml +++ b/addons/mail/static/src/xml/discuss.xml @@ -154,6 +154,7 @@ <span t-if="displayStatus"> <t t-call="mail.UserStatus"> <t t-set="status" t-value="channel.getStatus()"/> + <t t-set="partnerID" t-value="channel.getDirectPartnerID()"/> </t> </span> <span t-if="displayHash" class="o_mail_hash">#</span> @@ -176,11 +177,14 @@ <!-- @param {string} status + @param {integer|undefined} [partnerID] --> <t t-name="mail.UserStatus"> - <i t-if="status == 'online'" class="o_mail_user_status o_user_online fa fa-circle" title="Online" role="img" aria-label="User is online"/> - <i t-if="status == 'away'" class="o_mail_user_status o_user_idle fa fa-circle" title="Idle" role="img" aria-label="User is idle"/> - <i t-if="status == 'offline'" class="o_mail_user_status fa fa-circle-o" title="Offline" role="img" aria-label="User is offline"/> + <span t-att-class="partnerID ? 'o_updatable_im_status' : ''" t-att-data-partner-id="partnerID"> + <i t-if="status == 'online'" class="o_mail_user_status o_user_online fa fa-circle" title="Online" role="img" aria-label="User is online"/> + <i t-if="status == 'away'" class="o_mail_user_status o_user_idle fa fa-circle" title="Idle" role="img" aria-label="User is idle"/> + <i t-if="status == 'offline'" class="o_mail_user_status fa fa-circle" title="Offline" role="img" aria-label="User is offline"/> + </span> </t> <!-- @@ -300,8 +304,9 @@ t-att-data-preview-id="preview.id" t-att-data-document-id="preview.documentID" t-att-data-document-model="preview.documentModel" t-att-data-unread-counter="preview.unreadCounter" t-att-data-message-ids="preview.messageIDs"> <div t-attf-class="o_mail_preview_image #{preview.documentModel ? 'o_mail_preview_app' : ''}"> <img class="o_mail_preview_image" t-att-src="preview.imageSRC" alt="Preview"/> - <i t-if="preview.status === 'online'" class="o_mail_user_status o_user_online fa fa-circle" title="Online" role="img" aria-label="User is online"/> - <i t-if="preview.status === 'away'" class="o_mail_user_status o_user_idle fa fa-circle" title="Idle" role="img" aria-label="User is idle"/> + <t t-call="mail.UserStatus"> + <t t-set="status" t-value="preview.status"/> + </t> </div> <div class="o_preview_info"> <div class="o_preview_title"> diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml index be73917a1b5..f6d6ad599ec 100644 --- a/addons/mail/static/src/xml/thread.xml +++ b/addons/mail/static/src/xml/thread.xml @@ -258,12 +258,18 @@ <div t-att-class="'o_thread_message ' + (message.getID() === options.selectedMessageID ? 'o_thread_selected_message ' : ' ') + (message.isDiscussion() or message.isNotification() ? ' o_mail_discussion ' : ' o_mail_not_discussion ')" t-att-data-message-id="message.getID()"> <div t-if="options.displayAvatars" class="o_thread_message_sidebar"> <t t-if="message.hasAuthor()"> - <img t-if="displayAuthorMessages[message.getID()]" - alt="" - t-att-src="message.getAvatarSource()" - data-oe-model="res.partner" - t-att-data-oe-id="message.shouldRedirectToAuthor() ? message.getAuthorID() : ''" - t-attf-class="o_thread_message_avatar rounded-circle #{message.shouldRedirectToAuthor() ? 'o_mail_redirect' : ''}"/> + <div t-if="displayAuthorMessages[message.getID()]" class="o_thread_message_sidebar_image"> + <img + alt="" + t-att-src="message.getAvatarSource()" + data-oe-model="res.partner" + t-att-data-oe-id="message.shouldRedirectToAuthor() ? message.getAuthorID() : ''" + t-attf-class="o_thread_message_avatar rounded-circle #{message.shouldRedirectToAuthor() ? 'o_mail_redirect' : ''}"/> + <t t-call="mail.UserStatus"> + <t t-set="status" t-value="message.getAuthorImStatus()"/> + <t t-set="partnerID" t-value="message.getAuthorID()"/> + </t> + </div> </t> <t t-else=""> <img t-if="displayAuthorMessages[message.getID()]" diff --git a/addons/mail/static/src/xml/thread_window.xml b/addons/mail/static/src/xml/thread_window.xml index 4164bc0abc9..76a130d1ba2 100644 --- a/addons/mail/static/src/xml/thread_window.xml +++ b/addons/mail/static/src/xml/thread_window.xml @@ -6,6 +6,13 @@ --> <t t-name="mail.ThreadWindow" t-extend="mail.AbstractThreadWindow"> <t t-jquery=".o_thread_window_header" t-operation="after"> + <div class="o_out_of_office" t-if="widget.getOutOfOfficeInfo() or widget.getOutOfOfficeMessage()"> + <div class="o_out_of_office_info" t-if="widget.getOutOfOfficeInfo()" t-esc="widget.getOutOfOfficeInfo()"/> + <div class="o_out_of_office_text o_text_wrap" t-if="widget.getOutOfOfficeMessage()"> + <t t-esc="widget.getOutOfOfficeMessage()"/> + <a href="#" class="o_out_of_office_read_more_less_button">Read more</a> + </div> + </div> <div t-if="!widget.hasThread()" class="o_thread_search_input"> <span> To: </span> <input type="text" placeholder="User name"/> diff --git a/addons/mail/static/src/xml/user_menu.xml b/addons/mail/static/src/xml/user_menu.xml new file mode 100644 index 00000000000..b5186c3b056 --- /dev/null +++ b/addons/mail/static/src/xml/user_menu.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<templates xml:space="preserve"> + + <t t-extend="UserMenu"> + <t t-jquery=".oe_topbar_name" t-operation="before"> + <t t-if="widget.outOfOfficeMessage"> + <i class="o_mail_user_status o_user_idle fa fa-minus-circle" title="You have set an out of office message."/> + </t> + </t> + </t> +</templates> |