Skip to content
Snippets Groups Projects
Commit ece650c1 authored by Jay Savaliya's avatar Jay Savaliya Committed by Alexandre Kühn
Browse files

[FIX] mail: email/sms error icon overlap


Before this commit:
-While reading chatter notifications in the chat window, SMS and email icons are
not accessible to click due to action list overlap.
-While reading a reply on any message or attachment in chat widow,
the attachment link is not accessible to click due to action list overlap.

After this commit:
-When SMS and email icons are visible, time and that icon will display to the
following line so user can click on it easily.
-Attachment links will display to the following line of mentioned so user can click
on it easily.

Task-2713371

closes odoo/odoo#131020

Signed-off-by: default avatarAlexandre Kühn (aku) <aku@odoo.com>
parent 75fc0083
No related branches found
No related tags found
No related merge requests found
...@@ -81,6 +81,25 @@ ...@@ -81,6 +81,25 @@
Anonymous Anonymous
</div> </div>
</t> </t>
<t t-if="threadView and messageView.message.originThread and messageView.message.originThread === threadView.thread and messageView.message.notifications.length > 0">
<t t-if="messageView.message.failureNotifications.length > 0">
<span class="o_Message_notificationIconClickable o-error mr-1" role="button" tabindex="0" t-on-click="_onClickFailure">
<i name="failureIcon" class="o_Message_notificationIcon fa fa-envelope" role="img" aria-label="Delivery failure"/>
</span>
</t>
<t t-else="">
<Popover>
<span class="o_Message_notificationIconClickable mr-1">
<i name="notificationIcon" class="o_Message_notificationIcon fa fa-envelope-o"/>
</span>
<t t-set="opened">
<NotificationPopover
notificationLocalIds="messageView.message.notifications.map(notification => notification.localId)"
/>
</t>
</Popover>
</t>
</t>
<t t-if="messageView.message.date"> <t t-if="messageView.message.date">
<div class="o_Message_date o_Message_headerDate" t-att-class="{ 'o-message-selected': isSelected }" t-att-title="datetime"> <div class="o_Message_date o_Message_headerDate" t-att-class="{ 'o-message-selected': isSelected }" t-att-title="datetime">
- <t t-esc="messageView.message.dateFromNow"/> - <t t-esc="messageView.message.dateFromNow"/>
...@@ -99,25 +118,6 @@ ...@@ -99,25 +118,6 @@
</t> </t>
</div> </div>
</t> </t>
<t t-if="threadView and messageView.message.originThread and messageView.message.originThread === threadView.thread and messageView.message.notifications.length > 0">
<t t-if="messageView.message.failureNotifications.length > 0">
<span class="o_Message_notificationIconClickable o-error" role="button" tabindex="0" t-on-click="_onClickFailure">
<i name="failureIcon" class="o_Message_notificationIcon fa fa-envelope" role="img" aria-label="Delivery failure"/>
</span>
</t>
<t t-else="">
<Popover>
<span class="o_Message_notificationIconClickable">
<i name="notificationIcon" class="o_Message_notificationIcon fa fa-envelope-o"/>
</span>
<t t-set="opened">
<NotificationPopover
notificationLocalIds="messageView.message.notifications.map(notification => notification.localId)"
/>
</t>
</Popover>
</t>
</t>
</div> </div>
</t> </t>
<t t-if="messageView.message.subject and !messageView.message.isSubjectSimilarToOriginThreadName"> <t t-if="messageView.message.subject and !messageView.message.isSubjectSimilarToOriginThreadName">
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<t t-if="messageInReplyToView"> <t t-if="messageInReplyToView">
<t t-if="!messageInReplyToView.messageView.message.parentMessage.isEmpty"> <t t-if="!messageInReplyToView.messageView.message.parentMessage.isEmpty">
<b class="o_MessageInReplyToView_author text-muted ml-2">@<t t-esc="messageInReplyToView.messageView.message.parentMessage.authorName"/></b> <b class="o_MessageInReplyToView_author text-muted ml-2">@<t t-esc="messageInReplyToView.messageView.message.parentMessage.authorName"/></b>
<br t-if="messageInReplyToView and messageInReplyToView.messageView.threadView.threadViewer.chatWindow"/>
<span class="o_MessageInReplyToView_body ml-1" t-on-click="messageInReplyToView.onClickReply"> <span class="o_MessageInReplyToView_body ml-1" t-on-click="messageInReplyToView.onClickReply">
<t t-if="messageInReplyToView.hasBodyBackLink"> <t t-if="messageInReplyToView.hasBodyBackLink">
<t t-raw="messageInReplyToView.messageView.message.parentMessage.prettyBody"/> <t t-raw="messageInReplyToView.messageView.message.parentMessage.prettyBody"/>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment