Skip to content

Commit 247e1e6

Browse files
abd-msyukyu-odoothjo-odoo
abd-msyukyu-odoo
and
thjo-odoo
committed
[IMP] mass_mailing: refresh mass_mailing snippets
After the `mass_mailing` refactoring to use the html Builder, some snippets had outdated appearance. This commit refreshes all of them inspired by those in `website`. This commit also adapt existing mailing templates so that their content is more closely related to what is achievable with the html Builder. In the future, new themes will be introduced. task-4247642 Co-authored-by: Damien Abeloos <[email protected]> Co-authored-by: Thomas Josse <[email protected]>
1 parent d4ee8d1 commit 247e1e6

File tree

93 files changed

+2087
-1136
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+2087
-1136
lines changed

‎addons/html_builder/static/src/plugins/layout_column_option_plugin.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ class LayoutColumnOptionPlugin extends Plugin {
1515
OptionComponent: LayoutColumnOption,
1616
selector: "section.s_features_grid, section.s_process_steps",
1717
applyTo: ":scope > *:has(> .row), :scope > .s_allow_columns",
18+
name: "layoutColumnOption",
1819
}),
1920
],
2021
on_cloned_handlers: this.onCloned.bind(this),

‎addons/html_builder/static/src/plugins/vertical_alignment_option_plugin.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export class VerticalAlignmentOptionPlugin extends Plugin {
1212
withSequence(VERTICAL_ALIGNMENT, {
1313
OptionComponent: VerticalAlignmentOption,
1414
selector:
15-
".s_text_image, .s_image_text, .s_three_columns, .s_showcase, .s_numbers, .s_faq_collapse, .s_references, .s_accordion_image, .s_shape_image",
15+
".s_text_image, .s_image_text, .s_three_columns, .s_showcase, .s_numbers, .s_faq_collapse, .s_references, .s_accordion_image, .s_shape_image, .s_reviews_wall",
1616
applyTo: ".row",
1717
props: {
1818
level: 1,

‎addons/html_builder/static/src/sidebar/block_tab.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,9 @@ export class BlockTab extends Component {
453453
// a draggable snippet, so it becomes a simple HTML code.
454454
if (snippetEl.classList.contains("o_snippet_drop_in_only")) {
455455
snippetEl.classList.remove("o_snippet_drop_in_only");
456+
if (snippetEl.classList.length === 0) {
457+
snippetEl.removeAttribute("class");
458+
}
456459
delete snippetEl.dataset.snippet;
457460
delete snippetEl.dataset.name;
458461
}

‎addons/html_builder/static/src/utils/column_layout_utils.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* @returns {integer|string} number of columns or "custom"
1010
*/
1111
export function getNbColumns(columnEls, isMobile, mobileBreakpoint) {
12-
if (!columnEls) {
12+
if (!columnEls?.length) {
1313
return 0;
1414
}
1515
if (areColsCustomized(columnEls, isMobile, mobileBreakpoint)) {
@@ -75,6 +75,9 @@ export function removeMobileOrders(columnEls, mobileBreakpoint) {
7575
* @returns {boolean}
7676
*/
7777
export function areColsCustomized(columnEls, isMobile, mobileBreakpoint) {
78+
if (!columnEls?.length) {
79+
return false;
80+
}
7881
const resolutionModifier = isMobile ? "" : `${mobileBreakpoint}-`;
7982
const colRegex = new RegExp(`(?:^|\\s+)col-${resolutionModifier}(\\d{1,2})(?!\\S)`);
8083
const colSize = parseInt(columnEls[0].className.match(colRegex)?.[1] || 12);

‎addons/html_builder/static/src/utils/option_sequence.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,9 @@ const [
114114
VERTICAL_ALIGNMENT,
115115
SNIPPET_SPECIFIC_NEXT,
116116
SNIPPET_SPECIFIC_END,
117+
ANIMATE,
117118
...__DETECT_ERROR_2__
118-
] = splitBetween(SNIPPET_SPECIFIC, END, 5);
119+
] = splitBetween(SNIPPET_SPECIFIC, END, 6);
119120
if (__DETECT_ERROR_2__.length > 0) {
120121
console.error("Wrong count in split after default");
121122
}
@@ -145,5 +146,6 @@ export {
145146
VERTICAL_ALIGNMENT,
146147
SNIPPET_SPECIFIC_NEXT,
147148
SNIPPET_SPECIFIC_END,
149+
ANIMATE,
148150
END,
149151
};

‎addons/mass_mailing/__manifest__.py‎

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -58,32 +58,16 @@
5858
'views/mailing_templates_portal_unsubscribe.xml',
5959
'views/themes_templates.xml',
6060
'views/snippets_themes.xml',
61-
'views/snippets/s_alert.xml',
62-
'views/snippets/s_blockquote.xml',
63-
'views/snippets/s_call_to_action.xml',
64-
'views/snippets/s_coupon_code.xml',
65-
'views/snippets/s_cover.xml',
66-
'views/snippets/s_color_blocks_2.xml',
67-
'views/snippets/s_company_team.xml',
68-
'views/snippets/s_comparisons.xml',
69-
'views/snippets/s_event.xml',
70-
'views/snippets/s_features.xml',
71-
'views/snippets/s_features_grid.xml',
72-
'views/snippets/s_hr.xml',
73-
'views/snippets/s_image_text.xml',
74-
'views/snippets/s_masonry_block.xml',
75-
'views/snippets/s_media_list.xml',
76-
'views/snippets/s_numbers.xml',
77-
'views/snippets/s_picture.xml',
78-
'views/snippets/s_product_list.xml',
79-
'views/snippets/s_rating.xml',
80-
'views/snippets/s_references.xml',
81-
'views/snippets/s_showcase.xml',
82-
'views/snippets/s_text_block.xml',
83-
'views/snippets/s_text_highlight.xml',
84-
'views/snippets/s_text_image.xml',
85-
'views/snippets/s_three_columns.xml',
86-
'views/snippets/s_title.xml',
61+
'views/snippets/mass_mailing_columns_snippets.xml',
62+
'views/snippets/mass_mailing_footer_snippets.xml',
63+
'views/snippets/mass_mailing_headers_snippets.xml',
64+
'views/snippets/mass_mailing_headings_snippets.xml',
65+
'views/snippets/mass_mailing_images_snippets.xml',
66+
'views/snippets/mass_mailing_inner_snippets.xml',
67+
'views/snippets/mass_mailing_marketing_snippets.xml',
68+
'views/snippets/mass_mailing_masonry_snippets.xml',
69+
'views/snippets/mass_mailing_people_snippets.xml',
70+
'views/snippets/mass_mailing_text_snippets.xml',
8771
],
8872
'demo': [
8973
'demo/utm.xml',

‎addons/mass_mailing/data/ir_attachment_data.xml‎

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,27 +28,39 @@
2828
</record>
2929
<record id="mass_mailing.s_company_team_default_image_1" model="ir.attachment">
3030
<field name="public" eval="True"/>
31-
<field name="name">s_company_team_default_image_1.png</field>
31+
<field name="name">s_company_team_default_image_1.jpg</field>
3232
<field name="type">url</field>
33-
<field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_team_member_1.png</field>
33+
<field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_team_member_1.jpg</field>
3434
</record>
3535
<record id="mass_mailing.s_company_team_default_image_2" model="ir.attachment">
3636
<field name="public" eval="True"/>
37-
<field name="name">s_company_team_default_image_2.png</field>
37+
<field name="name">s_company_team_default_image_2.jpg</field>
3838
<field name="type">url</field>
39-
<field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_team_member_2.png</field>
39+
<field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_team_member_2.jpg</field>
4040
</record>
4141
<record id="mass_mailing.s_company_team_default_image_3" model="ir.attachment">
4242
<field name="public" eval="True"/>
43-
<field name="name">s_company_team_default_image_3.png</field>
43+
<field name="name">s_company_team_default_image_3.jpg</field>
4444
<field name="type">url</field>
45-
<field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_team_member_3.png</field>
45+
<field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_team_member_3.jpg</field>
4646
</record>
4747
<record id="mass_mailing.s_company_team_default_image_4" model="ir.attachment">
4848
<field name="public" eval="True"/>
49-
<field name="name">s_company_team_default_image_4.png</field>
49+
<field name="name">s_company_team_default_image_4.jpg</field>
5050
<field name="type">url</field>
51-
<field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_team_member_4.png</field>
51+
<field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_team_member_4.jpg</field>
52+
</record>
53+
<record id="mass_mailing.s_company_team_default_image_5" model="ir.attachment">
54+
<field name="public" eval="True"/>
55+
<field name="name">s_company_team_default_image_5.jpg</field>
56+
<field name="type">url</field>
57+
<field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_team_member_5.jpg</field>
58+
</record>
59+
<record id="mass_mailing.s_company_team_default_image_6" model="ir.attachment">
60+
<field name="public" eval="True"/>
61+
<field name="name">s_company_team_default_image_6.jpg</field>
62+
<field name="type">url</field>
63+
<field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_team_member_6.jpg</field>
5264
</record>
5365
<record id="mass_mailing.s_reference_default_image_1" model="ir.attachment">
5466
<field name="public" eval="True"/>
@@ -96,13 +108,13 @@
96108
<field name="public" eval="True"/>
97109
<field name="name">s_blockquote_default_image.jpg</field>
98110
<field name="type">url</field>
99-
<field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_team_member_2.png</field>
111+
<field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_team_member_2.jpg</field>
100112
</record>
101113
<record id="mass_mailing.s_image_text_default_image" model="ir.attachment">
102114
<field name="public" eval="True"/>
103-
<field name="name">s_image_text_default_image.jpg</field>
115+
<field name="name">s_image_text_default_image.webp</field>
104116
<field name="type">url</field>
105-
<field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_image_text.jpg</field>
117+
<field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_image_text.webp</field>
106118
</record>
107119
<record id="mass_mailing.s_event_default_image_1" model="ir.attachment">
108120
<field name="public" eval="True"/>
@@ -118,9 +130,9 @@
118130
</record>
119131
<record id="mass_mailing.s_masonry_block_default_image_1" model="ir.attachment">
120132
<field name="public" eval="True"/>
121-
<field name="name">s_masonry_block_default_image_1.jpg</field>
133+
<field name="name">s_masonry_block_default_image_1.webp</field>
122134
<field name="type">url</field>
123-
<field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_masonry_block_1.jpg</field>
135+
<field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_masonry_block_1.webp</field>
124136
</record>
125137
<record id="mass_mailing.s_masonry_block_default_image_2" model="ir.attachment">
126138
<field name="public" eval="True"/>
@@ -136,9 +148,9 @@
136148
</record>
137149
<record id="mass_mailing.s_text_image_default_image" model="ir.attachment">
138150
<field name="public" eval="True"/>
139-
<field name="name">s_text_image_default_image.jpg</field>
151+
<field name="name">s_text_image_default_image.webp</field>
140152
<field name="type">url</field>
141-
<field name="url">/mass_mailing/static/src/img/theme_default/s_default_image_text_image.jpg</field>
153+
<field name="url">/mass_mailing/static/src/img/theme_default/s_text_image_default_image.webp</field>
142154
</record>
143155
<record id="mass_mailing.s_three_columns_default_image_1" model="ir.attachment">
144156
<field name="public" eval="True"/>

‎addons/mass_mailing/static/shapes/s_attributes_1.svg‎

Lines changed: 7 additions & 0 deletions
Loading

‎addons/mass_mailing/static/shapes/s_attributes_2.svg‎

Lines changed: 13 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)