diff --git a/setup/web_editor_background_color/odoo/addons/web_editor_background_color b/setup/web_editor_background_color/odoo/addons/web_editor_background_color new file mode 120000 index 000000000..c3c5fcfdd --- /dev/null +++ b/setup/web_editor_background_color/odoo/addons/web_editor_background_color @@ -0,0 +1 @@ +../../../../web_editor_background_color \ No newline at end of file diff --git a/setup/web_editor_background_color/setup.py b/setup/web_editor_background_color/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/web_editor_background_color/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/web_editor_background_color/README.rst b/web_editor_background_color/README.rst index bd166b3b1..c5daed01a 100644 --- a/web_editor_background_color/README.rst +++ b/web_editor_background_color/README.rst @@ -14,13 +14,13 @@ Web Editor Background Color Picker :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html :alt: License: LGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fweb-lightgray.png?logo=github - :target: https://github.com/OCA/web/tree/12.0/web_editor_background_color + :target: https://github.com/OCA/web/tree/13.0/web_editor_background_color :alt: OCA/web .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/web-12-0/web-12-0-web_editor_background_color + :target: https://translation.odoo-community.org/projects/web-13-0/web-13-0-web_editor_background_color :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/162/12.0 + :target: https://runbot.odoo-community.org/runbot/162/13.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -28,8 +28,8 @@ Web Editor Background Color Picker This module extends the functionality of the web editor to support setting a custom background color to any snippet allowing you to customize it. -.. figure:: https://user-images.githubusercontent.com/973709/46802401-1c915180-cd55-11e8-9397-f198548a690c.gif - :alt: Screenshot of color picker in mass mailing editor +.. figure:: https://user-images.githubusercontent.com/35952655/98240459-bb56ff00-1f69-11eb-8e71-ee4aa1533f67.gif + :alt: Screenshot of color picker in website editor **Table of contents** @@ -65,7 +65,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -80,7 +80,10 @@ Authors Contributors ~~~~~~~~~~~~ -* Jairo Llopis - https://www.tecnativa.com +* `Tecnativa `_: + + * Jairo Llopis + * Carlos Roca Other credits ~~~~~~~~~~~~~ @@ -102,6 +105,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/web `_ project on GitHub. +This module is part of the `OCA/web `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/web_editor_background_color/__manifest__.py b/web_editor_background_color/__manifest__.py index 576c39669..10c1d29d5 100644 --- a/web_editor_background_color/__manifest__.py +++ b/web_editor_background_color/__manifest__.py @@ -1,9 +1,9 @@ -# Copyright 2017 Jairo Llopis +# Copyright 2017 Tecnativa - Jairo Llopis # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html). { "name": "Web Editor Background Color Picker", "summary": "Set any background color for web editor snippets", - "version": "12.0.1.0.0", + "version": "13.0.1.0.0", "category": "Website", "website": "https://github.com/OCA/web", "author": "Tecnativa, Odoo Community Association (OCA)", diff --git a/web_editor_background_color/i18n/ca.po b/web_editor_background_color/i18n/ca.po index 5e97c5832..ad7ab2cce 100644 --- a/web_editor_background_color/i18n/ca.po +++ b/web_editor_background_color/i18n/ca.po @@ -18,5 +18,3 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#~ msgid "Color" -#~ msgstr "Color" diff --git a/web_editor_background_color/i18n/es.po b/web_editor_background_color/i18n/es.po index bab232fcb..dfb16c475 100644 --- a/web_editor_background_color/i18n/es.po +++ b/web_editor_background_color/i18n/es.po @@ -17,5 +17,3 @@ msgstr "" "Plural-Forms: \n" "X-Generator: Poedit 1.8.6\n" -#~ msgid "Pick Background Color" -#~ msgstr "Escoger el color de fondo" diff --git a/web_editor_background_color/i18n/fr.po b/web_editor_background_color/i18n/fr.po index 0a3d95a3f..c7b6312f0 100644 --- a/web_editor_background_color/i18n/fr.po +++ b/web_editor_background_color/i18n/fr.po @@ -19,5 +19,3 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#~ msgid "Pick Background Color" -#~ msgstr "Mettre la couleur de fond" diff --git a/web_editor_background_color/i18n/sl.po b/web_editor_background_color/i18n/sl.po index a06a2d19a..acfd77622 100644 --- a/web_editor_background_color/i18n/sl.po +++ b/web_editor_background_color/i18n/sl.po @@ -20,5 +20,3 @@ msgstr "" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" "%100==4 ? 2 : 3);\n" -#~ msgid "Pick Background Color" -#~ msgstr "Izbira barve ozadja" diff --git a/web_editor_background_color/readme/CONTRIBUTORS.rst b/web_editor_background_color/readme/CONTRIBUTORS.rst index bf93c78d3..dd63fe8ee 100644 --- a/web_editor_background_color/readme/CONTRIBUTORS.rst +++ b/web_editor_background_color/readme/CONTRIBUTORS.rst @@ -1 +1,4 @@ -* Jairo Llopis - https://www.tecnativa.com +* `Tecnativa `_: + + * Jairo Llopis + * Carlos Roca diff --git a/web_editor_background_color/readme/DESCRIPTION.rst b/web_editor_background_color/readme/DESCRIPTION.rst index 76576d159..c55544ca1 100644 --- a/web_editor_background_color/readme/DESCRIPTION.rst +++ b/web_editor_background_color/readme/DESCRIPTION.rst @@ -1,5 +1,5 @@ This module extends the functionality of the web editor to support setting a custom background color to any snippet allowing you to customize it. -.. figure:: https://user-images.githubusercontent.com/973709/46802401-1c915180-cd55-11e8-9397-f198548a690c.gif - :alt: Screenshot of color picker in mass mailing editor +.. figure:: https://user-images.githubusercontent.com/35952655/98240459-bb56ff00-1f69-11eb-8e71-ee4aa1533f67.gif + :alt: Screenshot of color picker in website editor diff --git a/web_editor_background_color/static/description/index.html b/web_editor_background_color/static/description/index.html index 2ee9cb025..8cfa9b261 100644 --- a/web_editor_background_color/static/description/index.html +++ b/web_editor_background_color/static/description/index.html @@ -367,11 +367,11 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: LGPL-3 OCA/web Translate me on Weblate Try me on Runbot

