From eed8d199486210bd31440bf18ab8fdc905df6759 Mon Sep 17 00:00:00 2001 From: Antoine Guenet Date: Fri, 7 Oct 2022 10:50:52 +0000 Subject: [PATCH] [FIX] mass_mailing: open editor toolbar dropdowns above the toggler The editor's toolbar is at the very bottom of mass_mailing's sidebar, making dropdowns pretty awkward as they often require the user to scroll down to see them. This extends the editor's toolbar for mass_mailing so all dropdowns become dropups instead. closes odoo/odoo#102734 X-original-commit: d4b5527113a6092063cba3409d870c5c45a8cd03 Signed-off-by: David Monjoie (dmo) --- addons/mass_mailing/__manifest__.py | 4 +++- .../static/src/js/mass_mailing_html_field.js | 1 + .../static/src/xml/mass_mailing.editor.xml | 11 +++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 addons/mass_mailing/static/src/xml/mass_mailing.editor.xml diff --git a/addons/mass_mailing/__manifest__.py b/addons/mass_mailing/__manifest__.py index 6e679ee78c6..7b0fc32dbf9 100644 --- a/addons/mass_mailing/__manifest__.py +++ b/addons/mass_mailing/__manifest__.py @@ -99,7 +99,8 @@ 'mass_mailing/static/src/js/mass_mailing_html_field.js', 'mass_mailing/static/src/js/mailing_mailing_view_form_full_width.js', 'mass_mailing/static/src/js/mailing_portal.js', - 'mass_mailing/static/src/xml/*.xml', + 'mass_mailing/static/src/xml/mailing_filter_widget.xml', + 'mass_mailing/static/src/xml/mass_mailing.xml', 'mass_mailing/static/src/views/*.xml', ], 'mass_mailing.assets_mail_themes': [ @@ -114,6 +115,7 @@ 'web_editor.assets_wysiwyg': [ 'mass_mailing/static/src/js/snippets.editor.js', 'mass_mailing/static/src/js/wysiwyg.js', + 'mass_mailing/static/src/xml/mass_mailing.editor.xml', ], 'web.assets_common': [ 'mass_mailing/static/src/js/tours/**/*', diff --git a/addons/mass_mailing/static/src/js/mass_mailing_html_field.js b/addons/mass_mailing/static/src/js/mass_mailing_html_field.js index 1e2b15db610..3979310bd62 100644 --- a/addons/mass_mailing/static/src/js/mass_mailing_html_field.js +++ b/addons/mass_mailing/static/src/js/mass_mailing_html_field.js @@ -55,6 +55,7 @@ export class MassMailingHtmlField extends HtmlField { snippets: 'mass_mailing.email_designer_snippets', resizable: false, defaultDataForLinkTools: { isNewWindow: true }, + toolbarTemplate: 'mass_mailing.web_editor_toolbar', ...this.props.wysiwygOptions, }; } diff --git a/addons/mass_mailing/static/src/xml/mass_mailing.editor.xml b/addons/mass_mailing/static/src/xml/mass_mailing.editor.xml new file mode 100644 index 00000000000..3e3bff26429 --- /dev/null +++ b/addons/mass_mailing/static/src/xml/mass_mailing.editor.xml @@ -0,0 +1,11 @@ + + + + + + + + + + +