pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] mail: various ui improvements

Browse Source 
- 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
This commit is contained in:
Géry Debongnie
2016-02-11 15:49:10 +01:00
parent f89eda9eb2
commit f201cb5b7e
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/static/src/js/chat_manager.js
+1 -1
View File
@@ -134,7 +134,7 @@ function strip_html (node, transform_children) {
function inline (node, transform_children) {
if (node.nodeType === 3) return node.data;
if (node.tagName === "BR") return " ";
if (node.tagName.match(/^(A|P|DIV|PRE)$/)) return transform_children();
if (node.tagName.match(/^(A|P|DIV|PRE|BLOCKQUOTE)$/)) return transform_children();
node.innerHTML = transform_children();
return node.outerHTML;
}
addons/mail/static/src/less/chat_window.less
+1 -1
View File
@@ -13,7 +13,7 @@
background-color: @o-chat-window-bg;
border: 1px solid gray;
border-radius: 3px;
z-index: 2;
z-index: 3;
@media (max-width: @screen-xs-max) {
width: 100%;
addons/mail/static/src/less/thread.less
+4
View File
@@ -161,4 +161,8 @@
margin-bottom: 20px;
font-size: 20px;
}
.o_mail_no_content {
.o-webclient-padding();
}
}
addons/mail/static/src/xml/thread.xml
+6 -6
View File
@@ -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 &amp;&amp; !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 &amp;&amp; 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 &amp;&amp; message.model != 'mail.channel' &amp;&amp; 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 &amp;&amp; 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 &amp;&amp; message.tracking_value_ids.length &gt; 0">