diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-11-12 16:49:56 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-11-12 16:49:56 +0100 |
| commit | 4e688bb8c79d5b4266b1a526629ea6807cb1e0f5 (patch) | |
| tree | a3919d8a9cee07f88a5363eec7e49a1d66780855 /addons/web/static/src/xml | |
| parent | 29578e1748b06f7b474c2fa1e20ed731e644fd35 (diff) | |
| parent | 4ca42f9968a90edd63ade5037e9fbce0da032271 (diff) | |
[MERGE] Merged a Mail update
This web revision adds a resize key in the attachment controler to receive resized image when accessing some attachments. This is used for the preview in Chatter, to avoid pre-visualizing the whole images.
bzr revid: tde@openerp.com-20121112154956-w4iyroc3hfmxn9l0
Diffstat (limited to 'addons/web/static/src/xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 215374cb6fb..5cfadc323bd 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1182,26 +1182,28 @@ </t> <t t-name="FieldBinaryFileUploader.files"> <div class="oe_attachments"> - <t t-if="!widget.get('effective_readonly')" t-foreach="widget.get('value')" t-as="file"> - <div class="oe_attachment"> - <span t-if="(file.upload or file.percent_loaded<100)" t-attf-title="{(file.name || file.filename) + (file.date?' \n('+file.date+')':'' )}" t-attf-name="{file.name || file.filename}"> - <span class="oe_fileuploader_in_process">...Upload in progress...</span> - <t t-raw="file.name || file.filename"/> - </span> - <a t-if="(!file.upload or file.percent_loaded>=100)" t-att-href="file.url" t-attf-title="{(file.name || file.filename) + (file.date?' \n('+file.date+')':'' )}"> - <t t-raw="file.name || file.filename"/> - </a> - <t t-if="(!file.upload or file.percent_loaded>=100)"> - <a class="oe_right oe_delete oe_e" title="Delete this file" t-attf-data-id="{file.id}">[</a> - </t> - </div> - </t> - <t t-if="widget.get('effective_readonly')" t-foreach="widget.get('value')" t-as="file"> - <div> - <a t-att-href="file.url" t-attf-title="{(file.name || file.filename) + (file.date?' \n('+file.date+')':'' )}"> - <t t-raw="file.name || file.filename"/> - </a> - </div> + <t t-if="widget.get('value')"> + <t t-if="!widget.get('effective_readonly')" t-foreach="widget.get('value')" t-as="file"> + <div class="oe_attachment"> + <span t-if="(file.upload or file.percent_loaded<100)" t-attf-title="{(file.name || file.filename) + (file.date?' \n('+file.date+')':'' )}" t-attf-name="{file.name || file.filename}"> + <span class="oe_fileuploader_in_process">...Upload in progress...</span> + <t t-raw="file.name || file.filename"/> + </span> + <a t-if="(!file.upload or file.percent_loaded>=100)" t-att-href="file.url" t-attf-title="{(file.name || file.filename) + (file.date?' \n('+file.date+')':'' )}"> + <t t-raw="file.name || file.filename"/> + </a> + <t t-if="(!file.upload or file.percent_loaded>=100)"> + <a class="oe_right oe_delete oe_e" title="Delete this file" t-attf-data-id="{file.id}">[</a> + </t> + </div> + </t> + <t t-if="widget.get('effective_readonly')" t-foreach="widget.get('value')" t-as="file"> + <div> + <a t-att-href="file.url" t-attf-title="{(file.name || file.filename) + (file.date?' \n('+file.date+')':'' )}"> + <t t-raw="file.name || file.filename"/> + </a> + </div> + </t> </t> </div> </t> |