Skip to content

Commit bc1c567

Browse files
robinlejdetrouxdev
robinlej
authored and
detrouxdev
committed
[REF] website, mass_mailing: convert s_hr_options to OWL
task-3850413 # Conflicts: # addons/website/static/src/js/editor/snippets.registry.js
1 parent 90cadb9 commit bc1c567

File tree

8 files changed

+57
-46
lines changed

8 files changed

+57
-46
lines changed

‎addons/mass_mailing/__manifest__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@
165165
'mass_mailing/static/src/xml/mass_mailing.editor.xml',
166166
'mass_mailing/static/src/js/snippets.options.xml',
167167
'mass_mailing/static/src/js/snippets.registry.js',
168+
'mass_mailing/static/src/snippets/s_hr/options.xml',
168169
],
169170
'web.assets_frontend': [
170171
'mass_mailing/static/src/js/tours/**/*',

‎addons/mass_mailing/static/src/js/snippets.registry.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,9 @@ registerMassMailingOption("MassMailingIconTools", {
1212
selector: "span.fa, i.fa, img",
1313
exclude: "[data-oe-type='image'] > img, [data-oe-xpath]",
1414
});
15+
16+
registerMassMailingOption("MassMailingHrOptions", {
17+
template: "mass_mailing.s_hr_options",
18+
selector: ".s_hr",
19+
target: "hr",
20+
});

‎addons/mass_mailing/static/src/snippets/s_hr/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_hr_options">
5+
<t t-call="mass_mailing.snippet_options_border_line_widgets">
6+
<t t-set="label">Border</t>
7+
<t t-set="direction" t-value="'top'"/>
8+
</t>
9+
<WeSelect title.translate="Width">
10+
<WeButton selectClass="'w-25'">25%</WeButton>
11+
<WeButton selectClass="'w-50'">50%</WeButton>
12+
<WeButton selectClass="'w-75'">75%</WeButton>
13+
<WeButton selectClass="'w-100'" name="'so_width_100'">100%</WeButton>
14+
</WeSelect>
15+
<WeButtonGroup title.translate="Alignment" dependencies="'!so_width_100'">
16+
<WeButton class="'fa fa-fw fa-align-left'" tooltip.translate="Left" selectClass="'me-auto'"/>
17+
<WeButton class="'fa fa-fw fa-align-center'" tooltip.translate="Center" selectClass="'mx-auto'"/>
18+
<WeButton class="'fa fa-fw fa-align-right'" tooltip.translate="Right" selectClass="'ms-auto'"/>
19+
</WeButtonGroup>
20+
</t>
21+
22+
</templates>

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,6 @@
1010
</xpath>
1111
</template>
1212

13-
<template id="s_hr_options" inherit_id="mass_mailing.snippet_options">
14-
<xpath expr="." position="inside">
15-
<div data-selector=".s_hr" data-target="hr">
16-
<!-- TODO @owl-options: do convert & uncomment this. Just commented
17-
in legacy to avoid errors. -->
18-
<!-- <t t-call="mass_mailing.snippet_options_border_line_widgets">
19-
<t t-set="label">Border</t>
20-
<t t-set="direction" t-value="'top'"/>
21-
</t> -->
22-
<we-select string="Width">
23-
<we-button data-select-class="w-25">25%</we-button>
24-
<we-button data-select-class="w-50">50%</we-button>
25-
<we-button data-select-class="w-75">75%</we-button>
26-
<we-button data-select-class="w-100" data-name="so_width_100">100%</we-button>
27-
</we-select>
28-
<we-button-group string="Alignment" data-dependencies="!so_width_100">
29-
<we-button class="fa fa-fw fa-align-left" title="Left" data-select-class="me-auto"/>
30-
<we-button class="fa fa-fw fa-align-center" title="Center" data-select-class="mx-auto"/>
31-
<we-button class="fa fa-fw fa-align-right" title="Right" data-select-class="ms-auto"/>
32-
</we-button-group>
33-
</div>
34-
</xpath>
35-
</template>
36-
3713
<record id="mass_mailing.s_hr_000_scss" model="ir.asset">
3814
<field name="name">Hr 000 SCSS</field>
3915
<field name="bundle">web.assets_frontend</field>

‎addons/website/__manifest__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,7 @@
302302
'website/static/src/snippets/s_website_form/options.js',
303303
'website/static/src/snippets/s_website_form/options.xml',
304304
'website/static/src/snippets/s_badge/options.xml',
305+
'website/static/src/snippets/s_hr/options.xml',
305306
'website/static/src/js/form_editor_registry.js',
306307
'website/static/src/js/send_mail_form.js',
307308
'website/static/src/xml/website_form.xml',

‎addons/website/static/src/js/editor/snippets.registry.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,8 @@ registerWebsiteOption("BadgeOptions", {
2121
selector: ".s_badge",
2222
});
2323

24+
registerWebsiteOption("WebsiteHrOptions", {
25+
template: "website.s_hr_options",
26+
selector: ".s_hr",
27+
target: "hr",
28+
});

‎addons/website/static/src/snippets/s_hr/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="website.s_hr_options">
5+
<t t-call="website.snippet_options_border_line_widgets">
6+
<t t-set="label">Border</t>
7+
<t t-set="direction" t-value="'top'"/>
8+
</t>
9+
<WeSelect title.translate="Width">
10+
<WeButton selectClass="'w-25'">25%</WeButton>
11+
<WeButton selectClass="'w-50'">50%</WeButton>
12+
<WeButton selectClass="'w-75'">75%</WeButton>
13+
<WeButton selectClass="'w-100'" name="'so_width_100'">100%</WeButton>
14+
</WeSelect>
15+
<WeButtonGroup title.translate="Alignment" dependencies="'!so_width_100'">
16+
<WeButton class="'fa fa-fw fa-align-left'" tooltip.translate="Left" selectClass="'me-auto'"/>
17+
<WeButton class="'fa fa-fw fa-align-center'" tooltip.translate="Center" selectClass="'mx-auto'"/>
18+
<WeButton class="'fa fa-fw fa-align-right'" tooltip.translate="Right" selectClass="'ms-auto'"/>
19+
</WeButtonGroup>
20+
</t>
21+
22+
</templates>

‎addons/website/views/snippets/s_hr.xml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,6 @@
77
</div>
88
</template>
99

10-
<template id="s_hr_options" inherit_id="website.snippet_options">
11-
<xpath expr="." position="inside">
12-
<div data-selector=".s_hr" data-target="hr">
13-
<t t-call="website.snippet_options_border_line_widgets">
14-
<t t-set="label">Border</t>
15-
<t t-set="direction" t-value="'top'"/>
16-
</t>
17-
<we-select string="Width">
18-
<we-button data-select-class="w-25">25%</we-button>
19-
<we-button data-select-class="w-50">50%</we-button>
20-
<we-button data-select-class="w-75">75%</we-button>
21-
<we-button data-select-class="w-100" data-name="so_width_100">100%</we-button>
22-
</we-select>
23-
<we-button-group string="Alignment" data-dependencies="!so_width_100">
24-
<we-button class="fa fa-fw fa-align-left" title="Left" data-select-class="me-auto"/>
25-
<we-button class="fa fa-fw fa-align-center" title="Center" data-select-class="mx-auto"/>
26-
<we-button class="fa fa-fw fa-align-right" title="Right" data-select-class="ms-auto"/>
27-
</we-button-group>
28-
</div>
29-
</xpath>
30-
</template>
31-
3210
<record id="website.s_hr_000_scss" model="ir.asset">
3311
<field name="name">Hr 000 SCSS</field>
3412
<field name="bundle">web.assets_frontend</field>

0 commit comments

Comments
 (0)