Skip to content

Commit 08a92b4

Browse files
agau-odooagau-odoo
committed
[REF] mass_mailing: convert so_block and s_alert options to owl
task-3850413
1 parent fee4787 commit 08a92b4

File tree

8 files changed

+89
-36
lines changed

8 files changed

+89
-36
lines changed

‎addons/mass_mailing/__manifest__.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@
150150
'mass_mailing.assets_wysiwyg': [
151151
'mass_mailing/static/src/js/mass_mailing_snippets.js',
152152
'mass_mailing/static/src/js/snippets.options.xml',
153+
'mass_mailing/static/src/snippets/s_alert/options.js',
154+
'mass_mailing/static/src/snippets/s_alert/options.xml',
153155
'mass_mailing/static/src/snippets/s_masonry_block/options.js',
154156
'mass_mailing/static/src/snippets/s_masonry_block/options.xml',
155157
'mass_mailing/static/src/snippets/s_media_list/options.js',

‎addons/mass_mailing/static/src/js/mass_mailing_snippets.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,12 @@ options.registry.DesignTab = options.Class.extend({
327327
},
328328
});
329329

330+
registerMassMailingOption("mass_mailing_block_width", {
331+
template: "mass_mailing.block_width_option",
332+
selector: ".s_mail_blockquote, .s_mail_text_highlight",
333+
});
334+
330335
registerMassMailingOption("mass_mailing_block_align", {
331336
template: "mass_mailing.block_align_option",
332-
selector: ".s_mail_alert .s_alert, .s_mail_blockquote, .s_mail_text_highlight",
337+
selector: ".s_mail_blockquote, .s_mail_text_highlight",
333338
});

‎addons/mass_mailing/static/src/js/snippets.options.xml‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<templates id="template" xml:space="preserve">
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<templates xml:space="preserve">
3+
4+
<t t-name="mass_mailing.block_width_option">
5+
<WeSelect title.translate="Width">
6+
<WeButton selectClass="'w-25'">25%</WeButton>
7+
<WeButton selectClass="'w-50'">50%</WeButton>
8+
<WeButton selectClass="'w-75'">75%</WeButton>
9+
<WeButton selectClass="'w-100'" name="'so_width_100'">100%</WeButton>
10+
</WeSelect>
11+
</t>
312

413
<t t-name="mass_mailing.block_align_option">
514
<WeButtonGroup title.translate="Alignment" dependencies="'!so_width_100'">

‎addons/mass_mailing/static/src/snippets/s_alert/002.scss‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
.o_mail_snippet_general .s_mail_alert [class^="col-lg"]{
2+
padding-left: 0!important;
3+
padding-right: 0!important;
4+
}
5+
6+
.s_mail_alert {
7+
.s_alert {
8+
border-width: $alert-border-width;
9+
border-style: solid;
10+
border-radius: $alert-border-radius;
11+
p, ul, ol {
12+
&:last-child {
13+
margin-bottom: 0;
14+
}
15+
}
16+
}
17+
.s_alert_sm {
18+
padding: $grid-gutter-width/3;
19+
font-size: $font-size-sm;
20+
}
21+
.s_alert_md {
22+
padding: $grid-gutter-width/2;
23+
font-size: $font-size-base;
24+
}
25+
.s_alert_lg {
26+
padding: $grid-gutter-width;
27+
font-size: $font-size-lg;
28+
}
29+
.s_alert_icon {
30+
float: left;
31+
margin-right: 10px;
32+
}
33+
.s_alert_content {
34+
overflow: hidden;
35+
}
36+
}

‎addons/mass_mailing/static/src/snippets/s_alert/options.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import { registerMassMailingOption } from "@mass_mailing/js/snippets.registry";
2+
3+
registerMassMailingOption("MassMailingAlert", {
4+
template: "mass_mailing.s_alert_options",
5+
selector: ".s_mail_alert .s_alert",
6+
});

