diff --git a/addons/mass_mailing/__manifest__.py b/addons/mass_mailing/__manifest__.py index fa03cd429a1..d7e226d769f 100644 --- a/addons/mass_mailing/__manifest__.py +++ b/addons/mass_mailing/__manifest__.py @@ -118,7 +118,6 @@ 'mass_mailing/static/tests/field_html_test.js', 'mass_mailing/static/tests/mass_mailing_favourite_filter_tests.js', 'mass_mailing/static/src/js/mass_mailing_snippets.js', - 'mass_mailing/static/src/snippets/s_blockquote/options.js', 'mass_mailing/static/src/snippets/s_media_list/options.js', 'mass_mailing/static/src/snippets/s_showcase/options.js', 'mass_mailing/static/src/snippets/s_rating/options.js', diff --git a/addons/mass_mailing/data/ir_attachment_data.xml b/addons/mass_mailing/data/ir_attachment_data.xml index 9f4881820e6..675d9e4211e 100644 --- a/addons/mass_mailing/data/ir_attachment_data.xml +++ b/addons/mass_mailing/data/ir_attachment_data.xml @@ -128,12 +128,6 @@ url /mass_mailing/static/src/img/snippets_demo/s_team_member_2.png - - - s_blockquote_cover_default_image.jpg - url - /mass_mailing/static/src/img/snippets_demo/s_blockquote_cover.jpg - s_image_text_default_image.jpg diff --git a/addons/mass_mailing/static/src/img/snippets_demo/s_blockquote_cover.jpg b/addons/mass_mailing/static/src/img/snippets_demo/s_blockquote_cover.jpg deleted file mode 100644 index c54b0378064..00000000000 Binary files a/addons/mass_mailing/static/src/img/snippets_demo/s_blockquote_cover.jpg and /dev/null differ diff --git a/addons/mass_mailing/static/src/js/mass_mailing_widget.js b/addons/mass_mailing/static/src/js/mass_mailing_widget.js index be454197d34..699796cef17 100644 --- a/addons/mass_mailing/static/src/js/mass_mailing_widget.js +++ b/addons/mass_mailing/static/src/js/mass_mailing_widget.js @@ -16,7 +16,6 @@ var MassMailingFieldHtml = FieldHtml.extend({ jsLibs: [ '/mass_mailing/static/src/js/mass_mailing_link_dialog_fix.js', '/mass_mailing/static/src/js/mass_mailing_snippets.js', - '/mass_mailing/static/src/snippets/s_blockquote/options.js', '/mass_mailing/static/src/snippets/s_masonry_block/options.js', '/mass_mailing/static/src/snippets/s_media_list/options.js', '/mass_mailing/static/src/snippets/s_showcase/options.js', diff --git a/addons/mass_mailing/static/src/snippets/s_blockquote/options.js b/addons/mass_mailing/static/src/snippets/s_blockquote/options.js deleted file mode 100644 index 34bfe54a0f2..00000000000 --- a/addons/mass_mailing/static/src/snippets/s_blockquote/options.js +++ /dev/null @@ -1,45 +0,0 @@ -odoo.define('mass_mailing.s_blockquote_options', function (require) { -'use strict'; - -const options = require('web_editor.snippets.options'); - -options.registry.Blockquote = options.Class.extend({ - - //-------------------------------------------------------------------------- - // Options - //-------------------------------------------------------------------------- - - /** - * Change blockquote design. - * - * @see this.selectClass for parameters - */ - display: function (previewMode, widgetValue, params) { - - // Classic - this.$target.find('.s_blockquote_avatar').toggleClass('d-none', widgetValue !== 'classic'); - - // Cover - const $blockquote = this.$target.find('.s_blockquote_content'); - if (widgetValue === 'cover') { - $blockquote.css({"background-image": "url('/web/image/mass_mailing.s_blockquote_cover_default_image')"}); - $blockquote.addClass('oe_img_bg o_bg_img_center'); - if (!$blockquote.find('.o_we_bg_filter').length) { - const bgFilterEl = document.createElement('div'); - bgFilterEl.classList.add('o_we_bg_filter', 'bg-white-50'); - $blockquote.prepend(bgFilterEl); - } - } else { - $blockquote.css({"background-image": ""}); - $blockquote.css({"background-position": ""}); - $blockquote.removeClass('oe_img_bg o_bg_img_center'); - $blockquote.find('.o_we_bg_filter').remove(); - $blockquote.find('.s_blockquote_filter').contents().unwrap(); // Compatibility - } - - // Minimalist - this.$target.find('.s_blockquote_icon').toggleClass('d-none', widgetValue === 'minimalist'); - this.$target.find('footer').toggleClass('d-none', widgetValue === 'minimalist'); - }, -}); -}); diff --git a/addons/mass_mailing/views/snippets/s_blockquote.xml b/addons/mass_mailing/views/snippets/s_blockquote.xml index 33b72eb0755..bb58832d77f 100644 --- a/addons/mass_mailing/views/snippets/s_blockquote.xml +++ b/addons/mass_mailing/views/snippets/s_blockquote.xml @@ -2,23 +2,23 @@ - + - - + + - - + + Write a quote here from one of your customers. Quotes are a great way to build confidence in your products or services. - John DOE • CEO of MyCompany + John DOE • CEO of MyCompany - - + +
Write a quote here from one of your customers. Quotes are a great way to build confidence in your products or services.
John DOE • CEO of MyCompany