diff options
| author | Mehul Mehta <mme@openerp.com> | 2014-05-21 17:04:39 +0530 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2014-06-20 12:52:24 +0200 |
| commit | a6b9413a78b46172bf0f6ccdba3d3603029a2e16 (patch) | |
| tree | 1e09bc429b784595bdd4b0260d2634e7dcb1e8dd /addons/web/static/src | |
| parent | 6bc5218718947b0d257901fcb9872c71847737cb (diff) | |
[ADD] Add a icon for remove pictures from product and partner
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/css/base.css | 2 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 6 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 9 |
4 files changed, 11 insertions, 8 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 13626fb5d16..b97a5ba50ab 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2325,7 +2325,7 @@ .openerp .oe_form .oe_form_field_image .oe_form_field_image_controls { position: absolute; top: 1px; - padding: 4px 0; + padding: 6px 0; width: 100%; display: none; text-align: center; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index abeed36b038..dce3401a3ed 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1902,7 +1902,7 @@ $sheet-padding: 16px .oe_form_field_image_controls position: absolute top: 1px - padding: 4px 0 + padding: 6px 0 width: 100% display: none text-align: center diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index cb0b2e8ea80..3f46c7374ff 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -5506,9 +5506,13 @@ instance.web.form.FieldBinary = instance.web.form.AbstractField.extend(instance. this._super.apply(this, arguments); }, initialize_content: function() { + var self= this; this.$el.find('input.oe_form_binary_file').change(this.on_file_change); this.$el.find('button.oe_form_binary_file_save').click(this.on_save_as); this.$el.find('.oe_form_binary_file_clear').click(this.on_clear); + this.$el.find('.oe_form_binary_file_edit').click(function(event){ + self.$el.find('input.oe_form_binary_file').click(); + }); }, on_file_change: function(e) { var self = this; @@ -5676,8 +5680,6 @@ instance.web.form.FieldBinaryImage = instance.web.form.FieldBinary.extend({ return; $img.css("max-width", "" + self.options.size[0] + "px"); $img.css("max-height", "" + self.options.size[1] + "px"); - $img.css("margin-left", "" + (self.options.size[0] - $img.width()) / 2 + "px"); - $img.css("margin-top", "" + (self.options.size[1] - $img.height()) / 2 + "px"); }); $img.on('error', function() { $img.attr('src', self.placeholder); diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index fb2fcbf303e..69af5cbe91d 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1310,15 +1310,16 @@ <t t-name="FieldBinaryImage"> <span class="oe_form_field oe_form_field_image" t-att-style="widget.node.attrs.style"> <div class="oe_form_field_image_controls oe_edit_only"> - <t t-call="HiddenInputFile"> - <t t-set="fileupload_id" t-value="widget.fileupload_id"/> - Edit - </t> + <i class="fa fa-pencil fa-1g pull-left col-md-offset-1 oe_form_binary_file_edit" title="Edit"/> + <i class="fa fa-trash-o fa-1g col-md-offset-5 oe_form_binary_file_clear" title="Clear"/> <div class="oe_form_binary_progress" style="display: none"> <img t-att-src='_s + "/web/static/src/img/throbber.gif"' width="16" height="16"/> <b>Uploading ...</b> </div> </div> + <t t-call="HiddenInputFile"> + <t t-set="fileupload_id" t-value="widget.fileupload_id"/> + </t> </span> </t> <t t-name="FieldBinaryImage-img"> |