From 152bcb0e7919707489f6079283641a52ed6913b6 Mon Sep 17 00:00:00 2001 From: MuK IT GmbH Date: Thu, 29 Nov 2018 02:49:54 +0000 Subject: [PATCH] publish muk_web_utils - 12.0 --- muk_web_utils/__manifest__.py | 2 +- muk_web_utils/doc/changelog.rst | 5 ++ muk_web_utils/static/src/js/fields/color.js | 58 +++++++++++++++++++++ muk_web_utils/static/src/scss/color.scss | 42 +++++++++++++++ muk_web_utils/static/src/xml/color.xml | 37 +++++++++++++ muk_web_utils/template/assets.xml | 2 + 6 files changed, 145 insertions(+), 1 deletion(-) create mode 100644 muk_web_utils/static/src/js/fields/color.js create mode 100644 muk_web_utils/static/src/scss/color.scss create mode 100644 muk_web_utils/static/src/xml/color.xml diff --git a/muk_web_utils/__manifest__.py b/muk_web_utils/__manifest__.py index fdaf352..8bb28dc 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.11", + "version": "12.0.2.5.0", "category": "Extra Tools", "license": "AGPL-3", "author": "MuK IT", diff --git a/muk_web_utils/doc/changelog.rst b/muk_web_utils/doc/changelog.rst index 32da76c..3416b59 100644 --- a/muk_web_utils/doc/changelog.rst +++ b/muk_web_utils/doc/changelog.rst @@ -1,3 +1,8 @@ +`2.5.0` +------- + +- Added color field widget + `2.4.0` ------- diff --git a/muk_web_utils/static/src/js/fields/color.js b/muk_web_utils/static/src/js/fields/color.js new file mode 100644 index 0000000..040a5a5 --- /dev/null +++ b/muk_web_utils/static/src/js/fields/color.js @@ -0,0 +1,58 @@ +/********************************************************************************** +* +* Copyright (C) 2017 MuK IT GmbH +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU Affero General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Affero General Public License for more details. +* +* You should have received a copy of the GNU Affero General Public License +* along with this program. If not, see . +* +**********************************************************************************/ + +odoo.define('muk_web_utils.ColorChar', function (require) { +"use strict"; + +var core = require('web.core'); +var fields = require('web.basic_fields'); +var registry = require('web.field_registry'); +var colorpicker = require('web.colorpicker'); + +var _t = core._t; +var QWeb = core.qweb; + +var FieldColor = fields.DebouncedField.extend({ + events: _.extend({}, fields.FieldChar.prototype.events, { + "click .mk_field_color_button": "_onCustomColorButtonClick", + }), + template: "muk_web_utils.FieldColor", + supportedFieldTypes: ['char'], + _renderEdit: function () { + this.$('.mk_field_color_input').val(this._formatValue(this.value)); + }, + _renderReadonly: function () { + this.$el.text(this._formatValue(this.value)); + }, + _onCustomColorButtonClick: function () { + var ColorpickerDialog = new colorpicker(this, { + dialogClass: 'mk_field_color_picker' + }); + ColorpickerDialog.on('colorpicker:saved', this, function (event) { + this._setValue(event.data.hex); + }); + ColorpickerDialog.open(); + }, +}); + +registry.add('color', FieldColor); + +return FieldColor; + +}); \ No newline at end of file diff --git a/muk_web_utils/static/src/scss/color.scss b/muk_web_utils/static/src/scss/color.scss new file mode 100644 index 0000000..51df2bf --- /dev/null +++ b/muk_web_utils/static/src/scss/color.scss @@ -0,0 +1,42 @@ +/********************************************************************************** +* +* Copyright (C) 2017 MuK IT GmbH +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU Affero General Public License as +* published by the Free Software Foundation, either version 3 of the +* License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Affero General Public License for more details. +* +* You should have received a copy of the GNU Affero General Public License +* along with this program. If not, see . +* +**********************************************************************************/ + +.mk_field_color_picker { + .o_opacity_slider { + display: none ! important; + } + input#opacity { + display: none ! important; + } + label[for="opacity"] { + display: none ! important; + } +} + +.o_field_widget.mk_field_color { + .mk_field_color_input { + width: auto; + display: inline-block; + } + .mk_field_color_button { + display: inline-block; + margin-bottom: 0.25rem; + line-height: 1.42rem; + } +} \ No newline at end of file diff --git a/muk_web_utils/static/src/xml/color.xml b/muk_web_utils/static/src/xml/color.xml new file mode 100644 index 0000000..253e1ad --- /dev/null +++ b/muk_web_utils/static/src/xml/color.xml @@ -0,0 +1,37 @@ + + + + + + + + +
+ + +
+ + + \ No newline at end of file diff --git a/muk_web_utils/template/assets.xml b/muk_web_utils/template/assets.xml index 57e0325..8f9033f 100644 --- a/muk_web_utils/template/assets.xml +++ b/muk_web_utils/template/assets.xml @@ -35,6 +35,7 @@ + @@ -48,6 +49,7 @@