diff options
| author | Olivier Dony <odo@openerp.com> | 2012-12-11 18:01:19 +0100 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2012-12-11 18:01:19 +0100 |
| commit | 5b56a77add9a4f92b5cf2f84d419caff9b0dc4e6 (patch) | |
| tree | e1f7f576fa8944d2d72e64876e7c42327e5d8879 /addons/mail/static/src/xml/mail.xml | |
| parent | f5fd0fc0815190b3e80854a8ad0afa7a5d1271c4 (diff) | |
| parent | 33ae7185620cec8e621f7cec592db82c6b9e12fe (diff) | |
[MERGE] Sync with trunk
bzr revid: odo@openerp.com-20121211170119-5spf2iqzl89kphnk
Diffstat (limited to 'addons/mail/static/src/xml/mail.xml')
| -rw-r--r-- | addons/mail/static/src/xml/mail.xml | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index cca908a5d98..67449cca0ba 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -75,7 +75,7 @@ <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'> + <a t-att-href='attachment.url' target="_blank"> <img t-att-src="'/mail/static/src/img/mimetypes/' + attachment.filetype + '.png'"></img> <div class='oe_name'><t t-raw='attachment.name' /></div> </a> @@ -87,7 +87,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'> + <a t-att-href='attachment.url' target="_blank"> <img t-att-src="widget.attachments_resize_image(attachment.id, [100,80])"></img> <div class='oe_name'><t t-raw='attachment.name' /></div> </a> @@ -180,6 +180,12 @@ </t> <!-- + error message for uploading + --> + <t t-name="mail.error_upload">Uploading error</t> + <t t-name="mail.error_upload_please_wait">Please, wait while the file is uploading.</t> + + <!-- record_thread main template Template used to display the communication history in documents form view. |