diff options
Diffstat (limited to 'addons/mail/static/src/xml/mail.xml')
| -rw-r--r-- | addons/mail/static/src/xml/mail.xml | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 89fbe45dc36..bb787c9a21b 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -39,8 +39,9 @@ </div> </div> <div t-if="widget.show_compact_message and !widget.show_composer" t-attf-class="oe_msg oe_msg_composer_compact #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''}"> - <textarea t-if="!widget.options.view_mailbox" class="field_text oe_compact" placeholder="Write to the followers of this docmuent..."/> - <textarea t-if="widget.options.view_mailbox" class="field_text oe_compact" placeholder="Write to my followers..."/> + <textarea t-if="widget.options.compose_placeholder" class="field_text oe_compact" t-att-placeholder="widget.options.compose_placeholder"/> + <textarea t-if="!widget.options.compose_placeholder and !widget.options.view_mailbox" class="field_text oe_compact" placeholder="Write an internal note..."/> + <textarea t-if="!widget.options.compose_placeholder and widget.options.view_mailbox" class="field_text oe_compact" placeholder="Share to my followers..."/> </div> <span t-if="!(widget.show_compact_message and !widget.show_composer) and !widget.show_composer" class="oe_placeholder_compose"></span> </t> @@ -84,7 +85,7 @@ </t> <t t-if="attachment.filetype === 'webimage'"> <div t-attf-class="oe_attachment oe_preview #{attachment.upload ? 'oe_uploading' : ''}"> - <a t-att-href='attachment.url'><img t-att-src="widget.attachments_resize_image(attachment.id, [100,100])"></img></a> + <a t-att-href='attachment.url'><img t-att-src="widget.attachments_resize_image(attachment.id, [100,80])"></img></a> <div class='oe_delete oe_e'>[</div> <div class='oe_name'><t t-raw='attachment.name' /></div> <div class='oe_progress_bar'> @@ -101,7 +102,13 @@ <t t-name="mail.thread.list_recipients"> <div class="oe_mail_list_recipients"> To: - <span t-if="!widget.is_private" class="oe_all_follower">Followers <t t-raw="' of ' + (widget.parent_thread.parent_message.record_name ? '"' + widget.parent_thread.parent_message.record_name + '"' : 'this document')"/></span> + <t t-if="!widget.is_private"> + <span class="oe_all_follower"> + Followers of + <t t-if="widget.parent_thread.parent_message.record_name" t-raw="'"' + widget.parent_thread.parent_message.record_name + '"'"/> + <t t-if="!widget.parent_thread.parent_message.record_name">this document</t> + </span> + </t> <t t-if="!widget.is_private and widget.partner_ids.length"> and </t> <t t-set="inc" t-value="0"/> <t t-if="widget.partner_ids.length" t-foreach="widget.partner_ids" t-as="partner"><span t-attf-class="oe_partner_follower #{inc>=3?'oe_hidden':''}"><t t-if="inc" t-raw="', '"/><a t-attf-href="#model=res.partner&id=#{partner[0]}"><t t-raw="partner[1]"/></a></span><t t-set="inc" t-value="inc+1"/> @@ -129,9 +136,15 @@ <td colspan="2"> <h2 class="oe_view_title"> <span class="oe_view_title_text"> - Email box + <t t-raw="widget.action.name"/> </span> </h2> + <t t-if="widget.action.params.header_description"> + <br/> + <span class="oe_view_subtitle_text"> + <t t-raw="widget.action.params.header_description"/> + </span> + </t> </td> <td><div class="oe_view_manager_view_search" t-opentag="true"/></td> </tr> @@ -192,13 +205,11 @@ </div> <!-- message itself --> <div class="oe_msg_content"> - <h1 t-if="widget.subject and !widget.thread_level" class="oe_msg_title"> - <t t-raw="widget.subject"/> + <h1 t-if="(widget.show_record_name or widget.subject) and !widget.thread_level" class="oe_msg_title"> + <a t-if="widget.show_record_name" class="oe_mail_action_model" t-attf-href="#model=#{widget.model}&id=#{widget.res_id}"><t t-raw="widget.record_name"/></a> + <t t-if="widget.subject" t-raw="widget.subject"/> </h1> <div class="oe_msg_body"> - <t t-if="widget.show_record_name"> - <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> </div> @@ -209,13 +220,6 @@ <a t-if="widget.author_id" t-attf-href="#model=res.partner&id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a> <span class='oe_subtle'>•</span> <span t-att-title="widget.date"><t t-raw="widget.timerelative"/></span> - <t t-if='widget.attachment_ids.length > 0'> - <span class='oe_subtle'>•</span> - <a class="oe_view_attachments"> - <t t-if="widget.attachment_ids.length == 1">1 Attachment</t> - <t t-if="widget.attachment_ids.length > 1"><t t-raw="widget.attachment_ids.length"/> Attachments</t> - </a> - </t> <span class='oe_subtle'>•</span> <t t-call="mail.thread.message.vote"/> </div> |