diff options
Diffstat (limited to 'addons/mail/static/src/xml/mail.xml')
| -rw-r--r-- | addons/mail/static/src/xml/mail.xml | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 51942b4627e..aa4d5b0544e 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -102,7 +102,7 @@ <!-- contains the threads --> </ul> <!-- expandable message layout --> - <div class="oe_mail_msg_more_message"> + <div class="oe_mail_msg_more_message" style="display:none;"> <a class="oe_mail_fetch_more">Load more messages ...</a> </div> </div> @@ -114,25 +114,28 @@ <ul class="oe_header"> <li class="placeholder-mail-vote"><t t-call="mail.thread.message.vote"/></li> <t t-if="!widget.options.thread.display_on_flat"> - <li t-if="widget.options.thread._parents.length<=1 and widget.unread" title="Read"><a class="oe_read oe_e">W</a></li> - <li t-if="widget.options.thread.thread_level>=0 and !widget.unread" title="Set back to unread"><a class="oe_unread oe_e">h</a></li> - <li t-if="widget.options.thread.thread_level>=0 and widget.options.message.show_reply" title="Reply"><a class="oe_reply oe_e">)</a></li> + <li t-if="widget.options.thread._parents.length<=widget.options.thread.thread_level and widget.unread" title="Read"><a class="oe_read oe_e">W</a></li> + <li t-if="widget.options.thread._parents.length<=widget.options.thread.thread_level and !widget.unread" title="Set back to unread"><a class="oe_unread oe_e">h</a></li> + <li t-if="widget.options.thread._parents.length<=widget.options.thread.thread_level and widget.options.message.show_reply" title="Reply"><a class="oe_reply oe_e">)</a></li> <li t-if="widget.options.message.show_reply_by_email"><a class="oe_reply_by_email oe_e" title="Reply by mail">)</a></li> </t> - <li> - <span class="oe_dropdown_toggle"> - <a class="oe_e" title="More options">í</a> - <ul class="oe_dropdown_menu"> - <li t-if="widget.is_author and widget.options.message.show_dd_delete"><a class="oe_mail_msg_delete">Delete</a></li> - <!-- Uncomment when adding subtype hiding - <li t-if="display['show_hide']"> - <a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{widget.subtype}'>Hide '<t t-esc="widget.subtype"/>' for this document</a> - </li> --> - <li t-if="widget.options.message.show_dd_reply_by_email"><a class="oe_reply_by_email">Quote and reply</a></li> - <li t-if="widget.type == 'email'"><a class="oe_mail_msg_details" t-attf-href="#model=mail.message&id=#{widget.id}" >Details</a></li> - </ul> - </span> - </li> + <t t-if="widget.options.thread._parents.length<=widget.options.thread.thread_level and (widget.options.message.show_reply || widget.options.message.show_reply_by_email || (widget.is_author and widget.options.message.show_dd_delete) || widget.type == 'email')"> + <li> + <span class="oe_dropdown_toggle"> + <a class="oe_e" title="More options">í</a> + <ul class="oe_dropdown_menu"> + <li t-if="widget.is_author and widget.options.message.show_dd_delete"><a class="oe_mail_msg_delete">Delete</a></li> + <!-- Uncomment when adding subtype hiding + <li t-if="display['show_hide']"> + <a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{widget.subtype}'>Hide '<t t-esc="widget.subtype"/>' for this document</a> + </li> --> + <li t-if="widget.options.thread._parents.length<=widget.options.thread.thread_level and widget.options.message.show_reply" title="Reply"><a class="oe_reply oe_full_reply">Full reply</a></li> + <li t-if="widget.options.thread._parents.length<=widget.options.thread.thread_level and widget.options.message.show_reply_by_email"><a class="oe_reply_by_email oe_full_reply" title="Reply by mail">Full reply</a></li> + <li t-if="widget.type == 'email'"><a class="oe_mail_msg_details" t-attf-href="#model=mail.message&id=#{widget.id}" >Details</a></li> + </ul> + </span> + </li> + </t> </ul> <a t-attf-href="#model=res.partner&id=#{widget.author_id[0]}" t-att-title="widget.author_id[1]"> @@ -146,9 +149,6 @@ <t t-raw="widget.subject"/> </h1> <ul class="oe_mail_msg_footer"> - <li t-if="widget.options.message.show_record_name and widget.name and widget.subject and widget.options.thread.thread_level >= 0"> - <a t-attf-href="#model=#{widget.model}&id=#{widget.res_id}"><t t-raw="widget.name"/></a> - </li> <li t-if="widget.author_id"><a t-attf-href="#model=res.partner&id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a></li> <li><span t-att-title="widget.date"><t t-raw="widget.timerelative"/></span></li> @@ -161,8 +161,8 @@ </ul> <div class="oe_clear"/> <div class="oe_mail_msg_body"> - <t t-if="widget.options.message.show_record_name and widget.name and (!widget.subject) and (widget.options.thread.thread_level >= 0)"> - <a t-attf-href="#model=#{widget.model}&id=#{widget.res_id}"><t t-raw="widget.name"/></a> + <t t-if="widget.options.message.show_record_name and widget.record_name and (!widget.subject) and widget.options.thread._parents.length<=widget.options.thread.thread_level"> + <a class="oe_mail_action_model" t-attf-href="#model=#{widget.model}&id=#{widget.res_id}"><t t-raw="widget.record_name"/></a> </t> <t t-raw="widget.body"/> </div> |