diff --git a/addons/mass_mailing/__manifest__.py b/addons/mass_mailing/__manifest__.py index 3adda9bc434..35212348440 100644 --- a/addons/mass_mailing/__manifest__.py +++ b/addons/mass_mailing/__manifest__.py @@ -34,6 +34,7 @@ professional emails and reuse templates in a few clicks. 'views/email_template.xml', 'security/ir.model.access.csv', 'views/editor_field_html.xml', + 'views/themes_templates.xml', 'views/snippets_themes.xml', 'views/snippets_themes_options.xml', ], diff --git a/addons/mass_mailing/static/src/css/snippet_styles.css b/addons/mass_mailing/static/src/css/snippet_styles.css deleted file mode 100644 index 2035ea37ea1..00000000000 --- a/addons/mass_mailing/static/src/css/snippet_styles.css +++ /dev/null @@ -1,83 +0,0 @@ -@media screen and (max-width: 320px) { - .mobile-col { - width: 600px; - } -} - -/* ======================== TYPO ====================== */ - -.display-coupon, .display-1, .display-2, .display-3, p, th, td, a, .table-styles { - font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; - font-weight:300; - text-decoration: none !important; -} -.display-coupon { - font-size:60px; -} -.display-1 { - font-size: 30px; -} -.display-2 { - font-size: 25px; -} -.display-3 { - font-size: 18px; -} -p, th, td { - text-align:left; - font-size:14px; -} -a, a:hover { - color: inherit; -} -.text-center { - text-align: center; -} - -/* ======================== MISC ====================== */ - -.horizontal-padding { - padding-left: 20px; - padding-right: 20px; -} -.vertical-padding { - padding-top: 20px; - padding-bottom: 20px; -} -.no-margin { - margin: 0; -} -.table-styles { - border-collapse:separate; -} -.snippet-general { - width:600px; - margin:0 auto; - color:#464646; -} -.newsletter-btn { - -webkit-user-select: none; - padding: 6px 12px; - font-size: 14px; - color: #ffffff; - border: none; - text-decoration: none; - display: inline-block; - font-weight: 400; - font-family: 'Helvetica'; - text-align: center; - cursor: pointer; - background-color: #34c9a4; -} - -/* ======================== SNIPPETS ====================== */ - -.separator { - height: 1px; - background-color: #e3e3e3; -} -.banner { - width:600px; - margin:0 auto; - padding:0; -} diff --git a/addons/mass_mailing/static/src/css/themes/airmail.css b/addons/mass_mailing/static/src/css/themes/airmail.css deleted file mode 100644 index 655d4bd19ee..00000000000 --- a/addons/mass_mailing/static/src/css/themes/airmail.css +++ /dev/null @@ -1,77 +0,0 @@ -/*Airmail Template*/ - -.o_airmail_theme_header, .o_airmail_theme_footer { - background-color: #d05d68; -} -.o_airmail_theme { - background-color: #ededed; -} -.o_airmail_theme_container { - background-color: white; - box-shadow: none; -} - -/*Colors*/ - -.o_airmail_theme .bg-alpha { - background-color: #fff; -} -.o_airmail_theme .bg-alpha p, .o_airmail_theme .bg-alpha .display-1, .o_airmail_theme .bg-alpha .display-2, .o_airmail_theme .bg-alpha .display-3 { - color: #000; -} -.o_airmail_theme .bg-beta { - background-color: #6077a8; -} -.o_airmail_theme .bg-beta p, .o_airmail_theme .bg-beta .display-1, .o_airmail_theme .bg-beta .display-2, .o_airmail_theme .bg-beta .display-3 { - color: #fff; -} -.o_airmail_theme .bg-beta .link-color { - color: #dab4a8; -} -.o_airmail_theme .bg-gamma { - background-color: #a17e92; -} -.o_airmail_theme .bg-gamma .link-color { - color: #dab4a8; -} -.o_airmail_theme .bg-gamma p, .o_airmail_theme .bg-gamma .display-1, .o_airmail_theme .bg-gamma .display-2, .o_airmail_theme .bg-gamma .display-3 { - color: #fff; -} -.o_airmail_theme .bg-delta { - background-color: #dab4a8; -} -.o_airmail_theme .bg-delta p, .o_airmail_theme .bg-delta .display-1, .o_airmail_theme .bg-delta .display-2, .o_airmail_theme .bg-delta .display-3 { - color: #000; -} -.o_airmail_theme .bg-epsilon { - background-color: #d05d68; -} -.o_airmail_theme .bg-epsilon p, .o_airmail_theme .bg-epsilon .display-1, .o_airmail_theme .bg-epsilon .display-2, .o_airmail_theme .bg-epsilon .display-3 { - color: #fff; -} -.o_airmail_theme .bg-epsilon .link-color { - color: #fff; -} - -/*Link color*/ - -.o_airmail_theme .link-color { - color: #d05d68; -} - -/*BTN styles*/ - -.o_airmail_theme .newsletter-btn { - color: #d05d68; - border: 1px solid #d05d68; - border-radius: 4px; - background-color: transparent; -} -.o_airmail_theme .bg-gamma .newsletter-btn { - color: #fff; - border: 1px solid #fff; -} -.o_airmail_theme .bg-epsilon .newsletter-btn { - color: #fff; - border: 1px solid #fff; -} diff --git a/addons/mass_mailing/static/src/css/themes/lemon.css b/addons/mass_mailing/static/src/css/themes/lemon.css deleted file mode 100644 index df6a83f9e17..00000000000 --- a/addons/mass_mailing/static/src/css/themes/lemon.css +++ /dev/null @@ -1,75 +0,0 @@ -/* ======================== COLORS ====================== */ - -.o_lemon_theme { - background-color: #fff; -} -.o_lemon_theme_header { - background-color: #fe4e1e; -} -.o_lemon_theme_container { - background-color: #f4ea00; -} - -.o_lemon_theme p { - color: #000; -} -.o_lemon_theme .bg-alpha { - background-color: #fff; -} -.o_lemon_theme .bg-alpha .display-1, .o_lemon_theme .bg-alpha p, .o_lemon_theme .bg-alpha .display-2, .o_lemon_theme .bg-alpha .display-3{ - color: #000; -} -.o_lemon_theme .bg-beta { - background-color: #f4ea00; -} -.o_lemon_theme .bg-beta p, .o_lemon_theme .bg-beta .display-1, .o_lemon_theme .bg-beta .display-2, .o_lemon_theme .bg-beta .display-3 { - color: #000; -} -.o_lemon_theme .bg-gamma { - background-color: #d6d5b6; -} -.o_lemon_theme .bg-gamma p, .o_lemon_theme .bg-gamma .display-1, .o_lemon_theme .bg-gamma .display-2, .o_lemon_theme .bg-gamma .display-3 { - color: #000; -} -.o_lemon_theme .bg-gamma .link-color { - color: #fe4e1e; -} -.o_lemon_theme .bg-delta { - background-color: #000; -} -.o_lemon_theme .bg-delta p, .o_lemon_theme .bg-delta .display-1, .o_lemon_theme .bg-delta .display-2, .o_lemon_theme .bg-delta .display-3 { - color: #fff; -} -.o_lemon_theme .bg-delta .link-color { - color: #fe4e1e; -} -.o_lemon_theme .bg-epsilon { - background-color: #fe4e1e; -} -.o_lemon_theme .bg-epsilon p, .o_lemon_theme .bg-epsilon .display-1, .o_lemon_theme .bg-epsilon .display-2, .o_lemon_theme .bg-epsilon .display-3 { - color: #fff; -} -.o_lemon_theme .bg-epsilon .link-color { - color: #f4ea00; -} - -.o_lemon_theme .link-color { - color: #fe4e1e; -} - -/*BTN styles*/ - -.o_lemon_theme .newsletter-btn { - color: #fff; - background-color: #fe4e1e; - font-size: 12px; -} - -/*Snippet styles*/ - -.o_lemon_theme .separator { - background-color: #fff; -} -.o_lemon_theme .snippet-general { - margin:0 auto; -} diff --git a/addons/mass_mailing/static/src/css/themes/tech.css b/addons/mass_mailing/static/src/css/themes/tech.css deleted file mode 100644 index 00ea206cd48..00000000000 --- a/addons/mass_mailing/static/src/css/themes/tech.css +++ /dev/null @@ -1,75 +0,0 @@ -/* ======================== COLORS ====================== */ - -.o_tech_theme { - background-color: #fff; -} -.o_tech_theme_header { - background-color: #e3e3e3; -} - -.o_tech_theme p { - color: #494949; -} -.o_tech_theme .bg-alpha { - background-color: #fff; -} -.o_tech_theme .bg-alpha .display-1, .o_tech_theme .bg-alpha p, .o_tech_theme .bg-alpha .display-2, .o_tech_theme .bg-alpha .display-3{ - color: #000; -} -.o_tech_theme .bg-beta { - background-color: #dadada; -} -.o_tech_theme .bg-beta p, .o_tech_theme .bg-beta .display-1, .o_tech_theme .bg-beta .display-2, .o_tech_theme .bg-beta .display-3 { - color: #000; -} -.o_tech_theme .bg-beta .link-color { - color: #de5745; -} -.o_tech_theme .bg-gamma { - background-color: #de5745; -} -.o_tech_theme .bg-gamma p, .o_tech_theme .bg-gamma .display-1, .o_tech_theme .bg-gamma .display-2, .o_tech_theme .bg-gamma .display-3 { - color: #fff; -} -.o_tech_theme .bg-gamma .link-color { - color: #ccda3f; -} -.o_tech_theme .bg-delta { - background-color: #4a9fba; -} -.o_tech_theme .bg-delta p, .o_tech_theme .bg-delta .display-1, .o_tech_theme .bg-delta .display-2, .o_tech_theme .bg-delta .display-3 { - color: #fff; -} -.o_tech_theme .bg-delta .link-color { - color: #ccda3f; -} -.o_tech_theme .bg-epsilon { - background-color: #ccda3f; -} -.o_tech_theme .bg-epsilon p, .o_tech_theme .bg-epsilon .display-1, .o_tech_theme .bg-epsilon .display-2, .o_tech_theme .bg-epsilon .display-3 { - color: #000; -} -.o_tech_theme .bg-epsilon .link-color { - color: #de5745; -} - -.o_tech_theme .link-color { - color: #ccda3f; -} - -/*BTN styles*/ - -.o_tech_theme .newsletter-btn { - color: #fff; - background-color: #ccda3f; - font-size: 12px; -} -.o_tech_theme .bg-epsilon .newsletter-btn { - background-color: #de5745; -} - -/*Snippet styles*/ - -.o_tech_theme .snippet-general { - margin:0 auto; -} diff --git a/addons/mass_mailing/static/src/img/blocks/block_banner.png b/addons/mass_mailing/static/src/img/blocks/block_banner.png old mode 100644 new mode 100755 index d654274d9e8..bcf62bd1e6f Binary files a/addons/mass_mailing/static/src/img/blocks/block_banner.png and b/addons/mass_mailing/static/src/img/blocks/block_banner.png differ diff --git a/addons/mass_mailing/static/src/img/blocks/block_comparison_table.png b/addons/mass_mailing/static/src/img/blocks/block_comparison_table.png new file mode 100755 index 00000000000..63c810cce2e Binary files /dev/null and b/addons/mass_mailing/static/src/img/blocks/block_comparison_table.png differ diff --git a/addons/mass_mailing/static/src/img/blocks/block_discount1.png b/addons/mass_mailing/static/src/img/blocks/block_discount1.png old mode 100644 new mode 100755 index b6142062d72..478d25252ac Binary files a/addons/mass_mailing/static/src/img/blocks/block_discount1.png and b/addons/mass_mailing/static/src/img/blocks/block_discount1.png differ diff --git a/addons/mass_mailing/static/src/img/blocks/block_discount2.png b/addons/mass_mailing/static/src/img/blocks/block_discount2.png old mode 100644 new mode 100755 index ff4fba13db9..0a14a91753b Binary files a/addons/mass_mailing/static/src/img/blocks/block_discount2.png and b/addons/mass_mailing/static/src/img/blocks/block_discount2.png differ diff --git a/addons/mass_mailing/static/src/img/blocks/block_event.png b/addons/mass_mailing/static/src/img/blocks/block_event.png old mode 100644 new mode 100755 index f75ea319f88..4dba58c9a8a Binary files a/addons/mass_mailing/static/src/img/blocks/block_event.png and b/addons/mass_mailing/static/src/img/blocks/block_event.png differ diff --git a/addons/mass_mailing/static/src/img/blocks/block_footer_separator.png b/addons/mass_mailing/static/src/img/blocks/block_footer_separator.png old mode 100644 new mode 100755 index a3b202a8362..6af266fca5c Binary files a/addons/mass_mailing/static/src/img/blocks/block_footer_separator.png and b/addons/mass_mailing/static/src/img/blocks/block_footer_separator.png differ diff --git a/addons/mass_mailing/static/src/img/blocks/block_footer_social.png b/addons/mass_mailing/static/src/img/blocks/block_footer_social.png old mode 100644 new mode 100755 index abb0d12ff94..41992607c2b Binary files a/addons/mass_mailing/static/src/img/blocks/block_footer_social.png and b/addons/mass_mailing/static/src/img/blocks/block_footer_social.png differ diff --git a/addons/mass_mailing/static/src/img/blocks/block_footer_social_left.png b/addons/mass_mailing/static/src/img/blocks/block_footer_social_left.png new file mode 100755 index 00000000000..ee39ed7c068 Binary files /dev/null and b/addons/mass_mailing/static/src/img/blocks/block_footer_social_left.png differ diff --git a/addons/mass_mailing/static/src/img/blocks/block_footer_tag_line.png b/addons/mass_mailing/static/src/img/blocks/block_footer_tag_line.png old mode 100644 new mode 100755 index 5701891a1b5..73b5a29ea59 Binary files a/addons/mass_mailing/static/src/img/blocks/block_footer_tag_line.png and b/addons/mass_mailing/static/src/img/blocks/block_footer_tag_line.png differ diff --git a/addons/mass_mailing/static/src/img/blocks/block_header_logo.png b/addons/mass_mailing/static/src/img/blocks/block_header_logo.png new file mode 100755 index 00000000000..eae72c936f0 Binary files /dev/null and b/addons/mass_mailing/static/src/img/blocks/block_header_logo.png differ diff --git a/addons/mass_mailing/static/src/img/blocks/block_header_social.png b/addons/mass_mailing/static/src/img/blocks/block_header_social.png old mode 100644 new mode 100755 index 9aa612f46e0..43aaec4cdc9 Binary files a/addons/mass_mailing/static/src/img/blocks/block_header_social.png and b/addons/mass_mailing/static/src/img/blocks/block_header_social.png differ diff --git a/addons/mass_mailing/static/src/img/blocks/block_header_text_social.png b/addons/mass_mailing/static/src/img/blocks/block_header_text_social.png old mode 100644 new mode 100755 index db090733574..61bb97fd2b4 Binary files a/addons/mass_mailing/static/src/img/blocks/block_header_text_social.png and b/addons/mass_mailing/static/src/img/blocks/block_header_text_social.png differ diff --git a/addons/mass_mailing/static/src/img/blocks/block_image.png b/addons/mass_mailing/static/src/img/blocks/block_image.png old mode 100644 new mode 100755 index e0f8901b1d5..e918a8d70f1 Binary files a/addons/mass_mailing/static/src/img/blocks/block_image.png and b/addons/mass_mailing/static/src/img/blocks/block_image.png differ diff --git a/addons/mass_mailing/static/src/img/blocks/block_image_text.png b/addons/mass_mailing/static/src/img/blocks/block_image_text.png old mode 100644 new mode 100755 index 41b2949a777..de9e18f37c3 Binary files a/addons/mass_mailing/static/src/img/blocks/block_image_text.png and b/addons/mass_mailing/static/src/img/blocks/block_image_text.png differ diff --git a/addons/mass_mailing/static/src/img/blocks/block_paragraph.png b/addons/mass_mailing/static/src/img/blocks/block_paragraph.png new file mode 100755 index 00000000000..bfba996c54a Binary files /dev/null and b/addons/mass_mailing/static/src/img/blocks/block_paragraph.png differ diff --git a/addons/mass_mailing/static/src/img/blocks/block_steps.png b/addons/mass_mailing/static/src/img/blocks/block_steps.png old mode 100644 new mode 100755 index 49c59314ea3..e977a1059e5 Binary files a/addons/mass_mailing/static/src/img/blocks/block_steps.png and b/addons/mass_mailing/static/src/img/blocks/block_steps.png differ diff --git a/addons/mass_mailing/static/src/img/blocks/block_table_content.png b/addons/mass_mailing/static/src/img/blocks/block_table_content.png deleted file mode 100644 index 1dd9f1ab4dc..00000000000 Binary files a/addons/mass_mailing/static/src/img/blocks/block_table_content.png and /dev/null differ diff --git a/addons/mass_mailing/static/src/img/blocks/block_text_image.png b/addons/mass_mailing/static/src/img/blocks/block_text_image.png old mode 100644 new mode 100755 index ab3d90c19a2..c0832ebd612 Binary files a/addons/mass_mailing/static/src/img/blocks/block_text_image.png and b/addons/mass_mailing/static/src/img/blocks/block_text_image.png differ diff --git a/addons/mass_mailing/static/src/img/blocks/block_three_cols.png b/addons/mass_mailing/static/src/img/blocks/block_three_cols.png old mode 100644 new mode 100755 index ffb3e955b96..cd72e7b8168 Binary files a/addons/mass_mailing/static/src/img/blocks/block_three_cols.png and b/addons/mass_mailing/static/src/img/blocks/block_three_cols.png differ diff --git a/addons/mass_mailing/static/src/img/blocks/block_title_sub.png b/addons/mass_mailing/static/src/img/blocks/block_title_sub.png old mode 100644 new mode 100755 index fe7b44867bc..1320ccc538b Binary files a/addons/mass_mailing/static/src/img/blocks/block_title_sub.png and b/addons/mass_mailing/static/src/img/blocks/block_title_sub.png differ diff --git a/addons/mass_mailing/static/src/img/blocks/block_title_text.png b/addons/mass_mailing/static/src/img/blocks/block_title_text.png old mode 100644 new mode 100755 index 222975d2aba..399f13c2b94 Binary files a/addons/mass_mailing/static/src/img/blocks/block_title_text.png and b/addons/mass_mailing/static/src/img/blocks/block_title_text.png differ diff --git a/addons/mass_mailing/static/src/img/blocks/block_two_cols.png b/addons/mass_mailing/static/src/img/blocks/block_two_cols.png old mode 100644 new mode 100755 index 711e7b0b823..79e19de059d Binary files a/addons/mass_mailing/static/src/img/blocks/block_two_cols.png and b/addons/mass_mailing/static/src/img/blocks/block_two_cols.png differ diff --git a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_banner.jpg b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_banner.jpg new file mode 100755 index 00000000000..59e90bc0046 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_banner.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_event.jpg b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_event.jpg new file mode 100755 index 00000000000..2af23b4f136 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_event.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_image.jpg b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_image.jpg new file mode 100755 index 00000000000..f3003107735 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_image.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_image_text.jpg b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_image_text.jpg new file mode 100755 index 00000000000..85c6795bc0a Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_image_text.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_text_image.jpg b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_text_image.jpg new file mode 100755 index 00000000000..46ac685df6c Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_text_image.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_three_cols_1.jpg b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_three_cols_1.jpg new file mode 100755 index 00000000000..ba47973b427 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_three_cols_1.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_three_cols_2.jpg b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_three_cols_2.jpg new file mode 100755 index 00000000000..c1e48ec82ae Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_three_cols_2.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_three_cols_3.jpg b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_three_cols_3.jpg new file mode 100755 index 00000000000..adf7686eaa9 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_three_cols_3.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_two_cols_1.jpg b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_two_cols_1.jpg new file mode 100755 index 00000000000..2b76274d3df Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_two_cols_1.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_two_cols_2.jpg b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_two_cols_2.jpg new file mode 100755 index 00000000000..c3c644ceacc Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_block_two_cols_2.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_logo.png b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_logo.png new file mode 100755 index 00000000000..1396468359d Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_airmail/s_default_image_logo.png differ diff --git a/addons/mass_mailing/static/src/img/theme_default/demo/signature.png b/addons/mass_mailing/static/src/img/theme_default/demo/signature.png new file mode 100644 index 00000000000..36cb26425d5 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_default/demo/signature.png differ diff --git a/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_banner.jpg b/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_banner.jpg new file mode 100755 index 00000000000..e6a85a38b43 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_banner.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_event.jpg b/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_event.jpg new file mode 100755 index 00000000000..91fff96b8b4 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_event.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_image.jpg b/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_image.jpg new file mode 100755 index 00000000000..3ca5ebb5e6c Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_image.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_image_text.jpg b/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_image_text.jpg new file mode 100755 index 00000000000..87251f5f46a Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_image_text.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_text_image.jpg b/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_text_image.jpg new file mode 100755 index 00000000000..10f6102fd82 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_text_image.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_three_cols_1.jpg b/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_three_cols_1.jpg new file mode 100755 index 00000000000..fa939c89aae Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_three_cols_1.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_three_cols_2.jpg b/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_three_cols_2.jpg new file mode 100755 index 00000000000..35a8006b9c1 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_three_cols_2.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_three_cols_3.jpg b/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_three_cols_3.jpg new file mode 100755 index 00000000000..e33e667921c Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_three_cols_3.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_two_cols_1.jpg b/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_two_cols_1.jpg new file mode 100755 index 00000000000..9a55e53533b Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_two_cols_1.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_two_cols_2.jpg b/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_two_cols_2.jpg new file mode 100755 index 00000000000..38c77b3c178 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_default/s_default_image_block_two_cols_2.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_default/s_default_image_logo.png b/addons/mass_mailing/static/src/img/theme_default/s_default_image_logo.png new file mode 100755 index 00000000000..1f5169a218f Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_default/s_default_image_logo.png differ diff --git a/addons/mass_mailing/static/src/img/theme_imgs/airmail_template_thumb.png b/addons/mass_mailing/static/src/img/theme_imgs/airmail_template_thumb.png deleted file mode 100644 index ee91687680a..00000000000 Binary files a/addons/mass_mailing/static/src/img/theme_imgs/airmail_template_thumb.png and /dev/null differ diff --git a/addons/mass_mailing/static/src/img/theme_imgs/airmail_thumb_large.png b/addons/mass_mailing/static/src/img/theme_imgs/airmail_thumb_large.png new file mode 100755 index 00000000000..0546e634929 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_imgs/airmail_thumb_large.png differ diff --git a/addons/mass_mailing/static/src/img/theme_imgs/airmail_thumb_logo.png b/addons/mass_mailing/static/src/img/theme_imgs/airmail_thumb_logo.png new file mode 100755 index 00000000000..7101775ff34 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_imgs/airmail_thumb_logo.png differ diff --git a/addons/mass_mailing/static/src/img/theme_imgs/airmail_thumb_small.png b/addons/mass_mailing/static/src/img/theme_imgs/airmail_thumb_small.png new file mode 100755 index 00000000000..221540bf7f4 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_imgs/airmail_thumb_small.png differ diff --git a/addons/mass_mailing/static/src/img/theme_imgs/default_template_thumb.png b/addons/mass_mailing/static/src/img/theme_imgs/default_template_thumb.png deleted file mode 100644 index dd3f14ae536..00000000000 Binary files a/addons/mass_mailing/static/src/img/theme_imgs/default_template_thumb.png and /dev/null differ diff --git a/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_large.png b/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_large.png new file mode 100755 index 00000000000..d93ecd63550 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_large.png differ diff --git a/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_logo.png b/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_logo.png new file mode 100755 index 00000000000..157ab85588c Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_logo.png differ diff --git a/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_small.png b/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_small.png new file mode 100755 index 00000000000..5c85179781b Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_imgs/default_thumb_small.png differ diff --git a/addons/mass_mailing/static/src/img/theme_imgs/lemon_template_thumb.png b/addons/mass_mailing/static/src/img/theme_imgs/lemon_template_thumb.png deleted file mode 100644 index 5ee59475217..00000000000 Binary files a/addons/mass_mailing/static/src/img/theme_imgs/lemon_template_thumb.png and /dev/null differ diff --git a/addons/mass_mailing/static/src/img/theme_imgs/newsletter_thumb_large.png b/addons/mass_mailing/static/src/img/theme_imgs/newsletter_thumb_large.png new file mode 100755 index 00000000000..0b2c469aa9f Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_imgs/newsletter_thumb_large.png differ diff --git a/addons/mass_mailing/static/src/img/theme_imgs/newsletter_thumb_logo.png b/addons/mass_mailing/static/src/img/theme_imgs/newsletter_thumb_logo.png new file mode 100755 index 00000000000..60b3d2fcb9d Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_imgs/newsletter_thumb_logo.png differ diff --git a/addons/mass_mailing/static/src/img/theme_imgs/newsletter_thumb_small.png b/addons/mass_mailing/static/src/img/theme_imgs/newsletter_thumb_small.png new file mode 100755 index 00000000000..1cc74a20574 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_imgs/newsletter_thumb_small.png differ diff --git a/addons/mass_mailing/static/src/img/theme_imgs/resto_thumb_large.png b/addons/mass_mailing/static/src/img/theme_imgs/resto_thumb_large.png new file mode 100755 index 00000000000..4b5f3d01781 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_imgs/resto_thumb_large.png differ diff --git a/addons/mass_mailing/static/src/img/theme_imgs/resto_thumb_logo.png b/addons/mass_mailing/static/src/img/theme_imgs/resto_thumb_logo.png new file mode 100755 index 00000000000..9e45931bbdc Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_imgs/resto_thumb_logo.png differ diff --git a/addons/mass_mailing/static/src/img/theme_imgs/resto_thumb_small.png b/addons/mass_mailing/static/src/img/theme_imgs/resto_thumb_small.png new file mode 100755 index 00000000000..68c0f3495b2 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_imgs/resto_thumb_small.png differ diff --git a/addons/mass_mailing/static/src/img/theme_imgs/tech_template_thumb.png b/addons/mass_mailing/static/src/img/theme_imgs/tech_template_thumb.png deleted file mode 100644 index 33b40085d16..00000000000 Binary files a/addons/mass_mailing/static/src/img/theme_imgs/tech_template_thumb.png and /dev/null differ diff --git a/addons/mass_mailing/static/src/img/theme_imgs/tech_thumb_large.png b/addons/mass_mailing/static/src/img/theme_imgs/tech_thumb_large.png new file mode 100755 index 00000000000..dc992cd423e Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_imgs/tech_thumb_large.png differ diff --git a/addons/mass_mailing/static/src/img/theme_imgs/tech_thumb_logo.png b/addons/mass_mailing/static/src/img/theme_imgs/tech_thumb_logo.png new file mode 100755 index 00000000000..2bcf3a62349 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_imgs/tech_thumb_logo.png differ diff --git a/addons/mass_mailing/static/src/img/theme_imgs/tech_thumb_small.png b/addons/mass_mailing/static/src/img/theme_imgs/tech_thumb_small.png new file mode 100755 index 00000000000..0d189dd2299 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_imgs/tech_thumb_small.png differ diff --git a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_banner.jpg b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_banner.jpg new file mode 100755 index 00000000000..8f837a55b19 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_banner.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_event.jpg b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_event.jpg new file mode 100755 index 00000000000..0b11910b534 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_event.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_image.jpg b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_image.jpg new file mode 100755 index 00000000000..09f4e2f5e8d Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_image.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_image_text.jpg b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_image_text.jpg new file mode 100755 index 00000000000..cbee8e6dcc0 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_image_text.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_text_image.jpg b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_text_image.jpg new file mode 100755 index 00000000000..32a2c86d1bd Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_text_image.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_three_cols_1.jpg b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_three_cols_1.jpg new file mode 100755 index 00000000000..2d2c7a07cf5 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_three_cols_1.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_three_cols_2.jpg b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_three_cols_2.jpg new file mode 100755 index 00000000000..264ff911794 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_three_cols_2.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_three_cols_3.jpg b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_three_cols_3.jpg new file mode 100755 index 00000000000..6ce7085e354 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_three_cols_3.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_two_cols_1.jpg b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_two_cols_1.jpg new file mode 100755 index 00000000000..a8b2283e08f Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_two_cols_1.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_two_cols_2.jpg b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_two_cols_2.jpg new file mode 100755 index 00000000000..461f62d25f2 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_block_two_cols_2.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_logo.png b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_logo.png new file mode 100644 index 00000000000..064f09c1a0a Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_newsletter/s_default_image_logo.png differ diff --git a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_banner.jpg b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_banner.jpg new file mode 100755 index 00000000000..ff792179ae0 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_banner.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_event.jpg b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_event.jpg new file mode 100755 index 00000000000..f6e5b5e5a0d Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_event.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_image.jpg b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_image.jpg new file mode 100755 index 00000000000..3baa1c2c054 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_image.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_image_text.jpg b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_image_text.jpg new file mode 100755 index 00000000000..12202654a54 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_image_text.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_text_image.jpg b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_text_image.jpg new file mode 100755 index 00000000000..da0628f3e7e Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_text_image.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_three_cols_1.jpg b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_three_cols_1.jpg new file mode 100755 index 00000000000..04865427530 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_three_cols_1.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_three_cols_2.jpg b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_three_cols_2.jpg new file mode 100755 index 00000000000..98f3e5dd916 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_three_cols_2.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_three_cols_3.jpg b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_three_cols_3.jpg new file mode 100755 index 00000000000..1d0ca076cd0 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_three_cols_3.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_two_cols_1.jpg b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_two_cols_1.jpg new file mode 100755 index 00000000000..de516297c59 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_two_cols_1.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_two_cols_2.jpg b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_two_cols_2.jpg new file mode 100755 index 00000000000..1f00cfad6c3 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_block_two_cols_2.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_resto/s_default_image_logo.png b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_logo.png new file mode 100755 index 00000000000..6aab7fc27e2 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_resto/s_default_image_logo.png differ diff --git a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_banner.jpg b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_banner.jpg new file mode 100755 index 00000000000..0c571542311 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_banner.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_event.jpg b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_event.jpg new file mode 100644 index 00000000000..65eafe14ac6 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_event.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_image.jpg b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_image.jpg new file mode 100755 index 00000000000..729547cb164 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_image.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_image_text.jpg b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_image_text.jpg new file mode 100755 index 00000000000..4dc41edd353 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_image_text.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_text_image.jpg b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_text_image.jpg new file mode 100755 index 00000000000..3c86e53e822 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_text_image.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_three_cols_1.jpg b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_three_cols_1.jpg new file mode 100755 index 00000000000..5f49e2a8f0d Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_three_cols_1.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_three_cols_2.jpg b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_three_cols_2.jpg new file mode 100755 index 00000000000..adfa8c9f5e4 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_three_cols_2.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_three_cols_3.jpg b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_three_cols_3.jpg new file mode 100755 index 00000000000..8bfd0a93a2d Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_three_cols_3.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_two_cols_1.jpg b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_two_cols_1.jpg new file mode 100755 index 00000000000..eaf6bc21d50 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_two_cols_1.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_two_cols_2.jpg b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_two_cols_2.jpg new file mode 100755 index 00000000000..fbaa3d3ee81 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_block_two_cols_2.jpg differ diff --git a/addons/mass_mailing/static/src/img/theme_tech/s_default_image_logo.png b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_logo.png new file mode 100644 index 00000000000..53b2f37da96 Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_tech/s_default_image_logo.png differ diff --git a/addons/mass_mailing/static/src/js/mass_mailing_editor.js b/addons/mass_mailing/static/src/js/mass_mailing_editor.js index 23e8a84f155..286afee5e45 100644 --- a/addons/mass_mailing/static/src/js/mass_mailing_editor.js +++ b/addons/mass_mailing/static/src/js/mass_mailing_editor.js @@ -8,8 +8,6 @@ var web_editor = require('web_editor.editor'); var options = require('web_editor.snippets.options'); var snippets_editor = require('web_editor.snippet.editor'); -var _t = core._t; - var $editable_area = $("#editable_area"); if ($editable_area.length === 0 || !$editable_area.is(".o_mail_area")) { return; @@ -31,7 +29,7 @@ options.registry["width-x"] = options.Class.extend({ this.$overlay.find(".oe_handle.e, .oe_handle.w").removeClass("readonly"); if (this.$target.is('img')) { this.$overlay.find(".oe_handle.w").addClass("readonly"); - this.$overlay.find(".oe_snippet_remove, .oe_snippet_move, .oe_snippet_clone").addClass("hidden"); + this.$overlay.find(".oe_snippet_move, .oe_snippet_clone").addClass("hidden"); this.is_image=true; } @@ -145,54 +143,184 @@ snippets_editor.Class.include({ return url; }, compute_snippet_templates: function (html) { + var self = this; var ret = this._super.apply(this, arguments); - var $themes = this.$("#email_designer_themes").children().addClass("oe_snippet_body"); + var $themes = this.$("#email_designer_themes").children(); if ($themes.length === 0) return ret; + /** + * Initialize theme parameters. + */ var all_classes = ""; - var $dropdown = $(core.qweb.render("mass_mailing.theme_selector", { - themes: _.map($themes, function (theme) { - var $theme = $(theme); - var classname = $theme.data("class"); - all_classes += " " + classname; - return { - className: classname, - imgSource: $theme.data("img"), - }; - }), - })); + var themes_params = _.map($themes, function (theme) { + var $theme = $(theme); + var name = $theme.data("name"); + var classname = "o_" + name + "_theme"; + all_classes += " " + classname; + var images_info = _.defaults($theme.data("imagesInfo") || {}, {all: {}}); + _.each(images_info, function (info) { + info = _.defaults(info, {module: "mass_mailing", format: "jpg"}); + }); + return { + name: name, + className: classname || "", + img: $theme.data("img") || "", + template: $theme.html().trim(), + get_image_info: function (filename) { + if (images_info[filename]) { + return images_info[filename]; + } + return images_info.all; + } + }; + }); + $themes.parent().remove(); var $body = $(document.body); - $dropdown.on("mouseenter click", "li > a", function (e) { + var $snippets = this.$(".oe_snippet"); + + /** + * Create theme selection screen and check if it must be forced opened. + * Reforce it opened if the last snippet is removed. + */ + var $dropdown = $(core.qweb.render("mass_mailing.theme_selector", { + themes: themes_params + })); + var first_choice; + check_if_must_force_theme_choice(); + + /** + * Switch theme when a theme button is hovered. Confirm change if the theme button + * is pressed. + */ + var selected_theme = false; + $dropdown.on("mouseenter", "li > a", function (e) { + if (first_choice) return; e.preventDefault(); - var classname = $(e.currentTarget).data("class"); - $body.removeClass(all_classes).addClass(classname); + var theme_params = themes_params[$(e.currentTarget).parent().index()]; + switch_theme(theme_params); + }); + $dropdown.on("click", "li > a", function (e) { + e.preventDefault(); + var theme_params = themes_params[$(e.currentTarget).parent().index()]; + if (first_choice) { + switch_theme(theme_params); + $body.removeClass("o_force_mail_theme_choice"); + first_choice = false; + } else { + switch_images(theme_params, $snippets); + } + selected_theme = theme_params; + + // Notify form view + window.top.odoo[window.callback+"_downup"]($editable_area.addClass("o_dirty").html()); + }); + + /** + * If the user opens the theme selection screen, indicates which one is active and + * saves the information... + * ... then when the user closes check if the user confirmed its choice and restore + * previous state if this is not the case. + */ + $dropdown.on("shown.bs.dropdown", function () { + check_selected_theme(); + $dropdown.find("li").removeClass("selected").filter(function () { + return ($(this).has(".o_thumb[style=\""+ "background-image: url(" + (selected_theme && selected_theme.img) + "_small.png)"+ "\"]").length > 0); + }).addClass("selected"); + }); + $dropdown.on("hidden.bs.dropdown", function () { + switch_theme(selected_theme); + }); + + /** + * On page load, check the selected theme and force switching to it (body needs the + * theme style for its edition toolbar). + */ + check_selected_theme(); + $body.addClass(selected_theme.className); + + $dropdown.insertAfter(this.$el.find("#snippets_menu")); + + return ret; + + function check_if_must_force_theme_choice() { + first_choice = editable_area_is_empty(); + $body.toggleClass("o_force_mail_theme_choice", first_choice); + } + + function editable_area_is_empty($layout) { + $layout = $layout || $editable_area.find(".o_layout"); + var $mail_wrapper = $layout.children(".o_mail_wrapper"); + return ( + $editable_area.html().trim() === "" + || ($layout.length > 0 && ($layout.html().trim() === "" || $mail_wrapper.length > 0 && $mail_wrapper.html().trim() === "")) + ); + } + + function check_selected_theme() { var $layout = $editable_area.find(".o_layout"); + if ($layout.length === 0) { + selected_theme = false; + } else { + _.each(themes_params, function (theme_params) { + if ($layout.hasClass(theme_params.className)) { + selected_theme = theme_params; + } + }); + } + } + + function switch_images(theme_params, $container) { + $container.find("img").each(function () { + var $img = $(this); + var src = $img.attr("src"); + + var m = src.match(/^\/web\/image\/\w+\.s_default_image_(?:theme_[a-z]+_)?(.+)$/); + if (!m) { + m = src.match(/^\/\w+\/static\/src\/img\/(?:theme_[a-z]+\/)?s_default_image_(.+)\.[a-z]+$/); + } + if (!m) return; + + var file = m[1]; + var img_info = theme_params.get_image_info(file); + + if (img_info.format) { + src = "/" + img_info.module + "/static/src/img/theme_" + theme_params.name + "/s_default_image_" + file + "." + img_info.format; + } else { + src = "/web/image/" + img_info.module + ".s_default_image_theme_" + theme_params.name + "_" + file; + } + + $img.attr("src", src); + }); + } + + function switch_theme(theme_params) { + if (!theme_params || switch_theme.last === theme_params) return; + switch_theme.last = theme_params; + + $body.removeClass(all_classes).addClass(theme_params.className); + switch_images(theme_params, $editable_area); + + var $old_layout = $editable_area.find(".o_layout"); + var $new_wrapper = $("
", {"class": "o_mail_wrapper oe_structure"}); + var $new_layout = $("
", {"class": "o_layout " + theme_params.className}).append($new_wrapper); + var $contents; - if ($layout.length) { - $contents = ($layout.hasClass("oe_structure") ? $layout : $layout.find(".oe_structure").first()).contents(); + if (first_choice) { + $contents = theme_params.template; + } else if ($old_layout.length) { + $contents = ($old_layout.hasClass("oe_structure") ? $old_layout : $old_layout.find(".oe_structure").first()).contents(); } else { $contents = $editable_area.contents(); } - var $div = $("
", {"class": "o_layout oe_structure " + classname}); - $editable_area.append($div); - $div.append($contents); - $layout.remove(); - }); - var $snippets_menu = this.$el.find("#snippets_menu"); - var old_title = $snippets_menu.text(); - $dropdown.on("shown.bs.dropdown", function () { - $snippets_menu.text(_t("Choose a Theme")); - }); - $dropdown.on("hidden.bs.dropdown", function () { - $snippets_menu.text(old_title); - }); + $editable_area.empty().append($new_layout); + $new_wrapper.append($contents); + $old_layout.remove(); - $dropdown.insertAfter($snippets_menu); - - return ret; + self.show_blocks(); + } }, }); @@ -217,7 +345,6 @@ window.top.odoo[window["callback"]+"_updown"] = function (value, fields_values, } if (value.indexOf('on_change_model_and_list') === -1) { - $editable.html(value); if (editor_enable) { diff --git a/addons/mass_mailing/static/src/less/mass_mailing.ui.less b/addons/mass_mailing/static/src/less/mass_mailing.ui.less index 9b72a72adc7..fd16ddb4ca2 100644 --- a/addons/mass_mailing/static/src/less/mass_mailing.ui.less +++ b/addons/mass_mailing/static/src/less/mass_mailing.ui.less @@ -1,6 +1,24 @@ .o_mail_theme_selector { > a { - .o-position-absolute(6px, 6px); + .o-position-absolute(0, 0, auto, 0); + height: 34px; + line-height: 31px; + border-radius: 0; + background-color: @o-we-color-darker; + color: @o-we-color-text-normal; + + &:hover, &:focus, &:active { + color: @o-we-color-text-light; + } + + i { + margin-right: 10px; + } + } + + &.open > a { + color: white; + background-color: @o-we-color-dark; } .dropdown-menu { @@ -10,8 +28,96 @@ overflow: auto; background-color: @o-we-color-dark; - > li:hover > a { - background-color: @o-we-color-darker; + > li { + margin: 0; + + > a { + padding: 10px 10px; + + .o_thumb { + display: none; + background-size: cover; + padding-top: 50%; + border: 1px solid @o-we-color-light; + border-top: 1px solid @o-we-color-text-normal; + + &.logo { + display: block; + } + } + } + + &:hover > a { + background-color: @o-we-color-darker; + + .o_thumb { + border: 1px solid white; + } + } + + &.selected > a .o_thumb { + border: 2px solid @odoo-brand-primary; + background-color: @o-we-color-dark; + } + } + } +} + +body.o_force_mail_theme_choice { + #oe_snippets { + width: 100%; + + .o_mail_theme_selector { + .dropdown-toggle { + display: none; + } + + .dropdown-menu { + display: block; + + > li { + margin: 0; + float: left; + width: 100%; + max-width: 25%; + + > a { + .o-transition(all, 0.3s, ease); + + .o_thumb { + display: none; + padding-top: 107%; + border: 1px solid @o-we-color-light; + border-top: 1px solid @o-we-color-text-normal; + box-shadow: 0 5px 10px fade(black, 80%); + will-change: transform; + .backface-visibility(hidden); + .o-transition(all, 0.3s); + + &.small { + display: block; + } + + @media screen and (min-width: 900px) { + &.small { + display: none; + } + &.large { + display: block; + } + } + } + } + + &:hover > a { + background-color: @o-we-color-dark; + + .o_thumb { + box-shadow: 0 5px 30px 1px fade(black, 60%); + } + } + } + } } } } diff --git a/addons/mass_mailing/static/src/less/themes/theme_airmail.less b/addons/mass_mailing/static/src/less/themes/theme_airmail.less new file mode 100644 index 00000000000..513f3dc57c2 --- /dev/null +++ b/addons/mass_mailing/static/src/less/themes/theme_airmail.less @@ -0,0 +1,206 @@ +// lessc@1.4.2 + +// ============================ +// Mass Mailing "Theme Airmail" +// ============================ + +@o_mm_airmail_color_alpha: #EAECED; +@o_mm_airmail_color_beta: white; +@o_mm_airmail_color_gamma: #FB3C6B; +@o_mm_airmail_color_delta: darken(@o_mm_airmail_color_gamma, 5%); +@o_mm_airmail_color_epsilon: black; +@o_mm_airmail_color_zeta: #a17e92; + +.o_airmail_theme { + // ===== Colors ===== + .bg-beta { + background-color: @o_mm_airmail_color_gamma; + + .btn.btn-primary { + color: @o_mm_airmail_color_beta; + background-color: @o_mm_airmail_color_zeta; + } + + h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { + color: @o_mm_airmail_color_beta; + } + } + .text-beta { + color: @o_mm_airmail_color_gamma; + } + .bg-delta { + background-color: @o_mm_airmail_color_zeta; + } + + // ===== Layout ===== + &.o_layout { + background-color: @o_mm_airmail_color_alpha; + + > .o_mail_wrapper { + background: rgba(0, 0, 0, 0); + background: transparent; + border: none; + + > * { + margin-bottom: 16px; + } + } + } + + // ===== Snippets (general) ===== + .o_mail_snippet_general { + background-color: @o_mm_airmail_color_beta; + color: @o_mm_airmail_color_epsilon; + + .btn.btn-primary { + color: @o_mm_airmail_color_beta; + background-color: @o_mm_airmail_color_gamma; + } + + a, .o_mail_link { + color: @o_mm_airmail_color_delta; + } + } + + // ===== Snippets (specific) ===== + .o_mail_block_header_social, .o_mail_block_header_text_social, .o_mail_block_header_logo { + margin-bottom: 0; + + .o_mail_snippet_general { + background: rgba(0,0,0,0); + background: transparent; + } + + .o_mail_h_padding { + padding-left: 0; + padding-right: 0; + } + + .o_mail_header_social { + margin-right: 0px; + a { + color: darken(@o_mm_airmail_color_alpha, 40%); + } + } + } + + .o_mail_block_event { + margin-left: 0; + margin-right: 0; + } + + .o_mail_block_footer_separator { + margin-left: 0; + margin-right: 0; + } + + .o_mail_block_image { + .o_mail_h_padding { + padding: 0; + .o_mail_col_mv { + padding-left: 20px; + padding-right: 20px; + } + > img { + padding: 0; + margin-bottom: 15px; + } + } + } + + .o_mail_block_footer_separator { + .o_mail_snippet_general { + background: rgba(0,0,0,0); + background: transparent; + + .separator { + height: 3px; + background-color: darken(@o_mm_airmail_color_alpha, 10%); + border-bottom: 2px solid darken(white, 3%); + } + } + } + + .o_mail_block_two_cols, .o_mail_block_three_cols { + @tmp-gap: 10px; + + table { + width: 110%; + max-width: (600+(@tmp-gap*2)); + margin: auto (@tmp-gap*-1); + } + .o_mail_snippet_general { + background: rgba(0,0,0,0); + background: transparent; + } + .o_mail_col_container { + padding: 0 0 (@tmp-gap*2); + margin: 0 @tmp-gap; + border-top: 1px solid darken(@o_mm_airmail_color_beta, 10%); + border-bottom: 1px solid darken(@o_mm_airmail_color_alpha, 5%); + background-color: @o_mm_airmail_color_beta; + + > * { + padding: 0 (@tmp-gap*2); + } + + img { + padding: 0!important; + } + } + } + + .o_mail_block_footer_tag_line { + table.o_mail_h_padding { + padding-left: 0; + padding-right: 0; + } + } + + .o_mail_block_image_text { + .o_mail_img_container { + padding: 0 + } + } + + .o_mail_block_text_image { + .o_mail_img_container { + padding: 0 + } + } + + .o_mail_block_footer_social { + .o_mail_snippet_general { + background: rgba(0,0,0,0); + background: transparent; + margin-top: 30px; + border-top: 1px solid darken(@o_mm_airmail_color_alpha, 10%); + } + + .o_mail_footer_social { + border: none; + a { + color: darken(@o_mm_airmail_color_alpha, 40%); + } + } + + .o_mail_footer_links a { + color: darken(@o_mm_airmail_color_alpha, 40%); + } + + .o_mail_footer_copy { + font-weight: bold; + font-size: 9px; + color: darken(@o_mm_airmail_color_alpha, 30%); + } + + &.o_mail_footer_social_left { + .o_mail_footer_description { + padding-left: 0; + } + .o_mail_footer_social { + padding-right: 0; + } + } + } +} diff --git a/addons/mass_mailing/static/src/less/themes/theme_default.less b/addons/mass_mailing/static/src/less/themes/theme_default.less new file mode 100644 index 00000000000..80a8e523d48 --- /dev/null +++ b/addons/mass_mailing/static/src/less/themes/theme_default.less @@ -0,0 +1,296 @@ +// lessc@1.4.2 + +// ============================ +// Mass Mailing "Theme Default" +// ============================ + +// ===== Default Theme palette ===== +@o_mm_def_color_alpha: #f5f5f5; +@o_mm_def_color_beta: #ffffff; +@o_mm_def_color_gamma: #706482; +@o_mm_def_color_delta: #464646; +@o_mm_def_color_epsilon: darken(@o_mm_def_color_gamma, 5%); +@o_mm_def_color_zeta: #706482; +@o_mm_def_color_eta: #87a6b5; + +// ===== Default Theme variables ===== +@o_mm_def_body_width : 600px; +@o_mm_def_body_bobile : 480px; +@o_mm_def_b_radius : 2px; + +@o_mm_def_font : -apple-system, "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif; +@o_mm_def_text_color : @o_mm_def_color_delta; + +@o_mm_def_btn_bg : @o_mm_def_color_gamma; +@o_mm_def_btn_text : @o_mm_def_color_beta; + +// ===== Editor ===== +#web_editor_inside_iframe { + #wrapwrap > main #editable_area { + background-color: transparent; + } +} + +// ===== Colors ===== +.bg-beta { + background-color: @o_mm_def_color_zeta; + color: @o_mm_def_color_beta; + + h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { + color: @o_mm_def_color_beta; + } +} +.text-beta { + color: @o_mm_def_color_zeta; +} +.bg-delta { + background-color: @o_mm_def_color_eta; +} +.bg-gray-lighter { + background-color: @o_mm_def_color_alpha; +} + + +// ===== Layout ===== +.o_layout { + font-family: @o_mm_def_font; + color: lighten(@o_mm_def_text_color, 20%); + overflow: hidden; + width: 100%; + min-height: 100%; + background-color: @o_mm_def_color_alpha; + padding: 24px; + + > .o_mail_wrapper { + width: 100%; + max-width: @o_mm_def_body_width; + margin: auto; + border: 1px solid darken(@o_mm_def_color_alpha, 2%); + background-color: @o_mm_def_color_beta; + } +} + +// ===== Snippets (general) ===== +.o_mail_snippet_general { + width: 100%; + max-width: @o_mm_def_body_width; + margin: 0 auto; + + h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { + color: @o_mm_def_text_color; + } + + .btn.btn-primary { + -webkit-user-select: none; + color: @o_mm_def_btn_text; + border: none; + text-decoration: none; + font-weight: normal; + font-family: @o_mm_def_font; + cursor: pointer; + border-radius: @o_mm_def_b_radius; + background-color: @o_mm_def_btn_bg; + } + + a, .btn.btn-link { + color: @o_mm_def_color_epsilon; + font-weight: bold; + text-decoration: none !important; + + &:hover, &:focus, &:active { + text-decoration: none !important; + } + } + + img { + width: 100%; + max-width: 100%; + height: auto; + } + + .separator { + height: 2px; + background-color: @o_mm_def_color_alpha; + } +} + +// ===== Snippets (specific) ===== +.o_mail_block_header_social, .o_mail_block_header_text_social, .o_mail_block_header_logo { + .o_mail_logo_container { + img { + width: auto; + } + } + .o_mail_header_social { + margin-right: 20px; + } +} + +.o_mail_block_header_text_social { + h3 { + font-weight: bold; + } +} + +.o_mail_block_steps { + background-color: @o_mm_def_color_alpha; +} + +.o_mail_block_two_cols, .o_mail_block_three_cols { + font-size: small; + + .o_mail_col_container { + padding: 10px 20px; + + h4 { + margin-top: 15px; + } + } +} + +.o_mail_block_image_text, .o_mail_block_text_image { + font-size: small; +} + +.o_mail_block_event { + margin-left: 20px; + margin-right: 20px; + .o_mail_snippet_general{ + background: darken(@o_mm_def_color_alpha, 2%); + } +} + +.o_mail_block_footer_separator { + margin-left: 20px; + margin-right: 20px; +} + +.o_mail_block_comparison_table { + .separator { + height: 1px; + background-color: darken(@o_mm_def_color_alpha, 15%); + } +} + +.o_mail_block_discount2 { + .o_code { + padding: 5px 10px; + background: @o_mm_def_color_alpha; + border-radius: 3px; + font-family: monospace; + } +} + +.o_mail_block_footer_social { + .o_mail_table_styles { + border-top: 2px solid @o_mm_def_color_alpha; + padding-top: 20px; + } + + .o_mail_footer_links { + padding-top: 10px; + padding-bottom: 10px; + + .btn-link{ + padding: 0; + font-size: 12px; + } + } + + .o_mail_footer_copy { + font-size: 9px; + font-weight: bold; + color: lighten(@o_mm_def_text_color, 30%); + } + + &.o_mail_footer_social_center { + .o_mail_footer_social, .o_mail_footer_links, .o_mail_footer_copy { + text-align: center; + } + } + + &.o_mail_footer_social_left { + .o_mail_footer_description { + padding-left: 20px; + } + .o_mail_footer_social { + padding-right: 20px; + text-align: right; + vertical-align: top; + + .btn-link{ + padding: 0; + font-size: 12px; + } + } + } +} + +.o_mail_display_coupon { + font-size: 50px; + line-height: 1; +} + +// ===== Misc ===== +.o_mail_h_padding { + padding-left: 20px; + padding-right: 20px; +} +.o_mail_v_padding { + padding-top: 20px; + padding-bottom: 20px; +} +.o_mail_no_margin { + margin: 0; + + &.o_mail_display_coupon { + line-height: 1.1; + } +} +.o_mail_table_styles { + width: 100%; + border-collapse:separate; +} + +// ===== Mobile ===== +@media screen and (max-width: @o_mm_def_body_bobile) { + .o_mail_col_mv { + display: block!important; + max-width: @o_mm_def_body_bobile!important; + width: 100%!important; + } + + .o_mail_table_styles { + max-width: @o_mm_def_body_bobile!important; + width: 100%!important; + } +} + +// ===== Margins on td (replaced by paddings) ===== +.o-paddings-all(@factor: 1) { + .o-paddings(128, @factor); + .o-paddings(96, @factor); + .o-paddings(92, @factor); + .o-paddings(64, @factor); + .o-paddings(48, @factor); + .o-paddings(32, @factor); + .o-paddings(24, @factor); + .o-paddings(16, @factor); + .o-paddings(8, @factor); + .o-paddings(4, @factor); + .o-paddings(0, @factor); +} +.o-paddings(@name, @factor: 1) { + .o-paddings-define(@name, @factor * @name); +} +.o-paddings-define(@name, @size: @name) { + td.mt@{name} { + margin-top: auto!important; + padding-top: ~"@{size}px"!important; + } + td.mb@{name} { + margin-bottom: auto!important; + padding-bottom: ~"@{size}px"!important; + } +} +.o-paddings-all(); diff --git a/addons/mass_mailing/static/src/less/themes/theme_newsletter.less b/addons/mass_mailing/static/src/less/themes/theme_newsletter.less new file mode 100644 index 00000000000..317116d970c --- /dev/null +++ b/addons/mass_mailing/static/src/less/themes/theme_newsletter.less @@ -0,0 +1,38 @@ +// lessc@1.4.2 + +// =============================== +// Mass Mailing "Theme Newsletter" +// =============================== + +@o_mm_news_color_alpha: #f5f5f5; +@o_mm_news_color_beta: #ffffff; +@o_mm_news_color_gamma: #1cc1a9; +@o_mm_news_color_delta: #464646; +@o_mm_news_color_epsilon: darken(@o_mm_news_color_gamma, 5%); +@o_mm_news_color_zeta: #906784; +@o_mm_news_color_eta: #87a6b5; + +.o_newsletter_theme { + // ===== Colors ===== + .bg-beta { + background-color: @o_mm_news_color_zeta; + color: @o_mm_news_color_beta; + } + .text-beta { + color: @o_mm_news_color_zeta; + } + .bg-delta { + background-color: @o_mm_news_color_eta; + } + + // ===== Snippets (general) ===== + .o_mail_snippet_general { + .btn.btn-primary { + color: @o_mm_news_color_beta; + background-color: @o_mm_news_color_gamma; + } + a, .btn.btn-link { + color: @o_mm_news_color_epsilon; + } + } +} diff --git a/addons/mass_mailing/static/src/less/themes/theme_resto.less b/addons/mass_mailing/static/src/less/themes/theme_resto.less new file mode 100644 index 00000000000..591850a4e3b --- /dev/null +++ b/addons/mass_mailing/static/src/less/themes/theme_resto.less @@ -0,0 +1,115 @@ +// lessc@1.4.2 + +// ========================== +// Mass Mailing "Theme Resto" +// ========================== + +@o_mm_resto_color_alpha: #f0ede0; +@o_mm_resto_color_beta: #ffffff; +@o_mm_resto_color_gamma: #E96D1F; +@o_mm_resto_color_delta: #712b22; +@o_mm_resto_color_epsilon: darken(@o_mm_resto_color_gamma, 5%); +@o_mm_resto_color_zeta: #795745; + +.o_resto_theme { + // ===== Editor ===== + &#web_editor_inside_iframe { + background-color: @o_mm_resto_color_alpha; + } + + // ===== Colors ===== + .bg-beta { + background-color: @o_mm_resto_color_zeta; + color: @o_mm_resto_color_beta; + + h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { + color: @o_mm_resto_color_beta; + } + } + .text-beta { + color: @o_mm_resto_color_zeta; + } + .bg-delta { + background-color: @o_mm_resto_color_gamma; + color: @o_mm_resto_color_beta; + + h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { + color: @o_mm_resto_color_beta; + } + } + .text-delta { + color: @o_mm_resto_color_epsilon; + } + + // ===== Layout ===== + &.o_layout { + background-color: @o_mm_resto_color_alpha; + + > .o_mail_wrapper { + border: none; + background-color:transparent; + } + } + + // ===== Snippets (general) ===== + .o_mail_snippet_general { + background: rgba(0,0,0,0); + background: transparent; + color: @o_mm_resto_color_delta; + + .btn.btn-primary { + color: @o_mm_resto_color_beta; + background-color: @o_mm_resto_color_gamma; + } + + a, .o_mail_link { + font-weight: normal; + color: @o_mm_resto_color_epsilon; + } + + .separator { + background-color: lighten(@o_mm_resto_color_zeta, 20%); + } + } + + h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { + color: darken(@o_mm_resto_color_zeta, 10%); + font-weight: bold; + } + + // ===== Snippets (specific) ===== + .o_mail_block_header_social, .o_mail_block_header_text_social, .o_mail_block_header_logo { + .o_mail_snippet_general { + border-bottom: 5px solid @o_mm_resto_color_gamma; + } + + .o_mail_header_social { + a { + color: @o_mm_resto_color_gamma; + } + } + } + + .o_mail_block_steps { + border-top: 2px solid @o_mm_resto_color_gamma; + background: @o_mm_resto_color_beta; + } + + .o_mail_block_event { + .o_mail_snippet_general{ + background: darken(@o_mm_resto_color_beta, 2%); + } + } + + .o_mail_block_header_social, .o_mail_block_header_text_social, .o_mail_block_header_logo, .o_mail_block_steps, .o_mail_block_event, .o_mail_block_banner { + margin-left: 20px; + margin-right: 20px; + } + + .o_mail_block_footer_social { + .o_mail_table_styles { + border-top: 2px solid lighten(@o_mm_resto_color_zeta, 20%); + padding-top: 20px; + } + } +} diff --git a/addons/mass_mailing/static/src/less/themes/theme_tech.less b/addons/mass_mailing/static/src/less/themes/theme_tech.less new file mode 100644 index 00000000000..7b7a91ae475 --- /dev/null +++ b/addons/mass_mailing/static/src/less/themes/theme_tech.less @@ -0,0 +1,165 @@ +// lessc@1.4.2 + +// ========================= +// Mass Mailing "Theme Tech" +// ========================= + +@o_mm_tech_color_alpha: #333; +@o_mm_tech_color_beta: white; +@o_mm_tech_color_gamma: #59cdcd; +@o_mm_tech_color_delta: #bdbdbd; +@o_mm_tech_color_epsilon: black; +@o_mm_tech_color_zeta: #a17e92; + +.o_tech_theme { + // ===== Colors ===== + .bg-beta { + background-color: @o_mm_tech_color_gamma; + + .btn.btn-primary { + color: @o_mm_tech_color_beta; + background-color: @o_mm_tech_color_zeta; + } + } + .text-beta { + color: @o_mm_tech_color_gamma; + } + .bg-delta { + background-color: @o_mm_tech_color_zeta; + } + + // ===== Layout ===== + &.o_layout { + background-color: @o_mm_tech_color_alpha; + + > .o_mail_wrapper { + background-color: transparent; + color: @o_mm_tech_color_delta; + border: none; + } + } + + // ===== Snippets (general) ===== + .o_mail_snippet_general { + .btn.btn-primary { + color: @o_mm_tech_color_beta; + background-color: @o_mm_tech_color_gamma; + } + + .o_mail_full_width_padding { + padding-left: 20px; + padding-right: 20px; + } + + a, .o_mail_link { + font-weight: normal; + color: @o_mm_tech_color_gamma; + } + + h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { + color: darken(@o_mm_tech_color_beta, 10%); + } + } + + // ===== Snippets (specific) ===== + .o_mail_block_header_social, .o_mail_block_header_text_social, .o_mail_block_header_logo { + .o_mail_snippet_general { + margin-top: 10px; + margin-bottom: 25px; + padding-left: 20px; + padding-right: 20px; + + > table { + max-width: 560px; + border-bottom: 1px solid darken(@o_mm_tech_color_beta, 60%); + } + } + + .o_mail_h_padding.o_mail_v_padding { + padding: 10px 0 5px; + } + + .o_mail_header_social { + margin-right: 0px; + a { + color: darken(@o_mm_tech_color_beta, 40%); + } + } + } + + .o_mail_block_footer_separator { + .separator { + height: 1px; + background-color: darken(@o_mm_tech_color_beta, 60%); + } + } + + .o_mail_block_event { + margin-left: 20px; + margin-right: 20px; + + h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { + color: @o_mm_tech_color_alpha; + } + } + + .o_mail_block_discount2 { + .o_code { + color: @o_mm_tech_color_alpha; + } + } + + .o_mail_block_footer_separator { + margin-left: 0; + margin-right: 0; + } + + .o_mail_block_steps { + background-color: transparent; + + h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { + color: @o_mm_tech_color_alpha; + } + + .o_mail_full_width_padding > tbody > tr { + background-color: @o_mm_tech_color_beta; + color: @o_mm_tech_color_alpha; + } + } + + .o_mail_block_footer_social { + .o_mail_snippet_general { + background: rgba(0,0,0,0); + background: transparent; + } + + .o_mail_table_styles { + border-top: none; + } + + .o_mail_footer_social { + a { + color: darken(@o_mm_tech_color_beta, 40%); + } + } + + .o_mail_footer_links a { + color: darken(@o_mm_tech_color_beta, 40%); + } + + .o_mail_footer_copy { + font-weight: bold; + font-size: 9px; + color: darken(@o_mm_tech_color_beta, 30%); + } + + &.o_mail_footer_social_left { + .o_mail_footer_description { + padding-left: 0; + } + .o_mail_footer_social { + padding-right: 0; + } + } + } +} diff --git a/addons/mass_mailing/static/src/xml/mass_mailing.xml b/addons/mass_mailing/static/src/xml/mass_mailing.xml index e82f4dbf88e..1d41f2a3b74 100644 --- a/addons/mass_mailing/static/src/xml/mass_mailing.xml +++ b/addons/mass_mailing/static/src/xml/mass_mailing.xml @@ -1,17 +1,17 @@ - -
- - - -
-
  • - - - -
    • -
    +
    + + Change Style + +
    +
  • + +
    +
    +
    • - +
    diff --git a/addons/mass_mailing/views/editor_field_html.xml b/addons/mass_mailing/views/editor_field_html.xml index c93cee8d353..175e557a733 100644 --- a/addons/mass_mailing/views/editor_field_html.xml +++ b/addons/mass_mailing/views/editor_field_html.xml @@ -1,26 +1,33 @@ -