‎addons/mass_mailing/static/src/snippets/s_alert/options.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<templates xml:space="preserve">
3+
4+
<t t-name="mass_mailing.s_alert_options">
5+
<t t-call="mass_mailing.block_width_option"/>
6+
<WeSelect title.translate="Size">
7+
<WeButton selectClass="'s_alert_sm'">Small</WeButton>
8+
<WeButton selectClass="'s_alert_md'">Medium</WeButton>
9+
<WeButton selectClass="'s_alert_lg'">Large</WeButton>
10+
</WeSelect>
11+
<WeColorpicker title.translate="Background Color"
12+
name="'alert_colorpicker_opt'"
13+
selectStyle="'true'"
14+
cssProperty="'background-color'"
15+
colorPrefix="'alert-'"/>
16+
<t t-call="mass_mailing.snippet_options_border_widgets">
17+
<t t-set="so_rounded_no_dependencies" t-value="True"/>
18+
</t>
19+
<t t-call="mass_mailing.block_align_option"/>
20+
</t>
21+
22+
</templates>

‎addons/mass_mailing/views/snippets/s_alert.xml‎

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,35 +20,17 @@
2020
</div>
2121
</template>
2222

23-
<template id="s_alert_options" inherit_id="mass_mailing.snippet_options">
24-
<!-- Keep those options in separate xpath for options order -->
25-
<xpath expr="//div[@id='so_width']" position="after">
26-
<div data-selector=".s_mail_alert .s_alert">
27-
<we-select string="Size">
28-
<we-button data-select-class="s_alert_sm">Small</we-button>
29-
<we-button data-select-class="s_alert_md">Medium</we-button>
30-
<we-button data-select-class="s_alert_lg">Large</we-button>
31-
</we-select>
32-
<we-colorpicker string="Background Color" data-name="alert_colorpicker_opt"
33-
data-select-style="true"
34-
data-css-property="background-color"
35-
data-color-prefix="alert-"/>
36-
</div>
37-
<div data-selector=".s_mail_alert .s_alert">
38-
<!-- TODO @owl-options: do convert & uncomment this. Just commented
39-
in legacy to avoid errors. -->
40-
<!-- <t t-call="mass_mailing.snippet_options_border_widgets">
41-
<t t-set="so_rounded_no_dependencies" t-value="True"/>
42-
</t> -->
43-
</div>
44-
</xpath>
45-
</template>
46-
4723
<!-- Assets -->
4824
<record id="mass_mailing.s_alert_001_scss" model="ir.asset">
4925
<field name="name">Alert 001 SCSS</field>
5026
<field name="bundle">web.assets_frontend</field>
5127
<field name="path">mass_mailing/static/src/snippets/s_alert/000.scss</field>
28+
<field name="active" eval="False"/>
29+
</record>
30+
<record id="mass_mailing.s_alert_002_scss" model="ir.asset">
31+
<field name="name">Alert 002 SCSS</field>
32+
<field name="bundle">web.assets_frontend</field>
33+
<field name="path">mass_mailing/static/src/snippets/s_alert/002.scss</field>
5234
</record>
5335

5436
</odoo>

‎addons/mass_mailing/views/snippets_themes.xml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -331,15 +331,6 @@
331331
<we-button class="fa fa-fw fa-angle-right" data-move-snippet="next" data-no-preview="true" data-name="move_right_opt"/>
332332
</div>
333333

334-
<div id="so_width" data-selector=".s_mail_alert .s_alert, .s_mail_blockquote, .s_mail_text_highlight">
335-
<we-select string="Width">
336-
<we-button data-select-class="w-25">25%</we-button>
337-
<we-button data-select-class="w-50">50%</we-button>
338-
<we-button data-select-class="w-75">75%</we-button>
339-
<we-button data-select-class="w-100" data-name="so_width_100">100%</we-button>
340-
</we-select>
341-
</div>
342-
343334
<div data-selector=".o_mail_snippet_general" data-exclude=".o_mail_snippet_general .row > div *">
344335
<we-button-group string="Height">
345336
<we-button data-name="minheight_auto_opt" data-select-class="" title="Fit content">Auto</we-button>

0 commit comments

Comments
 (0)