diff --git a/muk_web_utils/__manifest__.py b/muk_web_utils/__manifest__.py index 0e40547..6b536a5 100644 --- a/muk_web_utils/__manifest__.py +++ b/muk_web_utils/__manifest__.py @@ -20,7 +20,7 @@ { "name": "MuK Web Utils", "summary": """Utility Features""", - "version": "12.0.2.4.7", + "version": "12.0.2.4.8", "category": "Extra Tools", "license": "AGPL-3", "author": "MuK IT", diff --git a/muk_web_utils/static/src/js/fields/image.js b/muk_web_utils/static/src/js/fields/image.js new file mode 100644 index 0000000..288ee32 --- /dev/null +++ b/muk_web_utils/static/src/js/fields/image.js @@ -0,0 +1,67 @@ +/********************************************************************************** +* +* Copyright (C) 2018 MuK IT GmbH +* +* Odoo Proprietary License v1.0 +* This software and associated files (the "Software") may only be used +* (executed, modified, executed after modifications) if you have +* purchased a valid license from the authors, typically via Odoo Apps, +* or if you have received a written agreement from the authors of the +* Software (see the COPYRIGHT file). +* +* You may develop Odoo modules that use the Software as a library +* (typically by depending on it, importing it and using its resources), +* but without copying any source code or material from the Software. +* You may distribute those modules under the license of your choice, +* provided that this license is compatible with the terms of the Odoo +* Proprietary License (For example: LGPL, MIT, or proprietary licenses +* similar to this one). +* +* It is forbidden to publish, distribute, sublicense, or sell copies of +* the Software or modified copies of the Software. +* +* The above copyright notice and this permission notice must be included +* in all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +* DEALINGS IN THE SOFTWARE. +* +**********************************************************************************/ + +odoo.define('muk_web_utils.image', function (require) { +"use strict"; + +var core = require('web.core'); +var session = require('web.session'); +var fields = require('web.basic_fields'); + +var _t = core._t; +var QWeb = core.qweb; + +fields.FieldBinaryImage.include({ + _render: function () { + this._super.apply(this, arguments); + this.$('.mk_form_image_wrapper').remove(); + this.$('img').wrap($('
', { + class: "mk_form_image_wrapper" + })); + var $wrapper = $('.mk_form_image_wrapper'); + var width = this.nodeOptions.size ? + this.nodeOptions.size[0] : this.attrs.width; + var height = this.nodeOptions.size ? + this.nodeOptions.size[1] : this.attrs.height; + if(width) { + $wrapper.css('min-width', width + 'px'); + } + if(height) { + $wrapper.css('min-height', height + 'px'); + } + }, +}); + +}); diff --git a/muk_web_utils/static/src/scss/binary.scss b/muk_web_utils/static/src/scss/image.scss similarity index 80% rename from muk_web_utils/static/src/scss/binary.scss rename to muk_web_utils/static/src/scss/image.scss index d79e9df..6675c55 100644 --- a/muk_web_utils/static/src/scss/binary.scss +++ b/muk_web_utils/static/src/scss/image.scss @@ -19,7 +19,7 @@ .o_field_widget.o_field_image { .mk_form_image_controls { - @include o-position-absolute($left: 0, $bottom: 10px); + @include o-position-absolute($left: 0, $bottom: 0); width: 100%; color: white; background-color: $o-brand-primary; @@ -51,3 +51,17 @@ } } } + +.o_field_widget.o_field_image.oe_avatar { + .mk_form_image_controls { + @include o-position-absolute($left: 0, $bottom: 10px); + } + img { + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); + max-width: $o-avatar-size; + max-height: $o-avatar-size; + vertical-align: top; + margin-bottom: 10px; + border: none; + } +} diff --git a/muk_web_utils/static/src/xml/binary.xml b/muk_web_utils/static/src/xml/image.xml similarity index 100% rename from muk_web_utils/static/src/xml/binary.xml rename to muk_web_utils/static/src/xml/image.xml diff --git a/muk_web_utils/template/assets.xml b/muk_web_utils/template/assets.xml index 1bdc728..dcf7cb1 100644 --- a/muk_web_utils/template/assets.xml +++ b/muk_web_utils/template/assets.xml @@ -35,7 +35,7 @@ - + @@ -47,6 +47,7 @@