+

Beta License: LGPL-3 OCA/web Translate me on Weblate Try me on Runbot

This module extends the functionality of the web editor to support setting a custom background color to any snippet allowing you to customize it.

-Screenshot of color picker in mass mailing editor +Screenshot of color picker in website editor

Table of contents

@@ -417,7 +417,7 @@ module will no longer be needed.

Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -feedback.

+feedback.

Do not contact contributors directly about support or help with technical issues.

@@ -431,7 +431,11 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

Contributors

@@ -447,7 +451,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.

-

This module is part of the OCA/web project on GitHub.

+

This module is part of the OCA/web project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

diff --git a/web_editor_background_color/static/src/css/background_color.scss b/web_editor_background_color/static/src/css/background_color.scss index 52b7bda89..612624c39 100644 --- a/web_editor_background_color/static/src/css/background_color.scss +++ b/web_editor_background_color/static/src/css/background_color.scss @@ -1,10 +1,10 @@ -/* Copyright 2017-2019 Jairo Llopis +/* Copyright 2017-2019 Tecnativa - Jairo Llopis * License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). */ .snippet-option-colorpicker { - .o_colorpicker_section[data-name="custom"] > .text-muted { + .o_colorpicker_section[data-name="custom"] > #add-color { cursor: pointer; - border-radius: 5px; + border-radius: 2px; &:hover { background-color: gray("400"); diff --git a/web_editor_background_color/static/src/js/background_color.js b/web_editor_background_color/static/src/js/background_color.js index db086fc58..e3d158e9b 100644 --- a/web_editor_background_color/static/src/js/background_color.js +++ b/web_editor_background_color/static/src/js/background_color.js @@ -1,9 +1,9 @@ -/* Copyright 2016-2019 Jairo Llopis +/* Copyright 2016-2019 Tecnativa - Jairo Llopis * License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). */ odoo.define("web_editor_background_color.colorpicker", function(require) { "use strict"; - var ColorpickerDialog = require("web.colorpicker"); + var ColorpickerDialog = require("web.ColorpickerDialog"); var options = require("web_editor.snippets.options"); var colorpicker = options.registry.colorpicker; @@ -12,7 +12,7 @@ odoo.define("web_editor_background_color.colorpicker", function(require) { "colorpicker:saved": "_onCustomColorSave", }), events: _.extend({}, colorpicker.prototype.events, { - "click .o_colorpicker_section[data-name=custom]>.text-muted": + "click .o_colorpicker_section[data-name=custom]> #add-color": "_onCustomColorAsk", }), diff --git a/web_editor_background_color/templates/assets.xml b/web_editor_background_color/templates/assets.xml index 1d93a9231..75865f502 100644 --- a/web_editor_background_color/templates/assets.xml +++ b/web_editor_background_color/templates/assets.xml @@ -1,8 +1,8 @@ - -