diff options
Diffstat (limited to 'addons/mail/static/src/xml/mail.xml')
| -rw-r--r-- | addons/mail/static/src/xml/mail.xml | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index bb787c9a21b..cca908a5d98 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -34,14 +34,14 @@ <button class="oe_post">Post</button> <t t-call="mail.compose_message.add_attachment"/> <!--<a class="oe_cancel oe_e">X</a>--> - <button class="oe_full"><span class='oe_e'>&ograve</span></button> + <button class="oe_full" title="Open the full mail composer"><span class='oe_e'>&ograve</span></button> </div> </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.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..."/> + <textarea t-if="!widget.options.compose_placeholder and !widget.options.view_mailbox" class="field_text oe_compact" placeholder="Write to the followers of this document..."/> + <textarea t-if="!widget.options.compose_placeholder and widget.options.view_mailbox" class="field_text oe_compact" placeholder="Share with my followers..."/> </div> <span t-if="!(widget.show_compact_message and !widget.show_composer) and !widget.show_composer" class="oe_placeholder_compose"></span> </t> @@ -75,9 +75,11 @@ <t t-foreach='widget.attachment_ids' t-as='attachment'> <t t-if="attachment.filetype !== 'webimage'"> <div t-attf-class="oe_attachment #{attachment.upload ? 'oe_uploading' : ''}"> - <a t-att-href='attachment.url'><img t-att-src="'/mail/static/src/img/mimetypes/' + attachment.filetype + '.png'"></img></a> + <a t-att-href='attachment.url'> + <img t-att-src="'/mail/static/src/img/mimetypes/' + attachment.filetype + '.png'"></img> + <div class='oe_name'><t t-raw='attachment.name' /></div> + </a> <div class='oe_delete oe_e' title="Delete this attachment" t-attf-data-id="{attachment.id}">[</div> - <div class='oe_name'><t t-raw='attachment.name' /></div> <div class='oe_progress_bar'> uploading </div> @@ -85,9 +87,11 @@ </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,80])"></img></a> + <a t-att-href='attachment.url'> + <img t-att-src="widget.attachments_resize_image(attachment.id, [100,80])"></img> + <div class='oe_name'><t t-raw='attachment.name' /></div> + </a> <div class='oe_delete oe_e'>[</div> - <div class='oe_name'><t t-raw='attachment.name' /></div> <div class='oe_progress_bar'> uploading </div> @@ -111,7 +115,11 @@ </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"/> + <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-if="widget.options.show_link_partner" t-attf-href="#model=res.partner&id=#{partner[0]}"><t t-raw="partner[1]"/></a> + <t t-if="!widget.options.show_link_partner" t-raw="partner[1]"/> + </span><t t-set="inc" t-value="inc+1"/> </t> <t t-if="widget.partner_ids.length>=3"> <span class="oe_more">, <a><t t-raw="widget.partner_ids.length-3"/> others...</a></span> @@ -148,7 +156,7 @@ </td> <td><div class="oe_view_manager_view_search" t-opentag="true"/></td> </tr> - <tr class="oe_header_row" t-if="widget.action.params.view_inbox" > + <tr class="oe_header_row" t-if="widget.action.params.view_inbox and widget.action.params.show_compose_message" > <td colspan="2"> <button type="button" class="oe_write_full oe_highlight"> Compose a new message @@ -190,14 +198,15 @@ <div t-attf-class="oe_msg #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''} oe_msg_#{widget.type}"> <div class='oe_msg_left'> - <a t-attf-href="#model=res.partner&id=#{widget.author_id[0]}" t-att-title="widget.author_id[1]"> + <a t-if="widget.options.show_link_partner" t-attf-href="#model=res.partner&id=#{widget.author_id[0]}" t-att-title="widget.author_id[1]"> <img class="oe_msg_icon" t-att-src="widget.avatar"/> </a> + <img t-if="!widget.options.show_link_partner" class="oe_msg_icon" t-att-src="widget.avatar"/> </div> <div class="oe_msg_center"> <div class='oe_msg_icons'> - <span class='oe_read' t-if="widget.options.show_read"><a title="Done" class="oe_e">X</a></span> + <span class='oe_read' t-if="widget.options.show_read"><a title="Done" class="oe_e">W</a></span> <span class='oe_unread' t-if="widget.is_favorite and widget.options.show_unread"><a title="Set back to Todo" class="oe_e">v</a></span> <span class='oe_unread' t-if="!widget.is_favorite and widget.options.show_unread"><a title="Set back to Inbox" class="oe_e">v</a></span> <span class='oe_reply' t-if="widget.options.show_reply_button"><a title="Reply" class="oe_e">(</a></span> @@ -217,7 +226,8 @@ <t t-if="widget.attachment_ids.length > 0"> <div class="oe_msg_attachment_list"></div> </t> - <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> + <a t-if="widget.author_id and widget.options.show_link_partner" t-attf-href="#model=res.partner&id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a> + <span t-if="widget.author_id and !widget.options.show_link_partner"><t t-raw="widget.author_id[1]"/></span> <span class='oe_subtle'>•</span> <span t-att-title="widget.date"><t t-raw="widget.timerelative"/></span> <span class='oe_subtle'>•</span> |