diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-12-11 17:14:58 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-12-11 17:14:58 +0100 |
| commit | b541e7ce6477e2567eecbaa96a8cfeca02d3868d (patch) | |
| tree | 6168c91acf958998eed50b88a937f32bc4146f7b /addons/mail/static/src/xml/mail.xml | |
| parent | 023783324077937517a8fab476a3a5dbee5ed535 (diff) | |
| parent | 09030aa8d4c87d02e101af91e276ebeaacd43e91 (diff) | |
[MERGE] Sync with trunk. Cleaned a bit things lastly added in trunk/mail/tests.
bzr revid: tde@openerp.com-20121211161458-d7wv4lnkvs9s7srj
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 640d6c031a5..115047028f5 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. |