WIP

thjo-odoo · thjo-odoo · commit edf4e37664ff · 2025-06-27T15:01:09.000+02:00
diff --git a/addons/html_builder/static/src/plugins/border_configurator_option.js b/addons/html_builder/static/src/plugins/border_configurator_option.js
@@ -18,11 +18,15 @@ export class BorderConfigurator extends BaseOptionComponent {
     setup() {
         super.setup();
         this.getItemValue = useGetItemValue();
-        this.parseInt = parseInt;
         this.state = useDomState((editingElement) => ({
             hasBorder: this.hasBorder(editingElement),
         }));
     }
+
+    get showBorderRadiusOption() {
+        return this.props.withRoundCorner && parseInt(this.getItemValue("border_width_opt")) > 0;
+    }
+
     getStyleActionParam(param) {
         return `border-${this.props.direction ? this.props.direction + "-" : ""}${param}`;
     }
diff --git a/addons/html_builder/static/src/plugins/border_configurator_option.xml b/addons/html_builder/static/src/plugins/border_configurator_option.xml
@@ -17,7 +17,7 @@
     </BuilderRow>
 
     <!-- TODO: handle the dependency with border_width_opt bg_color_opt-->
-    <BuilderRow t-if="props.withRoundCorner and parseInt(this.getItemValue('border_width_opt')) > 0" label.translate="Round Corners">
+    <BuilderRow t-if="showBorderRadiusOption" label.translate="Round Corners">
         <BuilderNumberInput action="props.action" actionParam="{ mainParam: 'border-radius', extraClass: props.withBSClass and 'rounded' }" unit="'px'" default="0" min="0" composable="true"/>
     </BuilderRow>
 </t>
diff --git a/addons/html_builder/static/src/plugins/vertical_alignment_option_plugin.js b/addons/html_builder/static/src/plugins/vertical_alignment_option_plugin.js
@@ -5,14 +5,13 @@ import { VerticalAlignmentOption } from "@html_builder/plugins/vertical_alignmen
 import { withSequence } from "@html_editor/utils/resource";
 import { VERTICAL_ALIGNMENT } from "@html_builder/utils/option_sequence";
 
-class VerticalAlignmentOptionPlugin extends Plugin {
+export class VerticalAlignmentOptionPlugin extends Plugin {
     static id = "verticalAlignmentOption";
     resources = {
         builder_options: [
             withSequence(VERTICAL_ALIGNMENT, {
                 OptionComponent: VerticalAlignmentOption,
-                selector:
-                    ".s_text_image, .s_image_text, .s_three_columns, .s_showcase, .s_numbers, .s_faq_collapse, .s_references, .s_accordion_image, .s_shape_image",
+                selector: this.selector,
                 applyTo: ".row",
                 props: {
                     level: 1,
@@ -23,6 +22,9 @@ class VerticalAlignmentOptionPlugin extends Plugin {
             SetVerticalAlignmentAction,
         },
     };
+    get selector() {
+        return ".s_text_image, .s_image_text, .s_three_columns, .s_showcase, .s_numbers, .s_faq_collapse, .s_references, .s_accordion_image, .s_shape_image";
+    }
 }
 
 export class SetVerticalAlignmentAction extends ClassAction {
diff --git a/addons/mass_mailing/views/snippets_themes.xml b/addons/mass_mailing/views/snippets_themes.xml
@@ -82,7 +82,7 @@
 
 <!-- Snippet Templates -->
 <template id="s_mail_block_header_social" name="Left Logo">
-    <section class="s_header_social o_mail_block_header_social o_mail_snippet_general pt16 pb16">
+    <section class="s_header_social o_mail_block_header_social o_mail_snippet_general pt16 pb16" data-name="Left Logo">
         <div class="container">
             <div class="row">
                 <div class="col-lg-4 pt16 pb16">
@@ -99,7 +99,7 @@
 </template>
 
 <template id="s_mail_block_header_text_social" name="Left Text">
-    <section class="s_header_text_social o_mail_block_header_text_social o_mail_snippet_general">
+    <section class="s_header_text_social o_mail_block_header_text_social o_mail_snippet_general" data-name="Left Text">
         <div class="container">
             <div class="row">
                 <div class="col-lg-4 pt16 pb16">
@@ -118,7 +118,7 @@
 </template>
 
 <template id="s_mail_block_header_logo" name="Centered Logo">
-    <section class="s_header_logo o_mail_block_header_logo o_mail_snippet_general">
+    <section class="s_header_logo o_mail_block_header_logo o_mail_snippet_general" data-name="Centered Logo">
         <div class="container">
             <div class="row">
                 <div class="col-lg-3"/>
@@ -134,15 +134,15 @@
 </template>
 
 <template id="s_mail_block_header_view" name="View Online">
-    <section class="o_snippet_view_in_browser o_mail_snippet_general pt16 pb16" style="text-align: center; padding-left: 15px; padding-right: 15px;">
+    <section class="o_snippet_view_in_browser o_mail_snippet_general pt16 pb16" style="text-align: center; padding-left: 15px; padding-right: 15px;" data-name="View Online">
         <a href="/view">
             View Online
         </a>
     </section>
 </template>
 
 <template id="s_mail_block_discount1" name="Discount Offer">
-    <section class="s_discount1 o_mail_block_discount1 o_mail_snippet_general pt0 pb16">
+    <section class="s_discount1 o_mail_block_discount1 o_mail_snippet_general pt0 pb16" data-name="Discount Offer">
         <div class="container">
             <div class="row">
                 <div class="col-lg-6 pt16">
@@ -160,8 +160,8 @@
     </section>
 </template>
 
-<template id="s_mail_block_footer_social" name="Footer Center">
-    <section class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general bg-200 pt16">
+<template id="s_mail_block_footer_social">
+    <section class="s_footer_social o_mail_block_footer_social o_mail_footer_social_center o_mail_snippet_general bg-200 pt16" data-name="Footer Center">
         <div class="container">
             <div class="row">
                 <div class="col-lg o_mail_footer_social" style="text-align: center;">
@@ -185,7 +185,7 @@
 </template>
 
 <template id="s_mail_block_footer_social_left" name="Footer Left">
-    <section class="s_footer_social o_mail_block_footer_social o_mail_footer_social_left o_mail_snippet_general pt16">
+    <section class="s_footer_social o_mail_block_footer_social o_mail_footer_social_left o_mail_snippet_general pt16" data-name="Footer Left">
         <div class="container">
             <div class="row">
                 <div class="col-lg o_mail_footer_description">
diff --git a/addons/mass_mailing/views/themes_templates.xml b/addons/mass_mailing/views/themes_templates.xml
@@ -31,7 +31,7 @@
                 border-top-color: #ced4da !important;
             }
         </style>
-        <section class="s_header_logo o_mail_block_header_logo o_mail_snippet_general pt16 pb16">
+        <section class="s_header_logo o_mail_block_header_logo o_mail_snippet_general pt16 pb16" data-name="Centered Logo">
             <div class="container">
                 <div class="row">
                     <div class="col-lg-4"/>
@@ -44,7 +44,7 @@
                 </div>
             </div>
         </section>
-        <section class="s_text_block o_mail_snippet_general pt40 pb16" style="padding-left: 15px; padding-right: 15px;">
+        <section class="s_text_block o_mail_snippet_general pt40 pb16" style="padding-left: 15px; padding-right: 15px;" data-name="Text">
             <div class="container s_allow_columns">
                 <h2>Thank you for joining us!</h2>
                 <p><br/>We want to take this opportunity to welcome you to our ever-growing community!
diff --git a/addons/mass_mailing_egg/snippets_progress_bar_WIP.xml b/addons/mass_mailing_egg/snippets_progress_bar_WIP.xml
@@ -146,34 +146,34 @@
         </we-button-group>
     </div>
 
-    <div data-js="table_row"
+    <!-- <div data-js="table_row"
         data-selector="tr:has(> .row), tr:has(> .col_mv)"
         data-exclude=".o_mail_no_options"
-        data-drop-near="tr:has(> .row), tr:has(> .col_mv)"/>
+        data-drop-near="tr:has(> .row), tr:has(> .col_mv)"/> -->
 
     <!-- <div data-js="table_column"
         data-selector=".col>td, .col>th"
         data-exclude=".o_mail_no_options"
         data-drop-near=".col>td, .col>th"/> -->
 
-    <div data-js="table_column_mv"
+    <!-- <div data-js="table_column_mv"
         data-selector=".col_mv, td, th"
         data-exclude=".o_mail_no_options"
-        data-drop-near=".col_mv, td, th"/>
+        data-drop-near=".col_mv, td, th"/> -->
 
-    <t t-set="mailing_content_selector" t-translation="off">.note-editable > div:not(.o_layout), .note-editable .oe_structure > div, .oe_snippet_body</t>
-    <div data-js="content"
+    <!-- <t t-set="mailing_content_selector" t-translation="off">.note-editable > div:not(.o_layout), .note-editable .oe_structure > div, .oe_snippet_body</t> -->
+    <!-- <div data-js="content"
         t-att-data-selector="mailing_content_selector"
         data-exclude=".o_mail_no_options"
         data-drop-near="[data-oe-field='body_html']:not(:has(.o_layout)) > *, .oe_structure > *"
-        data-drop-in="[data-oe-field='body_html']:not(:has(.o_layout)), .oe_structure"/>
+        data-drop-in="[data-oe-field='body_html']:not(:has(.o_layout)), .oe_structure"/> -->
 
-    <t t-set="so_snippet_addition_selector" t-translation="off">.o_mail_snippet_general</t>
+    <!-- <t t-set="so_snippet_addition_selector" t-translation="off">.o_mail_snippet_general</t> -->
     <!-- <div id="so_snippet_addition"
         t-att-data-selector="so_snippet_addition_selector"
         data-drop-in=":not(p).oe_structure:not(.oe_structure_solo), :not(.o_mega_menu):not(p)[data-oe-type=html], :not(p).oe_structure.oe_structure_solo:not(:has(> section, > div))"/> -->
 
-    <t t-set="so_content_addition_selector" t-translation="off">.s_mail_blockquote, .s_mail_alert, .s_rating, .s_hr, .s_mail_text_highlight</t>
+    <!-- <t t-set="so_content_addition_selector" t-translation="off">.s_mail_blockquote, .s_mail_alert, .s_rating, .s_hr, .s_mail_text_highlight</t> -->
     <!-- <div id="so_content_addition"
         t-att-data-selector="so_content_addition_selector"
         t-attf-data-drop-near="p, h1, h2, h3, ul, ol, .row > div > img, #{so_content_addition_selector}"
diff --git a/addons/mass_mailing_egg/static/src/builder/options/blockquote_option.xml b/addons/mass_mailing_egg/static/src/builder/options/blockquote_option.xml
@@ -9,10 +9,10 @@
             <BuilderButton classAction="'o_height_800'">100%</BuilderButton>
         </BuilderButtonGroup>
     </BuilderRow>
-
-    <BuilderRow label.translate="Background Color">
-        <BuilderColorPicker styleAction="'background-color'"/>
+</t>
+<t t-name="mass_mailing.ColorPickerOption">
+     <BuilderRow label.translate="Background Color">
+        <BuilderColorPicker styleAction="'background-color'" noTransparency="true" enabledTabs="['solid', 'custom']"/>
     </BuilderRow>
 </t>
-
 </templates>
diff --git a/addons/mass_mailing_egg/static/src/builder/options/border_options.xml b/addons/mass_mailing_egg/static/src/builder/options/border_options.xml
@@ -0,0 +1,5 @@
+<templates>
+    <t t-name="mass_mailing.BorderOption">
+        <BorderConfiguratorOption label.translate="Border"/>
+    </t>
+</templates>
diff --git a/addons/mass_mailing_egg/static/src/builder/options/horizontal_padding_option.xml b/addons/mass_mailing_egg/static/src/builder/options/horizontal_padding_option.xml
@@ -0,0 +1,13 @@
+<templates>
+    <t t-name="mass_mailing.PaddingOption">
+        <BuilderRow label.translate="Padding ↔">
+            <BuilderNumberInput title.translate="Left" styleAction="'padding-left'" unit="'px'"/>
+            <BuilderNumberInput title.translate="Right" styleAction="'padding-right'" unit="'px'"/>
+        </BuilderRow>
+        <t t-log="this"/>
+        <BuilderRow label.translate="Padding ↔">
+            <BuilderNumberInput title.translate="Left" styleAction="'padding-top'" unit="'px'"/>
+            <BuilderNumberInput title.translate="Right" styleAction="'padding-bottom'" unit="'px'"/>
+        </BuilderRow>
+    </t>
+</templates>
diff --git a/addons/mass_mailing_egg/static/src/builder/plugins/border_option_plugin.js b/addons/mass_mailing_egg/static/src/builder/plugins/border_option_plugin.js
@@ -0,0 +1,18 @@
+import { Plugin } from "@html_editor/plugin";
+
+class BorderOptionPlugin extends Plugin {
+    static id = "mass_mailing.BorderOption";
+    resources = {
+        builder_options: [
+            {
+                template: "mass_mailing.BorderOption",
+                selector: ".s_three_columns .row > div, .s_comparisons .row > div, .s_mail_block_event .row > div",
+                exclude: ".o_mail_wrapper_td, .s_col_no_bgcolor, .s_col_no_bgcolor.row > div, .s_image_gallery .row > div"
+            },
+            {
+                template: "mass_mailing.BorderOption",
+                selector: ".o_mail_block_discount2",
+            },
+        ],
+    }
+}
diff --git a/addons/mass_mailing_egg/static/src/builder/plugins/column_option_plugin.js b/addons/mass_mailing_egg/static/src/builder/plugins/column_option_plugin.js
@@ -0,0 +1,25 @@
+import { after, before, WIDTH } from "@html_builder/utils/option_sequence";
+import { Plugin } from "@html_editor/plugin";
+import { registry } from "@web/core/registry";
+import { withSequence } from "@html_editor/utils/resource";
+import { BorderConfigurator } from "@html_builder/plugins/border_configurator_option";
+
+class ColumnOptionPlugin extends Plugin {
+    static id = "columnPlugin";
+    selector = ".col-lg";
+    resources = {
+        mark_color_level_selector_params: [{ selector: this.selector }],
+        builder_options: [
+            {
+                OptionComponent: BorderConfigurator,
+                selector: this.selector,
+                props: {
+                    label: "Border"
+                }
+            }
+        ],
+    };
+}
+// TODO: as in master, the position of a background image does not work
+// correctly.
+registry.category("builder-plugins").add(ColumnOptionPlugin.id, ColumnOptionPlugin);
diff --git a/addons/mass_mailing_egg/static/src/builder/plugins/dropzone_plugin.js b/addons/mass_mailing_egg/static/src/builder/plugins/dropzone_plugin.js
@@ -0,0 +1,46 @@
+import { Plugin } from "@html_editor/plugin";
+import { registry } from "@web/core/registry";
+
+class DropzonePlugin extends Plugin {
+    static id = "mass_mailing.DropzonePlugin";
+
+    resources = {
+        dropzone_selector: [
+            {
+                selector: ".o_mail_snippet_general",
+                dropIn: ":not(p).oe_structure:not(.oe_structure_solo), :not(.o_mega_menu):not(p)[data-oe-type=html], :not(p).oe_structure.oe_structure_solo:not(:has(> section, > div))"
+            }, {
+                selector: ".s_mail_blockquote, .s_mail_alert, .s_rating, .s_hr, .s_mail_text_highlight",
+                dropNear: "p, h1, h2, h3, ul, ol, .row > div > img, .s_mail_blockquote, .s_mail_alert, .s_rating, .s_hr, .s_mail_text_highlight",
+                dropIn: ".content, nav",
+            }, { // table_column
+                selector: ".col>td, .col>th",
+                exclude: this.noOptionsSelector,
+                dropNear: ".col>td, .col>th",
+            }, { // table_column_mv
+                selector: ".col_mv, td, th",
+                exclude: this.noOptionsSelector,
+                dropNear: ".col_mv, td, th"
+            }, { // table_row
+                selector: "tr:has(> .row), tr:has(> .col_mv)",
+                exclude: this.noOptionsSelector,
+                dropNear: "tr:has(> .row), tr:has(> .col_mv)",
+            }, { // content
+                selector: ".note-editable > div:not(.o_layout), .note-editable .oe_structure > div, .oe_snippet_body",
+                exclude: this.noOptionsSelector,
+                dropNear: "[data-oe-field='body_html']:not(:has(.o_layout)) > *, .oe_structure > *",
+                dropIn: "[data-oe-field='body_html']:not(:has(.o_layout)), .oe_structure",
+            }, { // sizing_x
+                selector: ".row > div",
+                exclude: ".o_mail_no_resize, .o_mail_no_options, .s_col_no_resize.row > div, .s_col_no_resize",
+                dropNear: ".row:not(.s_col_no_resize) > div",
+            }
+        ]
+    }
+
+    get noOptionsSelector() {
+        return ".o_mail_no_options";
+    }
+}
+
+registry.category("builder-plugins").add(DropzonePlugin.id, DropzonePlugin);
diff --git a/addons/mass_mailing_egg/static/src/builder/plugins/generic_option_plugin.js b/addons/mass_mailing_egg/static/src/builder/plugins/generic_option_plugin.js
@@ -0,0 +1,40 @@
+import { after, before, WIDTH } from "@html_builder/utils/option_sequence";
+import { Plugin } from "@html_editor/plugin";
+import { registry } from "@web/core/registry";
+import { withSequence } from "@html_editor/utils/resource";
+import { LayoutColumnOption } from "@html_builder/plugins/layout_column_option";
+
+class GenericBlockOptionPlugin extends Plugin {
+    static id = "GenericBlockOption";
+    colorPickerSelector = `.note-editable .oe_structure > div:not(:has(> .o_mail_snippet_general)),
+        .note-editable .oe_structure > div.o_mail_snippet_general,
+        .note-editable .oe_structure > div.o_mail_snippet_general .o_cc,
+        .s_mail_color_blocks_2 .row > div`;
+    resources = {
+        mark_color_level_selector_params: [{ selector: ".o_mail_snippet_general" }],
+        builder_options: [
+            withSequence(before(WIDTH), {
+                OptionComponent: LayoutColumnOption,
+                selector: ".o_mail_snippet_general",
+                applyTo: "* > *:has(> .row:not(.s_nb_column_fixed)), * > .s_allow_columns"
+            }),
+            {
+                template: "mass_mailing.BlockquoteOption",
+                selector: ".o_mail_snippet_general",
+                exclude: ".o_mail_snippet_general .row > div *"
+            },
+            {
+                template: "mass_mailing.ColorPickerOption",
+                selector: this.colorPickerSelector,
+                exclude: ".o_mail_no_colorpicker, .o_mail_no_options, .s_mail_color_blocks_2"
+            },
+        ],
+        so_snippet_addition_selector: [".o_mail_snippet_general"],
+        so_content_addition_selector: [
+            ".s_mail_blockquote, .s_mail_alert, .s_rating, .s_hr, .s_mail_text_highlight"
+        ]
+    };
+}
+// TODO: as in master, the position of a background image does not work
+// correctly.
+registry.category("builder-plugins").add(GenericBlockOptionPlugin.id, GenericBlockOptionPlugin );
diff --git a/addons/mass_mailing_egg/static/src/builder/plugins/horizontal_padding_option_plugin.js b/addons/mass_mailing_egg/static/src/builder/plugins/horizontal_padding_option_plugin.js
@@ -2,25 +2,21 @@ import { after, before, WIDTH } from "@html_builder/utils/option_sequence";
 import { Plugin } from "@html_editor/plugin";
 import { registry } from "@web/core/registry";
 import { withSequence } from "@html_editor/utils/resource";
-import { LayoutColumnOption } from "@html_builder/plugins/layout_column_option";
 
-class BlockquoteOptionPlugin extends Plugin {
-    static id = "massMailingBlockquoteOption";
-    selector = ".s_blockquote";
+class HorizontalPaddingOptionPlugin extends Plugin {
+    static id = "horizontalPaddingOption";
+    selector = "[class*='col-lg-'], .s_discount2, .s_text_block, .s_media_list, .s_picture, .s_rating";
     resources = {
         mark_color_level_selector_params: [{ selector: this.selector }],
         builder_options: [
-            withSequence(before(WIDTH), {
-                OptionComponent: LayoutColumnOption,
-                selector: this.selector,
-            }),
             withSequence(after(WIDTH)), {
-                template: "mass_mailing.BlockquoteOption",
+                template: "mass_mailing.PaddingOption",
                 selector: this.selector,
+                exclude: ".s_col_no_resize.row > div, .s_col_no_resize",
             },
         ],
     };
 }
 // TODO: as in master, the position of a background image does not work
 // correctly.
-registry.category("builder-plugins").add(BlockquoteOptionPlugin.id, BlockquoteOptionPlugin);
+registry.category("builder-plugins").add(HorizontalPaddingOptionPlugin.id, HorizontalPaddingOptionPlugin );
diff --git a/addons/mass_mailing_egg/static/src/builder/plugins/move_plugin.js b/addons/mass_mailing_egg/static/src/builder/plugins/move_plugin.js
diff --git a/addons/mass_mailing_egg/static/src/builder/plugins/vertical_alignment_option_plugin_patch.js b/addons/mass_mailing_egg/static/src/builder/plugins/vertical_alignment_option_plugin_patch.js
diff --git a/addons/mass_mailing_egg/static/src/themes/theme_service.js b/addons/mass_mailing_egg/static/src/themes/theme_service.js
diff --git a/addons/website/static/src/builder/builder_urlpicker.js b/addons/website/static/src/builder/builder_urlpicker.js
diff --git a/addons/website/static/src/builder/builder_urlpicker.xml b/addons/website/static/src/builder/builder_urlpicker.xml
