diff options
| author | fja-odoo <fja@odoo.com> | 2019-10-21 13:27:16 +0000 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2019-11-18 09:56:40 +0000 |
| commit | 22c5fc5dd2fcc7e37f103876a219727122d23293 (patch) | |
| tree | 7fb91b5832971643e8b97974574ec34a66dfdacd /addons/web_editor/static/src/js/editor/summernote.js | |
| parent | 2006959761a0fb584f3dcfc45c7cac1aebd12430 (diff) | |
[IMP] web_editor, website: generalize colorpicker
Currently we have:
- a colorpicker for background color of snippets
- a colorpicker for foreground and background text (topbar)
- a colorpicker for menu/footer/navbar/etc
These 3 are separate colorpickers with different options.
After this Commit
All 3 will use the same color palette wich allow you to select
theme color, common colors, custom color and transparent filter.
Part of https://github.com/odoo/odoo/pull/38959
maintask-2066614
task-2087383
Diffstat (limited to 'addons/web_editor/static/src/js/editor/summernote.js')
| -rw-r--r-- | addons/web_editor/static/src/js/editor/summernote.js | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/addons/web_editor/static/src/js/editor/summernote.js b/addons/web_editor/static/src/js/editor/summernote.js index 4228d353d1a..06a282d0076 100644 --- a/addons/web_editor/static/src/js/editor/summernote.js +++ b/addons/web_editor/static/src/js/editor/summernote.js @@ -983,33 +983,15 @@ renderer.tplButtonInfo.color = function (lang, options) { event: 'color', value: '{"backColor":"#B35E9B"}' }); - var foreColorItems = [ - '<li><div class="btn-group flex-column">', - '<div class="note-color-palette" data-target-event="foreColor"></div>', - '<h6 class="note-custom-color mt8" data-event="customColor" data-value="foreColor" title="' + lang.color.custom + '">', - lang.color.custom + '</h6>', - '<div class="note-custom-color-palette" data-target-event="foreColor"></div>', - '</div></li>', - ]; - var backColorItems = [ - '<li><div class="btn-group flex-column">', - '<div class="note-color-reset" data-event="backColor" data-value="inherit" title="' + lang.color.transparent + '">', - lang.color.setTransparent + '</div>', - '<div class="note-color-palette" data-target-event="backColor"></div>', - '<h6 class="note-custom-color mt8" data-event="customColor" data-value="backColor" title="' + lang.color.custom + '">', - lang.color.custom + '</h6>', - '<div class="note-custom-color-palette" data-target-event="backColor"></div>', - '</div></li>', - ]; var foreColorButton = renderer.getTemplate().button(foreColorButtonLabel, { className: 'note-fore-color-preview mx-1', title: lang.color.foreground, - dropdown: renderer.getTemplate().dropdown(foreColorItems) + dropdown: renderer.getTemplate().dropdown('<li><div data-event-name="foreColor" class="colorPalette"/></li>'), }); var backColorButton = renderer.getTemplate().button(backColorButtonLabel, { className: 'note-back-color-preview mx-1', title: lang.color.background, - dropdown: renderer.getTemplate().dropdown(backColorItems) + dropdown: renderer.getTemplate().dropdown('<li><div data-event-name="backColor" class="colorPalette"/></li>'), }); return recentColorButton + foreColorButton + backColorButton; }; |
