diff --git a/addons/mass_mailing/__manifest__.py b/addons/mass_mailing/__manifest__.py
index b2baefeeed797f55af0d225ea8be9305ae78e8a4..3adda9bc43465c3e91a920ab484415c2b5b0693b 100644
--- a/addons/mass_mailing/__manifest__.py
+++ b/addons/mass_mailing/__manifest__.py
@@ -36,7 +36,6 @@ professional emails and reuse templates in a few clicks.
'views/editor_field_html.xml',
'views/snippets_themes.xml',
'views/snippets_themes_options.xml',
- 'views/theme_list.xml',
],
'demo': [
'data/mass_mailing_demo.xml',
diff --git a/addons/mass_mailing/static/src/css/mass_mailing_editor_thumb.css b/addons/mass_mailing/static/src/css/mass_mailing_editor_thumb.css
deleted file mode 100644
index f3e6a40454fc7decd6c6b83f985ded76944efab1..0000000000000000000000000000000000000000
--- a/addons/mass_mailing/static/src/css/mass_mailing_editor_thumb.css
+++ /dev/null
@@ -1,85 +0,0 @@
-/* ---- thumbnail ---- */
-.oe_snippet.o_mail_block_header_center_logo .oe_snippet_thumbnail_img {
- background-image: url("/mass_mailing/static/src/img/blocks/block_header_center_logo.png");
-}
-.oe_snippet.o_mail_block_header_center_text .oe_snippet_thumbnail_img {
- background-image: url("/mass_mailing/static/src/img/blocks/block_header_center_text.png");
-}
-.oe_snippet.o_mail_block_header_social .oe_snippet_thumbnail_img {
- background-image: url("/mass_mailing/static/src/img/blocks/block_header_social.png");
-}
-.oe_snippet.o_mail_block_header_text_social .oe_snippet_thumbnail_img {
- background-image: url("/mass_mailing/static/src/img/blocks/block_header_text_social.png");
-}
-.oe_snippet.o_mail_block_text_image .oe_snippet_thumbnail_img {
- background-image: url("/mass_mailing/static/src/img/blocks/block_text-image.png");
-}
-.oe_snippet.o_mail_block_footer_copyright .oe_snippet_thumbnail_img {
- background-image: url("/mass_mailing/static/src/img/blocks/block_footer_copyright.png");
-}
-.oe_snippet.o_mail_block_footer_social .oe_snippet_thumbnail_img {
- background-image: url("/mass_mailing/static/src/img/blocks/block_footer_social.png");
-}
-.oe_snippet.o_mail_block_footer_text .oe_snippet_thumbnail_img {
- background-image: url("/mass_mailing/static/src/img/blocks/block_footer_text.png");
-}
-.oe_snippet.o_mail_block_footer_seprator .oe_snippet_thumbnail_img {
- background-image: url("/mass_mailing/static/src/img/blocks/block_footer_seprator.png");
-}
-.oe_snippet.o_mail_block_footer_tag_line .oe_snippet_thumbnail_img {
- background-image: url("/mass_mailing/static/src/img/blocks/block_footer_tag_line.png");
-}
-.oe_snippet.o_mail_block_two_cols .oe_snippet_thumbnail_img{
- background-image: url("/mass_mailing/static/src/img/blocks/block_two-column-img.png");
-}
-.oe_snippet.o_mail_block_two_cols_content .oe_snippet_thumbnail_img{
- background-image: url("/mass_mailing/static/src/img/blocks/block_two-column.png");
-}
-.oe_snippet.o_mail_block_title_text .oe_snippet_thumbnail_img{
- background-image: url("/mass_mailing/static/src/img/blocks/block_title_text.png")
-}
-.oe_snippet.o_mail_block_title_sub .oe_snippet_thumbnail_img{
- background-image: url("/mass_mailing/static/src/img/blocks/block_title.png")
-}
-.oe_snippet.o_mail_block_image_text .oe_snippet_thumbnail_img{
- background-image: url("/mass_mailing/static/src/img/blocks/block_image-text.png")
-}
-.oe_snippet.o_mail_block_text_button .oe_snippet_thumbnail_img{
- background-image: url("/website/static/src/img/blocks/block_jumbotron.png")
-}
-.oe_snippet.o_mail_block_table_content .oe_snippet_thumbnail_img{
- background-image: url("/mass_mailing/static/src/img/blocks/block_table.png")
-}
-.oe_snippet.o_mail_block_discount1 .oe_snippet_thumbnail_img{
- background-image: url("/mass_mailing/static/src/img/blocks/block_discount.png")
-}
-.oe_snippet.o_mail_block_discount2 .oe_snippet_thumbnail_img{
- background-image: url("/mass_mailing/static/src/img/blocks/block_discount2.png")
-}
-.oe_snippet.o_mail_block_event .oe_snippet_thumbnail_img{
- background-image: url("/mass_mailing/static/src/img/blocks/block_event.png")
-}
-.oe_snippet.o_mail_block_image .oe_snippet_thumbnail_img{
- background-image: url("/mass_mailing/static/src/img/blocks/block_image_text.png")
-}
-.oe_snippet.o_mail_block_profile .oe_snippet_thumbnail_img{
- background-image: url("/mass_mailing/static/src/img/blocks/block_user.png")
-}
-.oe_snippet.o_mail_block_four_cols .oe_snippet_thumbnail_img{
- background-image: url("/mass_mailing/static/src/img/blocks/block_four_columns.png")
-}
-.oe_snippet.o_mail_block_button .oe_snippet_thumbnail_img{
- background-image: url("/mass_mailing/static/src/img/blocks/block_button.png")
-}
-.oe_snippet.o_mail_block_simple_text .oe_snippet_thumbnail_img{
- background-image: url("/mass_mailing/static/src/img/blocks/block_simple_text.png")
-}
-.oe_snippet.o_mail_block_three_cols .oe_snippet_thumbnail_img{
- background-image: url("/mass_mailing/static/src/img/blocks/block_three_columns.png")
-}
-.oe_snippet.o_mail_block_text_on_img .oe_snippet_thumbnail_img{
- background-image: url("/mass_mailing/static/src/img/blocks/block_text_on_image.png")
-}
-.oe_snippet.o_mail_block_steps .oe_snippet_thumbnail_img{
- background-image: url("/mass_mailing/static/src/img/blocks/block_steps.png")
-}
diff --git a/addons/mass_mailing/static/src/css/snippet_styles.css b/addons/mass_mailing/static/src/css/snippet_styles.css
new file mode 100644
index 0000000000000000000000000000000000000000..2035ea37ea1066767d29cdada629f39ab4599968
--- /dev/null
+++ b/addons/mass_mailing/static/src/css/snippet_styles.css
@@ -0,0 +1,83 @@
+@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
new file mode 100644
index 0000000000000000000000000000000000000000..655d4bd19ee5fc6712dddde4087aae0dc2506252
--- /dev/null
+++ b/addons/mass_mailing/static/src/css/themes/airmail.css
@@ -0,0 +1,77 @@
+/*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
new file mode 100644
index 0000000000000000000000000000000000000000..df6a83f9e17236dc4932584143f66e4b5b5f0dd2
--- /dev/null
+++ b/addons/mass_mailing/static/src/css/themes/lemon.css
@@ -0,0 +1,75 @@
+/* ======================== 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
new file mode 100644
index 0000000000000000000000000000000000000000..00ea206cd4893753238b394ccf45b27181c84e23
--- /dev/null
+++ b/addons/mass_mailing/static/src/css/themes/tech.css
@@ -0,0 +1,75 @@
+/* ======================== 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
new file mode 100644
index 0000000000000000000000000000000000000000..d654274d9e8b55f14950f59278f79bb427eb4908
Binary files /dev/null and b/addons/mass_mailing/static/src/img/blocks/block_banner.png differ
diff --git a/addons/mass_mailing/static/src/img/blocks/block_button.png b/addons/mass_mailing/static/src/img/blocks/block_button.png
deleted file mode 100644
index 3cc09522e05055c83f38ed3d9199f428e8d0610f..0000000000000000000000000000000000000000
Binary files a/addons/mass_mailing/static/src/img/blocks/block_button.png and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/blocks/block_discount.png b/addons/mass_mailing/static/src/img/blocks/block_discount.png
deleted file mode 100644
index 2d50e0dc242e00d89d32c9e7a3e7aff640233eb3..0000000000000000000000000000000000000000
Binary files a/addons/mass_mailing/static/src/img/blocks/block_discount.png and /dev/null 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
new file mode 100644
index 0000000000000000000000000000000000000000..b6142062d725aa70cd8521987b3b55751043b30b
Binary files /dev/null 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
index eec00e52cbc8731e6828c9a31bd3eea2b72b1f0f..ff4fba13db9e2c5fb7655bf47b71b6b9116c22e0 100644
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
index 251d52ddcea5e44a09fca3b4db21c2f028e50d25..f75ea319f88e7504372ac8f118d207c2aa09818f 100644
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_copyright.png b/addons/mass_mailing/static/src/img/blocks/block_footer_copyright.png
deleted file mode 100644
index 3b57fa068befbe97a98f57aa4837a1edb91cf5f3..0000000000000000000000000000000000000000
Binary files a/addons/mass_mailing/static/src/img/blocks/block_footer_copyright.png and /dev/null 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
new file mode 100644
index 0000000000000000000000000000000000000000..a3b202a8362ef5673b3376551d5b2c7d16a5f39f
Binary files /dev/null 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_seprator.png b/addons/mass_mailing/static/src/img/blocks/block_footer_seprator.png
deleted file mode 100644
index ea87ad3f1761946846b74363b1e094149b357096..0000000000000000000000000000000000000000
Binary files a/addons/mass_mailing/static/src/img/blocks/block_footer_seprator.png and /dev/null 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
index b1ea137b2ae43e99c81e193b5e058687f4cf9e85..abb0d12ff948053c8a27943325967e95073c9b1b 100644
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_tag_line.png b/addons/mass_mailing/static/src/img/blocks/block_footer_tag_line.png
index cf12cc97358e8ff42b464a2812b57f8fd970aa9f..5701891a1b53ffbe34769a1259099c4fd06053ef 100644
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_footer_text.png b/addons/mass_mailing/static/src/img/blocks/block_footer_text.png
deleted file mode 100644
index 7f3553cd32dfce5dc9a12603aadda7587264f0d0..0000000000000000000000000000000000000000
Binary files a/addons/mass_mailing/static/src/img/blocks/block_footer_text.png and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/blocks/block_four_columns.png b/addons/mass_mailing/static/src/img/blocks/block_four_columns.png
deleted file mode 100644
index 6087b078261947bbcd525b1c67b41f7626aaf088..0000000000000000000000000000000000000000
Binary files a/addons/mass_mailing/static/src/img/blocks/block_four_columns.png and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/blocks/block_header_center_logo.png b/addons/mass_mailing/static/src/img/blocks/block_header_center_logo.png
deleted file mode 100644
index f1c11cfcc3a8272746ac80ede47fa71de9033a73..0000000000000000000000000000000000000000
Binary files a/addons/mass_mailing/static/src/img/blocks/block_header_center_logo.png and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/blocks/block_header_center_text.png b/addons/mass_mailing/static/src/img/blocks/block_header_center_text.png
deleted file mode 100644
index bf61eb36b0b45599a4028a159d93b20bce8528fd..0000000000000000000000000000000000000000
Binary files a/addons/mass_mailing/static/src/img/blocks/block_header_center_text.png and /dev/null 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
index cdd1362899717c8ad6f00ad45f01e457508d8457..9aa612f46e05971be75ba7ad4424f617a94d8ab1 100644
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
index c72dc2c043958fa289edb97e19a30bd08cc8f547..db090733574e30cf649cfe8082e432b4eeabc5a1 100644
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-text.png b/addons/mass_mailing/static/src/img/blocks/block_image-text.png
deleted file mode 100644
index 8611573f98ba54946339c3d83ce2507f26fa186c..0000000000000000000000000000000000000000
Binary files a/addons/mass_mailing/static/src/img/blocks/block_image-text.png and /dev/null 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
new file mode 100644
index 0000000000000000000000000000000000000000..e0f8901b1d5e5bda856631031ecfabf6af66bf08
Binary files /dev/null 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
index 6a2bcaf6b17eb085c47deb72c69e94c82c43c29e..41b2949a777fc69b1102ca4e7f28e9878dac75bd 100644
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_simple_text.png b/addons/mass_mailing/static/src/img/blocks/block_simple_text.png
deleted file mode 100644
index 7099744d742ae680790f1740f83f2ae131411bcd..0000000000000000000000000000000000000000
Binary files a/addons/mass_mailing/static/src/img/blocks/block_simple_text.png and /dev/null 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
index 2882bac0f59ab1cb4e6c54483ed61784f8c45c57..49c59314ea3cc3c9a341f6123297c9b225e4a983 100644
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.png b/addons/mass_mailing/static/src/img/blocks/block_table.png
deleted file mode 100644
index e7f51cbe94344d025a25e33f9d997c98e743c1df..0000000000000000000000000000000000000000
Binary files a/addons/mass_mailing/static/src/img/blocks/block_table.png and /dev/null 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
new file mode 100644
index 0000000000000000000000000000000000000000..1dd9f1ab4dca7ee614770615d3e7dce58b220298
Binary files /dev/null and b/addons/mass_mailing/static/src/img/blocks/block_table_content.png 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
deleted file mode 100644
index edbf697a2d0e72bbcf5804b21ca456ecef4b2da1..0000000000000000000000000000000000000000
Binary files a/addons/mass_mailing/static/src/img/blocks/block_text-image.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
new file mode 100644
index 0000000000000000000000000000000000000000..ab3d90c19a2a70471ea952d87aeb7293b536615a
Binary files /dev/null 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_text_on_image.png b/addons/mass_mailing/static/src/img/blocks/block_text_on_image.png
deleted file mode 100644
index d1e6cc1c72263c8c581d21fed876fa1d2c9ec9e5..0000000000000000000000000000000000000000
Binary files a/addons/mass_mailing/static/src/img/blocks/block_text_on_image.png and /dev/null 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
new file mode 100644
index 0000000000000000000000000000000000000000..ffb3e955b96b26a27fbd7b6892dba368bb2813ea
Binary files /dev/null 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_three_columns.png b/addons/mass_mailing/static/src/img/blocks/block_three_columns.png
deleted file mode 100644
index dd50e0336d3d238c683ec7aea7a59e6e7b7b7753..0000000000000000000000000000000000000000
Binary files a/addons/mass_mailing/static/src/img/blocks/block_three_columns.png and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/blocks/block_title.png b/addons/mass_mailing/static/src/img/blocks/block_title.png
deleted file mode 100644
index 8382c843a4b9534ed5a5e63e84d5a162cecf5d70..0000000000000000000000000000000000000000
Binary files a/addons/mass_mailing/static/src/img/blocks/block_title.png and /dev/null 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
new file mode 100644
index 0000000000000000000000000000000000000000..fe7b44867bc41b9547eee3cd277ea8a492bd5402
Binary files /dev/null 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
index cf785444dad40f7b756427df2190ca3f44050c13..222975d2aba21c0c64ef451c1a8fef8fc638aa9a 100644
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-column-img.png b/addons/mass_mailing/static/src/img/blocks/block_two-column-img.png
deleted file mode 100644
index 3506415d8c2b9cc3541a57c9af373230b3b0e8e8..0000000000000000000000000000000000000000
Binary files a/addons/mass_mailing/static/src/img/blocks/block_two-column-img.png and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/blocks/block_two-column.png b/addons/mass_mailing/static/src/img/blocks/block_two-column.png
deleted file mode 100644
index 455ba378f530d8c73bf32904bf54b8ec3a2fd787..0000000000000000000000000000000000000000
Binary files a/addons/mass_mailing/static/src/img/blocks/block_two-column.png and /dev/null 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
new file mode 100644
index 0000000000000000000000000000000000000000..711e7b0b8233c2bc145e0a0db5e8d0687d79733f
Binary files /dev/null and b/addons/mass_mailing/static/src/img/blocks/block_two_cols.png differ
diff --git a/addons/mass_mailing/static/src/img/blocks/block_user.png b/addons/mass_mailing/static/src/img/blocks/block_user.png
deleted file mode 100644
index d822f6f989e4445bae32fb20747a1b901c253bc8..0000000000000000000000000000000000000000
Binary files a/addons/mass_mailing/static/src/img/blocks/block_user.png and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/blocks/bounce.png b/addons/mass_mailing/static/src/img/blocks/bounce.png
deleted file mode 100644
index c0cd2562ce6476b54f6c4585bc9192b77a8f713f..0000000000000000000000000000000000000000
Binary files a/addons/mass_mailing/static/src/img/blocks/bounce.png and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/blocks/button_newsletter.png b/addons/mass_mailing/static/src/img/blocks/button_newsletter.png
deleted file mode 100644
index 46a63ef9b0021b83e9c25c575f2cb621e09c39e1..0000000000000000000000000000000000000000
Binary files a/addons/mass_mailing/static/src/img/blocks/button_newsletter.png and /dev/null 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
new file mode 100644
index 0000000000000000000000000000000000000000..ee91687680af497f5869f51bffcfd29b2a82ddc6
Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_imgs/airmail_template_thumb.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
new file mode 100644
index 0000000000000000000000000000000000000000..dd3f14ae53686c8c59d9740f6a2ace1ea2b506de
Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_imgs/default_template_thumb.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
new file mode 100644
index 0000000000000000000000000000000000000000..5ee594752176a7982b1042adbacb481bbb509c70
Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_imgs/lemon_template_thumb.png differ
diff --git a/addons/mass_mailing/static/src/img/theme_imgs/social_facebook.png b/addons/mass_mailing/static/src/img/theme_imgs/social_facebook.png
deleted file mode 100644
index 59eff64afb4d622c5b665250742f8c44109df77b..0000000000000000000000000000000000000000
Binary files a/addons/mass_mailing/static/src/img/theme_imgs/social_facebook.png and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/theme_imgs/social_googleplus.png b/addons/mass_mailing/static/src/img/theme_imgs/social_googleplus.png
deleted file mode 100644
index 0364cb0b9bb14327b10bd3a90dd6bd218c9016cc..0000000000000000000000000000000000000000
Binary files a/addons/mass_mailing/static/src/img/theme_imgs/social_googleplus.png and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/theme_imgs/social_linkedin.png b/addons/mass_mailing/static/src/img/theme_imgs/social_linkedin.png
deleted file mode 100644
index ff7309e3cf4a9f40ec9ad9418be5906de0880a86..0000000000000000000000000000000000000000
Binary files a/addons/mass_mailing/static/src/img/theme_imgs/social_linkedin.png and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/theme_imgs/social_rss.png b/addons/mass_mailing/static/src/img/theme_imgs/social_rss.png
deleted file mode 100644
index da352edcfb8f8b16c44d796596405d8902394dce..0000000000000000000000000000000000000000
Binary files a/addons/mass_mailing/static/src/img/theme_imgs/social_rss.png and /dev/null differ
diff --git a/addons/mass_mailing/static/src/img/theme_imgs/social_twitter.png b/addons/mass_mailing/static/src/img/theme_imgs/social_twitter.png
deleted file mode 100644
index 827c85801e65a8bbb33200e6ab9f02f009c5870a..0000000000000000000000000000000000000000
Binary files a/addons/mass_mailing/static/src/img/theme_imgs/social_twitter.png and /dev/null 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
new file mode 100644
index 0000000000000000000000000000000000000000..33b40085d1650b018e3dc09e182d1bf0d1f25183
Binary files /dev/null and b/addons/mass_mailing/static/src/img/theme_imgs/tech_template_thumb.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 7e84ff6259497b4d313e76e6e86e21457d470e47..23e8a84f155fa3d62f15f1fea3f3524e3ab7ea3f 100644
--- a/addons/mass_mailing/static/src/js/mass_mailing_editor.js
+++ b/addons/mass_mailing/static/src/js/mass_mailing_editor.js
@@ -1,33 +1,41 @@
odoo.define('mass_mailing.editor', function (require) {
"use strict";
-var Model = require('web.Model');
+var ajax = require("web.ajax");
+var core = require("web.core");
var rte = require('web_editor.rte');
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;
+}
+
// Snippet option for resizing image and column width inline like excel
options.registry["width-x"] = options.Class.extend({
start: function () {
this.container_width = 600;
var parent = this.$target.closest('[data-max-width]');
- if( parent.length ){
+ if (parent.length) {
this.container_width = parseInt(parent.attr('data-max-width'));
- }
+ }
var self = this;
var offset, sib_offset, target_width, sib_width;
this.is_image = false;
this._super();
this.$overlay.find(".oe_handle.e, .oe_handle.w").removeClass("readonly");
- if( this.$target.is('img')){
+ 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.is_image=true;
}
- this.$overlay.find(".oe_handle").on('mousedown', function (event){
+ this.$overlay.find(".oe_handle").on('mousedown', function (event) {
event.preventDefault();
var $handle = $(this);
var compass = false;
@@ -35,12 +43,12 @@ options.registry["width-x"] = options.Class.extend({
_.each(['n', 's', 'e', 'w' ], function(handler) {
if ($handle.hasClass(handler)) { compass = handler; }
});
- if(self.is_image){ compass = "image"; }
+ if (self.is_image) { compass = "image"; }
self.buildingBlock.editor_busy = true;
var $body = $(document.body);
- var body_mousemove = function (event){
+ var body_mousemove = function (event) {
event.preventDefault();
offset = self.$target.offset().left;
target_width = self.get_max_width(self.$target);
@@ -56,11 +64,11 @@ options.registry["width-x"] = options.Class.extend({
self.change_width(event, self.$target, target_width, offset ,'minus');
self.change_width(event, self.$target.prev(), sib_width, sib_offset, 'plus');
}
- if (compass === 'image'){
+ if (compass === 'image') {
self.change_width(event, self.$target, target_width, offset ,'plus');
}
- }
- var body_mouseup = function(){
+ };
+ var body_mouseup = function () {
$body.unbind('mousemove', body_mousemove);
$body.unbind('mouseup', body_mouseup);
self.buildingBlock.editor_busy = false;
@@ -70,12 +78,13 @@ options.registry["width-x"] = options.Class.extend({
$body.mouseup(body_mouseup);
});
},
- change_width:function(event, target ,target_width, offset, type){
+ change_width: function (event, target ,target_width, offset, type) {
var self = this;
- if(type == 'plus'){
- var width = event.pageX-offset;
- }else{
- var width = offset + target_width - event.pageX;
+ var width;
+ if (type === 'plus') {
+ width = event.pageX-offset;
+ } else {
+ width = offset + target_width - event.pageX;
}
target.css("width", width + "px");
self.buildingBlock.cover_target(self.$overlay, self.$target);
@@ -90,17 +99,17 @@ options.registry["width-x"] = options.Class.extend({
var self = this;
_.each($el.siblings(),function(sib){
max_width += self.get_int_width($(sib));
- })
+ });
return this.container_width - max_width;
},
on_clone: function ($clone) {
var clone_index = $(this.$target).index();
var $table = this.$target.parents('table[data-max-width]');
- if($table.length == 1){
+ if ($table.length === 1){
_.each($table.find('tbody>tr'),function(row){
var clone_selector = 'td:eq(' + clone_index + ')';
var $col_to_clone = $(row).find(clone_selector);
- if($col_to_clone.length != 0){
+ if ($col_to_clone.length !== 0){
$col_to_clone.after($col_to_clone.clone());
}
});
@@ -111,132 +120,86 @@ options.registry["width-x"] = options.Class.extend({
on_remove: function () {
var remove_index = $(this.$target).index();
var $table = this.$target.parents('table[data-max-width]');
- if($table.length == 1){
+ if ($table.length === 1){
_.each($table.find('tbody>tr'),function(row){
var remove_selector = 'td:eq(' + remove_index + ')';
$(row).find(remove_selector).remove();
});
}
- this._super();
+ this._super.apply(this, arguments);
this.buildingBlock.cover_target(this.$overlay, this.$target);
},
});
-
var fn_popover_update = $.summernote.eventHandler.modules.popover.update;
$.summernote.eventHandler.modules.popover.update = function ($popover, oStyle, isAirMode) {
fn_popover_update.call(this, $popover, oStyle, isAirMode);
$("span.o_table_handler, div.note-table").remove();
};
-web_editor.Class.include({
- start: function () {
- var self = this;
- $('[data-toggle="tooltip"]').tooltip();
- if (location.search.indexOf("enable_editor") !== -1) {
- this.on('rte:start', this, function () {
- $("#choose_template").off("click").on("click", _.bind(self.on_choose_template, self));
- $(".theme_thumbnail [data-snippet-theme]").off("click").on("click", _.bind(self.on_set_snippet_theme, self));
- var $editable = $("#editable_area");
- $editable.html($editable.prop("innerHTML").replace(/^<p[^>]*>\s*<\/p>$/, ''));
- });
- this.on("snippets:ready", this, _.bind(self.display_theme_from_html, self));
- }
- return this._super.apply(this, arguments);
- },
- display_theme_from_html: function () {
- var theme = $("#editable_area [data-snippet-theme]").data("snippet-theme");
- if (theme) {
- $("#choose_template").show();
- this.set_snippet_theme(theme);
- } else {
- $("#choose_template").hide();
- this.on_choose_template();
- }
- var mailing_model = JSON.parse($.deparam(location.search).datarecord).mailing_model;
- if (mailing_model) {
- this.get_snippet_template( mailing_model );
- }
- },
+ajax.loadXML("/mass_mailing/static/src/xml/mass_mailing.xml", core.qweb);
- on_choose_template: function (event) {
- if (event) {
- $("#choose_template").show();
- }
- var $editable = $("#editable_area");
- $(".o_table_handler").remove();
- $editable.add("#oe_snippets, #templates, .note-popover").toggleClass("hidden");
- $("#choose_template").children().toggleClass("hidden");
- $("body").trigger("resize");
- $(window.top).trigger('resize');
- setTimeout(function () {
- $(".note-popover").toggleClass("hidden", $("#templates").is(":visible"));
- },0);
- },
- on_set_snippet_template: function (event) {
- var $editable = $("#editable_area");
- this.rte.historyRecordUndo($editable);
- $editable.html( $(event.target).closest(".theme_thumbnail").find(".js_content").html() );
- $editable.add("#oe_snippets, #templates, .note-popover").toggleClass("hidden");
- $("#choose_template").children().toggleClass("hidden");
- setTimeout(function () {
- $("body").trigger("resize");
- $("body")[0].scrollTop = 0;
- },0);
- event.preventDefault();
- },
- on_set_snippet_theme: function (event) {
- this.set_snippet_theme($(event.target).data("snippet-theme"));
- this.on_choose_template(event);
- event.preventDefault();
- },
- set_snippet_theme: function (theme) {
- $("#oe_snippets .o_panel_body > div").addClass("hidden");
- $("#oe_snippets .o_panel_body > div."+theme).removeClass("hidden");
- $("#editable_area").trigger("content_changed");
+snippets_editor.Class.include({
+ _get_snippet_url: function () {
+ var url = (typeof snippets_url !== "undefined" ? window["snippets_url"] : this._super.apply(this, arguments));
+ return url;
},
- get_snippet_template: function (mailing_model) {
- var self = this;
- var domain = [['model', '=', mailing_model]];
- return new Model('mail.template').call('search_read', [domain]).then(function (datas) {
- var $template = $("#templates > div:last").addClass("hidden");
- var $tclone = $template.find("> div > div:first");
- $tclone.siblings().remove();
- _.each(datas, function (data) {
- if (!data.body_html) {
- return;
- }
- $template.removeClass("hidden");
- var $clone = $tclone.clone().removeClass("hidden");
- $clone.find("p:first").html(data.name);
- $clone.find(".template_preview").html(data.body_html);
- $tclone.after($clone);
- });
+ compute_snippet_templates: function (html) {
+ var ret = this._super.apply(this, arguments);
+
+ var $themes = this.$("#email_designer_themes").children().addClass("oe_snippet_body");
+ if ($themes.length === 0) return ret;
+
+ 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 $body = $(document.body);
+ $dropdown.on("mouseenter click", "li > a", function (e) {
+ e.preventDefault();
+ var classname = $(e.currentTarget).data("class");
+ $body.removeClass(all_classes).addClass(classname);
+ var $layout = $editable_area.find(".o_layout");
+ var $contents;
+ if ($layout.length) {
+ $contents = ($layout.hasClass("oe_structure") ? $layout : $layout.find(".oe_structure").first()).contents();
+ } else {
+ $contents = $editable_area.contents();
+ }
+ var $div = $("<div/>", {"class": "o_layout oe_structure " + classname});
+ $editable_area.append($div);
+ $div.append($contents);
+ $layout.remove();
+ });
- $(".js_template_set").off("click").on("click", _.bind(self.on_set_snippet_template, self));
+ 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);
});
- }
-});
-snippets_editor.Class.include({
- _get_snippet_url: function () {
- return snippets_url;
- },
- clean_for_save: function () {
- this._super();
- var $editable = $("#editable_area");
- var theme = ($("#oe_snippets .o_panel_body > div:not(.hidden)").attr("class") || "").replace(/^\s*|\s*o_mail_block[^\s]+\s*|\s*oe_snippet\s*|\s*ui-draggable\s*|\s*$/g, '');
- var $theme = $("#editable_area [data-snippet-theme]").removeAttr("data-snippet-theme").removeData("snippet-theme");
- $editable.children().first().attr("data-snippet-theme", theme);
- $editable.find(":not(br):hidden").remove();
+ $dropdown.insertAfter($snippets_menu);
+
+ return ret;
},
});
-var _set_value = window.top.odoo[callback+"_updown"];
var odoo_top = window.top.odoo;
-window.top.odoo[callback+"_updown"] = function (value, fields_values, field_name) {
+window.top.odoo[window["callback"]+"_updown"] = function (value, fields_values, field_name) {
if (!window) {
- delete odoo_top[callback+"_updown"];
+ delete odoo_top[window["callback"]+"_updown"];
return;
}
@@ -244,7 +207,7 @@ window.top.odoo[callback+"_updown"] = function (value, fields_values, field_name
var _val = $editable.prop("innerHTML");
var editor_enable = $('body').hasClass('editor_enable');
value = value || "";
-
+
if(value !==_val) {
if (editor_enable) {
if (value !== fields_values[field_name]) {
@@ -252,14 +215,12 @@ window.top.odoo[callback+"_updown"] = function (value, fields_values, field_name
}
snippets_editor.instance.make_active(false);
}
-
+
if (value.indexOf('on_change_model_and_list') === -1) {
$editable.html(value);
if (editor_enable) {
- web_editor.editor_bar.display_theme_from_html();
-
if (value !== fields_values[field_name]) {
$editable.trigger("content_changed");
}
@@ -268,16 +229,13 @@ window.top.odoo[callback+"_updown"] = function (value, fields_values, field_name
}
if (fields_values.mailing_model && web_editor.editor_bar) {
- web_editor.editor_bar.get_snippet_template(fields_values.mailing_model);
if (value.indexOf('on_change_model_and_list') !== -1) {
- odoo_top[callback+"_downup"](_val);
+ odoo_top[window["callback"]+"_downup"](_val);
}
}
};
-
-if ($("#editable_area").html().indexOf('on_change_model_and_list') !== -1) {
- $("#editable_area").empty();
+if ($editable_area.html().indexOf('on_change_model_and_list') !== -1) {
+ $editable_area.empty();
}
-
});
diff --git a/addons/mass_mailing/static/src/less/mass_mailing.ui.less b/addons/mass_mailing/static/src/less/mass_mailing.ui.less
new file mode 100644
index 0000000000000000000000000000000000000000..9b72a72adc7b90eec38b30c365057008b36d3be0
--- /dev/null
+++ b/addons/mass_mailing/static/src/less/mass_mailing.ui.less
@@ -0,0 +1,17 @@
+.o_mail_theme_selector {
+ > a {
+ .o-position-absolute(6px, 6px);
+ }
+
+ .dropdown-menu {
+ .o-position-absolute(@odoo-navbar-height - 1, -1px, -1px, -1px);
+ margin: 0;
+ border-radius: 0;
+ overflow: auto;
+ background-color: @o-we-color-dark;
+
+ > li:hover > a {
+ background-color: @o-we-color-darker;
+ }
+ }
+}
diff --git a/addons/mass_mailing/static/src/less/mass_mailing_editor.less b/addons/mass_mailing/static/src/less/mass_mailing_editor.less
deleted file mode 100644
index e463ec1b6d1449643697f42eedb21a6366346a36..0000000000000000000000000000000000000000
--- a/addons/mass_mailing/static/src/less/mass_mailing_editor.less
+++ /dev/null
@@ -1,121 +0,0 @@
-
-#email_theme_list, #email_template_list {
- clear: both;
- text-align: center;
-
- > div {
- width: 200px;
- display: inline-block;
- position: relative;
- }
-}
-.theme_thumbnail {
- position: inherit;
- margin-top: 15px;
-
- div {
- .o-transition(opacity, 0.5s);
-
- &.overlay {
- z-index: 2;
- max-height: 135px;
- position:absolute;
- padding:25% 0;
- opacity: 0;
- width: 100%;
-
- p {
- color:#616161;
- font-weight:bold;
- text-transform: capitalize;
- }
- }
- }
- img.img {
- width: auto;
- height: 180px;
- }
-
- &:hover {
- > img.img {
- opacity:0.3;
- }
- > div.overlay {
- opacity: 1;
- }
- > .template_preview {
- opacity:0.3;
- }
- }
-}
-.modal-body .theme_thumbnail img.img {
- height: 100px;
-}
-.email_head {
- border-width: 0px 0px 2px 0px;
- div {
- font-size:14px;
- }
- .popover-title {
- font-weight:bold;
- }
-}
-.template_name {
- width: 160px;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-}
-.email_template * {
- .o-transition(opacity, 0.5s);
- &:hover {
- .template_thumbnail {
- opacity:0.3;
- }
- .template_options {
- opacity:1;
- }
- }
-}
-#templates {
- margin: -@odoo-navbar-height 0 0 -@o-we-sidebar-width;
- padding: 10px @odoo-horizontal-padding;
- border: 1px solid @odoo-brand-secondary;
- background-color: white;
-
- .template_preview_border {
- overflow: hidden !important;
- border: 2px solid grey;
- height: 300px;
- }
- .template_preview {
- -webkit-transform: scale(.33);
- -ms-transform: scale(.33);
- transform: scale(.33);
- -webkit-transform-origin: 0 0;
- -ms-transform-origin: 0 0;
- transform-origin: 0 0;
- }
-}
-#choose_template {
- display: none;
- margin: 5px;
- position: fixed;
- top: 0;
- right: 28px;
- z-index: 2000;
-
- span {
- padding: 1px 5px;
- height: 24px;
- }
-}
-#email_template_list {
- > div {
- overflow: hidden;
- height: 300px;
- }
- .theme_thumbnail div.overlay {
- max-height: 300px;
- }
-}
diff --git a/addons/mass_mailing/static/src/xml/mass_mailing.xml b/addons/mass_mailing/static/src/xml/mass_mailing.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e82f4dbf88e8594221c396622737984733f818a5
--- /dev/null
+++ b/addons/mass_mailing/static/src/xml/mass_mailing.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates id="template" xml:space="preserve">
+ <t t-name="mass_mailing.theme_selector">
+ <div class="o_mail_theme_selector">
+ <a href="#" class="btn btn-xs btn-primary dropdown-toggle" data-toggle="dropdown">
+ <i class="fa fa-paint-brush"/>
+ </a>
+ <div class="dropdown-menu">
+ <li t-foreach="themes" t-as="theme">
+ <a href="#" t-att-data-class="theme.className">
+ <img class="img img-responsive" t-att-src="theme.imgSource"/>
+ </a>
+ </li>
+ </div>
+ </div>
+ </t>
+</templates>
diff --git a/addons/mass_mailing/views/editor_field_html.xml b/addons/mass_mailing/views/editor_field_html.xml
index 772445866698a6c77b4c605eac1ba14d4c19429f..c93cee8d3533b6e0f0da7673be83dc20722ac9bf 100644
--- a/addons/mass_mailing/views/editor_field_html.xml
+++ b/addons/mass_mailing/views/editor_field_html.xml
@@ -1,74 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
-<template id="assets_editor" inherit_id="web_editor.assets_editor">
- <xpath expr="link[last()]" position="after">
- <link rel="stylesheet" type="text/less" href="/mass_mailing/static/src/less/mass_mailing_editor.less"/>
- </xpath>
-</template>
-
-<!-- Template Choice page -->
<template id="FieldTextHtmlInline" name="Editor layout">
<t t-set="head">
<t t-if="enable_editor">
- <link rel="stylesheet" href="/mass_mailing/static/src/css/mass_mailing_editor_thumb.css" type="text/css"/>
- <script type="text/javascript" src="/mass_mailing/static/src/js/mass_mailing_editor.js"></script>
- </t>
- </t>
+ <link rel="stylesheet" href="/mass_mailing/static/src/css/snippet_styles.css" type="text/css"/>
- <t t-set="add_html">
- <t t-if="enable_editor">
- <span id="choose_template" class="o_not_editable o_css_editor">
- <span class="btn btn-primary">Theme</span>
- <span class="btn btn-primary hidden">Cancel selection</span>
- </span>
+ <link rel="stylesheet" href="/mass_mailing/static/src/css/themes/airmail.css" type="text/css"/>
+ <link rel="stylesheet" href="/mass_mailing/static/src/css/themes/lemon.css" type="text/css"/>
+ <link rel="stylesheet" href="/mass_mailing/static/src/css/themes/tech.css" type="text/css"/>
</t>
</t>
-
<t t-call="web_editor.layout">
- <div t-if="not edit_translations" id="editable_area" class="o_editable" t-att-data-oe-model="model" t-att-data-oe-field="field" t-att-data-oe-id="res_id" data-oe-type="html"><t t-raw="content"/></div>
- <div t-if="edit_translations" id="editable_area"><t t-raw="content"/></div>
-
- <div id="templates" class="o_not_editable o_css_editor hidden" t-if="enable_editor">
- <h1 class="page-header mt16 email_head panel-primary">
- Select a theme
- <button type="button" class="btn btn-sm btn-default fa fa-info-circle" data-toggle="tooltip" data-placement="bottom" title="Here you can design your own template from scratch by selecting your favorite theme."></button>
- </h1>
- <t t-call="mass_mailing.mass_mail_theme_list"/>
-
- <div class="hidden">
- <h1 class="page-header mt16">
- Choose a Template
- </h1>
- <div id="email_template_list">
- <div class="hidden">
- <div class="theme_thumbnail">
- <div class="overlay text-center">
- <p>template</p>
- <a class="btn btn-primary btn-sm js_template_set"> Select </a>
- </div>
- <div class="template_preview js_content"/>
- </div>
- </div>
- </div>
- </div>
- </div>
+ <div t-if="not edit_translations" id="editable_area" class="o_editable o_mail_area" t-att-data-oe-model="model" t-att-data-oe-field="field" t-att-data-oe-id="res_id" data-oe-type="html"><t t-raw="content"/></div>
+ <div t-if="edit_translations" id="editable_area" class="o_mail_area"><t t-raw="content"/></div>
</t>
</template>
<template id="FieldTextHtmlPopupContent" name="Editor layout">
<t t-set="head">
- <link rel="stylesheet" href="/mass_mailing/static/src/css/mass_mailing_editor_thumb.css" type="text/css"/>
<link rel="stylesheet" href="/mass_mailing/static/src/css/mass_mailing_popup.css" type="text/css"/>
- </t>
+ </t>
<t t-call="web_editor.layout">
<div class="modal-dialog modal-md show" id="o_newsletter_popup">
<div class="modal-content o_popup_modal_content">
<div class="o_popup_modal_body text-center">
<div class="o_popup_content_dev">
- <div id="editable_area" class="o_editable" t-att-data-oe-model="model" t-att-data-oe-field="field" t-att-data-oe-id="res_id" data-oe-type="html">
+ <div id="editable_area" class="o_editable o_mail_area" t-att-data-oe-model="model" t-att-data-oe-field="field" t-att-data-oe-id="res_id" data-oe-type="html">
<!-- Can be removed once default values are ok for the editor -->
- <t t-raw="content">
- </t>
+ <t t-raw="content"/>
</div>
</div>
</div>
diff --git a/addons/mass_mailing/views/mass_mailing_template.xml b/addons/mass_mailing/views/mass_mailing_template.xml
index 0645abcd18cf81b0c44afc976bd0f00167195832..5e7037c805b6528787a237f2c07a12c7fb96d98c 100644
--- a/addons/mass_mailing/views/mass_mailing_template.xml
+++ b/addons/mass_mailing/views/mass_mailing_template.xml
@@ -7,4 +7,13 @@
<script type="text/javascript" src="/mass_mailing/static/src/js/mass_mailing.js"></script>
</xpath>
</template>
+
+ <template id="assets_editor" inherit_id="web_editor.assets_editor">
+ <xpath expr="//link[last()]" position="after">
+ <link type="text/less" rel="stylesheet" href="/mass_mailing/static/src/less/mass_mailing.ui.less"/>
+ </xpath>
+ <xpath expr="//script[last()]" position="after">
+ <script type="text/javascript" src="/mass_mailing/static/src/js/mass_mailing_editor.js"></script>
+ </xpath>
+ </template>
</odoo>
diff --git a/addons/mass_mailing/views/snippets_themes.xml b/addons/mass_mailing/views/snippets_themes.xml
index 6ffac3a26489ecd47c6d22a06baad2382e2d571b..44c477a92bb5ffeb75e876de40654b65a6cea55a 100644
--- a/addons/mass_mailing/views/snippets_themes.xml
+++ b/addons/mass_mailing/views/snippets_themes.xml
@@ -1,471 +1,850 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
+<!-- Snippets & Themes Menu -->
<template id="email_designer_snippets" inherit_id="web_editor.snippets" primary="True">
<xpath expr="//div[@id='o_scroll']" position="replace">
<div id="o_scroll">
+ <div id="email_designer_themes">
+ <div data-class="o_default_theme" data-img="/mass_mailing/static/src/img/theme_imgs/default_template_thumb.png"/>
+ <div data-class="o_airmail_theme" data-img="/mass_mailing/static/src/img/theme_imgs/airmail_template_thumb.png"/>
+ <div data-class="o_tech_theme" data-img="/mass_mailing/static/src/img/theme_imgs/tech_template_thumb.png"/>
+ <div data-class="o_lemon_theme" data-img="/mass_mailing/static/src/img/theme_imgs/lemon_template_thumb.png"/>
+ </div>
<div id="email_designer_default_headers" class="o_panel">
<div class="o_panel_header">
- <span class="fa-stack">
- <i class="fa fa-align-justify fa-stack-1x" style="margin-top: -0.15em; height: 0.9em; display: inline-block; overflow: hidden;"></i>
- <i class="fa fa-arrow-up fa-stack-1x" style="margin-top: 0.25em; display: inline-block; font-size: 0.6em;"></i>
- </span> Headers
+ <i class="fa fa-angle-double-up"/> Headers
</div>
<div class="o_panel_body">
- <div name="Center Logo" class="basic_theme o_mail_block_header_center_logo">
- <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777">
- <table style="margin: 0 auto;border-collapse:collapse;background:inherit;width:600px;color:inherit" cellpadding="0" cellspacing="0">
- <tbody>
- <tr>
- <td valign="center" style="text-align:center">
- &nbsp;
- <a t-att-href="(company_id.website) or '#'" style="text-decoration:none;">
- <img class="padding-medium" src="/logo.png" style="height:auto;max-width:600px;width:200px" alt="Your Logo" />
- </a>
- &nbsp;
- </td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
-
- <div name="Center Text" class="basic_theme o_mail_block_header_center_text">
- <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777">
- <table style="margin: 0 auto;border-collapse:collapse;background:inherit;color:inherit;width:600px;color:inherit" cellpadding="0" cellspacing="0">
- <tbody>
- <tr>
- <td valign="center" style="text-align:center;font-size: 30px">
- &nbsp;
- <a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color: inherit;">
- <strong>My Company</strong>
- </a>
- &nbsp;
- </td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
-
- <div name="Logo - Social" class="basic_theme o_mail_block_header_social">
- <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777">
- <table cellspacing="0" cellpadding="0" style="width:600px;border-collapse:collapse;background:inherit;color:inherit">
- <tr>
- <td valign="center" width="270" style="padding:10px 10px 10px 5px;">
- &nbsp;
- <a t-att-href="(company_id.website) or '#'" style="text-decoration:none;">
- <img src="/logo.png" style="padding:10px;height:auto;max-width:600px;width:200px" alt="Your Logo" />
- </a>
- &nbsp;
- </td>
- <td valign="center" width="270" style="padding:10px 15px 10px 10px">
- <table t-if="website" border="0" cellpadding="0" cellspacing="0" align="right" style="border-collapse:collapse;background:inherit;color:inherit">
- <tr>
- <td align="right">
- <a t-att-href="(website.social_facebook) or '#'"><img src="/mass_mailing/static/src/img/theme_imgs/social_facebook.png" style="height:auto;max-width:70px" alt="social icon"/></a>
- </td>
- <td align="right" style="padding-left:5px">
- <a t-att-href="(website.social_twitter) or '#'"><img src="/mass_mailing/static/src/img/theme_imgs/social_twitter.png" style="height:auto;max-width:70px" alt="social icon" /></a>
- </td>
- <td align="right" style="padding-left:5px">
- <a t-att-href="(website.social_googleplus) or '#'"><img src="/mass_mailing/static/src/img/theme_imgs/social_googleplus.png" style="height:auto;max-width:70px" alt="social icon" /></a>
- </td>
- <td align="right" style="padding-left:5px">
- <a t-att-href="(website.social_linkedin) or '#'"><img src="/mass_mailing/static/src/img/theme_imgs/social_linkedin.png" style="height:auto;max-width:70px" alt="social icon" /></a>
- </td>
- <td align="right" style="padding-left:5px">
- <a href="#"><img src="/mass_mailing/static/src/img/theme_imgs/social_rss.png" style="height:auto;max-width:70px" alt="social icon" /></a>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </div>
- </div>
-
- <div name="Text - Social" class="basic_theme o_mail_block_header_text_social">
- <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777">
- <table cellspacing="0" cellpadding="0" style="width:600px;border-collapse:collapse;background:inherit;color:inherit">
- <tr>
- <td valign="center" width="270" style="padding:10px 10px 10px 5px;font-size: 30px">
- &nbsp;
- <a t-att-href="(company_id.website) or '#'" style="text-decoration:none;color: inherit">
- <strong>My Company</strong>
- </a>
- &nbsp;
- </td>
- <td valign="center" width="270" style="padding:10px 15px 10px 10px">
- <table t-if="website" border="0" cellpadding="0" cellspacing="0" align="right" style="border-collapse:collapse;background:inherit;color:inherit">
- <tr>
- <td align="right">
- <a t-att-href="(website.social_facebook) or '#'"><img src="/mass_mailing/static/src/img/theme_imgs/social_facebook.png" style="height:auto;max-width:70px" alt="social icon" /></a>
- </td>
- <td align="right" style="padding-left:5px">
- <a t-att-href="(website.social_twitter) or '#'"><img src="/mass_mailing/static/src/img/theme_imgs/social_twitter.png" style="height:auto;max-width:70px" alt="social icon" /></a>
- </td>
- <td align="right" style="padding-left:5px">
- <a t-att-href="(website.social_googleplus) or '#'"><img src="/mass_mailing/static/src/img/theme_imgs/social_googleplus.png" style="height:auto;max-width:70px" alt="social icon" /></a>
- </td>
- <td align="right" style="padding-left:5px">
- <a t-att-href="(website.social_linkedin) or '#'"><img src="/mass_mailing/static/src/img/theme_imgs/social_linkedin.png" style="height:auto;max-width:70px" alt="social icon" /></a>
- </td>
- <td align="right" style="padding-left:5px">
- <a href="#"><img src="/mass_mailing/static/src/img/theme_imgs/social_rss.png" style="height:auto;max-width:70px" alt="social icon" /></a>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </div>
- </div>
+ <t t-snippet="mass_mailing.s_mail_block_header_social" t-thumbnail="/mass_mailing/static/src/img/blocks/block_header_social.png"/>
+ <t t-snippet="mass_mailing.s_mail_block_header_text_social" t-thumbnail="/mass_mailing/static/src/img/blocks/block_header_text_social.png"/>
+ <t t-snippet="mass_mailing.s_mail_block_banner" t-thumbnail="/mass_mailing/static/src/img/blocks/block_banner.png"/>
</div>
</div>
<div id="email_designer_default_body" class="o_panel">
<div class="o_panel_header">
- <span class="fa-stack">
- <i class="fa fa-align-left fa-stack-1x"></i>
- </span> Body
- </div>
+ <i class="fa fa-clone"/> Body
+ </div>
<div class="o_panel_body">
- <div name="Title - Subtitle" class="basic_theme o_mail_block_title_sub">
- <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#777777">
- <table width="100%" cellspacing="0" cellpadding="0" style="border-collapse:collapse;background:inherit;color:inherit">
- <tbody>
- <tr>
- <td style="text-align:center;padding-bottom:10px">
- <p style="margin:0;font-size:36px">Check this out!</p>
- </td>
- </tr>
- <tr>
- <td style="font-size:20px; text-align:center; padding: 0 5px">
- <p style="margin:0">Come check out my stuff!</p>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
+ <t t-snippet="mass_mailing.s_mail_block_title_text" t-thumbnail="/mass_mailing/static/src/img/blocks/block_title_text.png"/>
+ <t t-snippet="mass_mailing.s_mail_block_title_sub" t-thumbnail="/mass_mailing/static/src/img/blocks/block_title_sub.png"/>
+ <t t-snippet="mass_mailing.s_mail_block_table_content" t-thumbnail="/mass_mailing/static/src/img/blocks/block_table_content.png"/>
+ <t t-snippet="mass_mailing.s_mail_block_two_cols" t-thumbnail="/mass_mailing/static/src/img/blocks/block_two_cols.png"/>
+ <t t-snippet="mass_mailing.s_mail_block_three_cols" t-thumbnail="/mass_mailing/static/src/img/blocks/block_three_cols.png"/>
+ <t t-snippet="mass_mailing.s_mail_block_image_text" t-thumbnail="/mass_mailing/static/src/img/blocks/block_image_text.png"/>
+ <t t-snippet="mass_mailing.s_mail_block_text_image" t-thumbnail="/mass_mailing/static/src/img/blocks/block_text_image.png"/>
+ <t t-snippet="mass_mailing.s_mail_block_image" t-thumbnail="/mass_mailing/static/src/img/blocks/block_image.png"/>
+ <t t-snippet="mass_mailing.s_mail_block_footer_separator" t-thumbnail="/mass_mailing/static/src/img/blocks/block_footer_separator.png"/>
+ <t t-snippet="mass_mailing.s_mail_block_footer_tag_line" t-thumbnail="/mass_mailing/static/src/img/blocks/block_footer_tag_line.png"/>
+ </div>
+ </div>
+ <div id="email_designer_default_extra" class="o_panel">
+ <div class="o_panel_header">
+ <i class="fa fa-plus"/> Marketing Content
+ </div>
+ <div class="o_panel_body">
+ <t t-snippet="mass_mailing.s_mail_block_discount2" t-thumbnail="/mass_mailing/static/src/img/blocks/block_discount2.png"/>
+ <t t-snippet="mass_mailing.s_mail_block_discount1" t-thumbnail="/mass_mailing/static/src/img/blocks/block_discount1.png"/>
+ <t t-snippet="mass_mailing.s_mail_block_event" t-thumbnail="/mass_mailing/static/src/img/blocks/block_event.png"/>
+ <t t-snippet="mass_mailing.s_mail_block_steps" t-thumbnail="/mass_mailing/static/src/img/blocks/block_steps.png"/>
+ </div>
+ </div>
+ <div t-if="website" id="email_designer_default_footer" class="o_panel">
+ <div class="o_panel_header">
+ <i class="fa fa-angle-double-down"/> Footers
+ </div>
+ <div class="o_panel_body">
+ <t t-snippet="mass_mailing.s_mail_block_footer_social" t-thumbnail="/mass_mailing/static/src/img/blocks/block_footer_social.png"/>
+ </div>
+ </div>
+ </div>
+ </xpath>
- <div name="Text-Image" class="basic_theme o_mail_block_text_image">
- <div style="padding:0px; margin:auto;width:600px;background-color:#fff;color:#777777">
- <table cellpadding="0" cellspacing="0" width="600" style="margin:auto;border-collapse:collapse;background:inherit;color:inherit">
- <tbody>
- <tr>
- <td align="left" style="padding:20px;font-size:14px" class="col_mv bg-color">
- <p style="margin:0;font-size:30px">Your order has shipped!</p>
- <p style="margin:0">Dear Bob,</p>
- <p style="margin:0">
- We would like you to know that your order has shipped! To track your order or make any changes please click the "my order" button below.
- </p>
- <a href="#" style="-webkit-user-select: none; padding: 6px 12px; font-size: 14px; line-height: 20px; border-top-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; color: rgb(255, 255, 255); border: 1px solid rgb(228, 55, 37); text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: rgb(231, 76, 60);">Your Order</a>
- &nbsp;
+ <xpath expr="//div[@id='snippet_options']" position="inside">
+ <t t-call="mass_mailing.snippet_options"/>
+ </xpath>
+</template>
+
+<!-- Snippet Templates -->
+<template id="s_mail_block_header_social" name="Left Logo">
+ <div class="o_mail_block_header_social">
+ <div class="snippet_row">
+ <div class="snippet-general">
+ <table align="center" cellspacing="0" cellpadding="0" border="0" class="table-styles" width="600">
+ <tr>
+ <td width="80%" class="horizontal-padding vertical-padding">
+ &nbsp;
+ <a t-att-href="(company_id.website) or '#'" style="text-decoration:none;float:none;">
+ <img border="0" src="http://www.odoocdn.com/openerp_website/static/src/img/2016/logos/odoo_logo_small.png" style="height:auto;max-width:400px;width:100px;margin-left:-6px;" alt="Your Logo" />
+ </a>
+ &nbsp;
+ </td>
+ <td width="20%">
+ <table t-if="website" border="0" cellpadding="0" cellspacing="0" align="right" style="border-collapse:separate; margin-right:20px;">
+ <tr>
+ <t t-if="website.social_facebook">
+ <td align="right">
+ <a t-att-href="website.social_facebook">
+ <span class="fa fa-facebook-square fa-2x"></span>
+ </a>
</td>
- <td style="padding-top:20px;padding-bottom:0;vertical-align:middle;width:200px;" class="bg-color col_mv">
- <table cellspacing="0" cellpadding="0" width="100%" style="border-collapse:collapse;background:inherit">
- <tbody>
- <tr>
- <td style="vertical-align:middle;text-align:center">
- &nbsp;
- <span class="fa fa-10x fa-music"></span>
- &nbsp;
- </td>
- </tr>
- </tbody>
- </table>
+ </t>
+ <t t-if="website.social_googleplus">
+ <td align="right" style="padding-left:5px">
+ <a t-att-href="website.social_googleplus">
+ <span class="fa fa-google-plus-square fa-2x"></span>
+ </a>
</td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
-
- <div name="Image Title" class="basic_theme o_mail_block_title_text">
- <div class="snippet_row bg-color" style="padding:0px; margin:auto;width:600px;background: #fff repeat top /100%;color:#777777">
- <table cellpadding="0" cellspacing="0" style="margin:auto;border-collapse:collapse;background:inherit;color:inherit;width:600px">
- <tbody>
- <tr>
- <td align="left" style="padding:20px">
- <p style="margin:0;font-size:30px">Your order has shipped!</p>
- <p style="margin:0;font-size:14px">
- Dear Bob,<br/>
- We would like you to know that your order has shipped! To track your order or make any changes please click the "my order" button below.
- </p>
+ </t>
+ <t t-if="website.social_linkedin">
+ <td align="right" style="padding-left:5px">
+ <a t-att-href="website.social_linkedin">
+ <span class="fa fa-linkedin-square fa-2x"></span>
+ </a>
</td>
- </tr>
- <tr>
- <td style="text-align:center;width:200px;">
- &nbsp;
- <span class="fa fa-10x fa-music"></span>
- &nbsp;
+ </t>
+ <t t-if="website.social_twitter">
+ <td align="right" style="padding-left:5px">
+ <a t-att-href="website.social_twitter">
+ <span class="fa fa-twitter-square fa-2x"></span>
+ </a>
</td>
- </tr>
- </tbody>
+ </t>
+ </tr>
</table>
- </div>
- </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ </div>
+</template>
- <div name="Content Image" class="basic_theme o_mail_block_text_image">
- <div style="padding:0px; margin:auto;width:600px;background-color:#fff;color:#777777">
- <table cellpadding="0" cellspacing="0" width="600" style="margin:auto;border-collapse:collapse;background:inherit;color:inherit">
- <tbody>
- <tr>
- <td align="left" style="padding:20px" class="col_mv bg-color">
- <p style="margin:0;font-size:14px">
- We would like you to know that your order has shipped! To track your order or make any changes please click the "my order" button below.
- </p>
+<template id="s_mail_block_header_text_social" name="Left Text">
+ <div class="o_mail_block_header_text_social">
+ <div class="snippet_row">
+ <div class="snippet-general">
+ <table align="center" width="600" cellspacing="0" cellpadding="0" border="0" class="table-styles">
+ <tr>
+ <td width="80%" class="horizontal-padding vertical-padding">
+ &nbsp;
+ <a t-att-href="(company_id.website) or '#'" class="display-1" style="margin-left:-6px;">
+ My Company
+ </a>
+ &nbsp;
+ </td>
+ <td valign="center" width="20%">
+ <table t-if="website" border="0" cellpadding="0" cellspacing="0" align="right" style="border-collapse:separate;margin-right:20p">
+ <tr>
+ <t t-if="website.social_facebook">
+ <td align="right">
+ <a t-att-href="website.social_facebook">
+ <span class="fa fa-facebook-square fa-2x"></span>
+ </a>
</td>
- <td style="text-align:center;vertical-align:middle;width:200px;" class="col_mv bg-color">
- &nbsp;
- <span class="fa fa-10x fa-music"></span>
- &nbsp;
+ </t>
+ <t t-if="website.social_googleplus">
+ <td align="right" style="padding-left:5px">
+ <a t-att-href="website.social_googleplus">
+ <span class="fa fa-google-plus-square fa-2x"></span>
+ </a>
</td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
-
- <div name="Image Content" class="basic_theme o_mail_block_image_text">
- <div style="padding:0px; margin:auto;width:600px;background-color:#fff;color:#777777">
- <table cellpadding="0" cellspacing="0" width="600" style="margin:auto;border-collapse:collapse;background:inherit;color:inherit">
- <tbody>
- <tr>
- <td style="text-align:center;vertical-align:middle;width:200px;" class="col_mv bg-color">
- &nbsp;
- <span class="fa fa-10x fa-music"></span>
- &nbsp;
+ </t>
+ <t t-if="website.social_linkedin">
+ <td align="right" style="padding-left:5px">
+ <a t-att-href="website.social_linkedin">
+ <span class="fa fa-linkedin-square fa-2x"></span>
+ </a>
</td>
- <td style="padding:20px" class="col_mv bg-color">
- <p style="margin:0;font-size:14px">
- We would like you to know that your order has shipped! To track your order or make any changes please click the "my order" button below.
- </p>
+ </t>
+ <t t-if="website.social_twitter">
+ <td align="right" style="padding-left:5px">
+ <a t-att-href="website.social_twitter">
+ <span class="fa fa-twitter-square fa-2x"></span>
+ </a>
</td>
- </tr>
- </tbody>
+ </t>
+ </tr>
</table>
- </div>
- </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+ </div>
+</template>
- <div name="Button" class="basic_theme o_mail_block_button">
- <div class="snippet_row bg-color" style="padding:0;width:600px;max-width:600px;margin:0 auto;background: #fff repeat top /100%;color:#777777">
- <table style="width:600px;text-align:center;margin:0 auto;border-collapse:collapse;background:inherit;color:inherit">
- <tr>
- <td class="row" style="padding:10px 0;text-align:center">
- &nbsp;
- <a href="#" style="-webkit-user-select: none; padding: 6px 12px; font-size: 14px; line-height: 20px; color: rgb(255,255,255); border: none; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: rgb(101,101,101);border-radius:4px">My Account</a>
+<template id="s_mail_block_banner" name="Banner">
+ <div class="o_mail_block_banner">
+ <div class="snippet_row">
+ <div class="snippetbanner">
+ <table align="center" cellspacing="0" cellpadding="0" border="0" class="table-styles" width="600">
+ <tbody>
+ <tr>
+ <td width="100%" valign="top">
+ <img src="http://www.odoocdn.com/openerp_website/static/src/img/2016/home/laptop_sale_desktop.jpg" style="height:auto;max-width:600px;width:600px;" alt="Your Logo" />
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+</template>
+
+<template id="s_mail_block_title_text" name="Title Content">
+ <div class="o_mail_block_title_text">
+ <div class="snippet_row">
+ <div class="snippet-general">
+ <table align="center" cellspacing="0" cellpadding="0" border="0" class="table-styles" width="600">
+ <tbody>
+ <tr>
+ <td width="100%" class="horizontal-padding vertical-padding">
+ <p class="display-1">Don't miss our weekly sales!</p>
+ <div>
+ <p><strong>Dear ${object.name}</strong></p>
+ <p class="no-margin">Great stories have personality. Consider telling a great story that provides personality. Writing a story with personality for potential clients will assist with making a relationship connection. This shows up in small quirks like word choices or phrases. Write from your point of view, not from someone else's experience.<br/></p>
+ <p>Great stories are for everyone even when only written for just one person. If you try to write with a wide general audience in mind, your story will ring false and be bland. No one will be interested. Write for one person. If it’s genuine for the one, it’s genuine for the rest.</p>
+ <p>Kind Regards,</p>
+ <p class="no-margin">Michael Fletcher</p>
+ <div class="vertical-padding">
+ <a href="#" class="newsletter-btn">See Our Deals!</a>
&nbsp;
- </td>
- </tr>
- </table>
- </div>
- </div>
+ </div>
+ </div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+</template>
+
+<template id="s_mail_block_title_sub" name="Title - Subtitle">
+ <div class="o_mail_block_title_sub">
+ <div class="snippet_row">
+ <div class="snippet-general">
+ <table align="center" width="600" cellspacing="0" cellpadding="0" class="table-styles">
+ <tbody>
+ <tr>
+ <td class="horizontal-padding vertical-padding">
+ <p class="display-1 no-margin">Check this out!</p>
+ <p class="no-margin">Apps That Help You Grow Your Business!</p>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+</template>
+
+<template id="s_mail_block_table_content" name="Content Table">
+ <div class="o_mail_block_table_content">
+ <div class="snippet_row">
+ <div class="snippet-general">
+ <table align="center" cellspacing="0" cellpadding="0" class="table-styles" width="600">
+ <tbody>
+ <tr>
+ <td class="horizontal-padding vertical-padding col_mv">
+ <table cellspacing="0" cellpadding="0" class="table-styles">
+ <thead>
+ <tr>
+ <th class="bg-beta">
+ <h2 class="display-1 text-center">REGISTERED</h2>
+ </th>
+ </tr>
+ </thead>
+ <tbody class="bg-gray-lighter">
+ <tr>
+ <td class="text-center col_mv">
+ <p class="display-coupon text-center" style="font-weight:800;">$40</p>
+ <small>user / month (billed annually)</small>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" class="vertical-padding col_mv">
+ <div class="separator"></div>
+ </td>
+ </tr>
+ <tr>
+ <td class="col_mv">
+ <p style="margin: 0 15px 15px;">Basic sales and marketing for up to 2 users</p>
+ </td>
+ </tr>
+ <tr>
+ <td class="col_mv">
+ <p style="margin: 0 15px 15px;">Account and sales management</p>
+ </td>
+ </tr>
+ <tr>
+ <td class="col_mv">
+ <p style="margin: 0 15px 15px;">No customization</p>
+ </td>
+ </tr>
+ <tr>
+ <td class="col_mv">
+ <p style="margin: 0 15px 15px;">No support</p>
+ </td>
+ </tr>
+ </tbody>
+ <tfoot class="bg-gray-lighter">
+ <tr>
+ <td valign="top">
+ <div class="separator"></div>
+ </td>
+ </tr>
+ <tr>
+ <td class="text-center" style="padding:15px 0;">
+ &nbsp;
+ <a href="#" class="newsletter-btn">More</a>
+ &nbsp;
+ </td>
+ </tr>
+ </tfoot>
+ </table>
+ </td>
+ <td class="horizontal-padding vertical-padding col_mv">
+ <table cellspacing="0" cellpadding="0" class="table-styles">
+ <thead>
+ <tr>
+ <th class="bg-beta">
+ <h2 class="display-1 text-center">REGISTERED</h2>
+ </th>
+ </tr>
+ </thead>
+ <tbody class="bg-gray-lighter">
+ <tr>
+ <td class="text-center col_mv">
+ <p class="display-coupon text-center" style="font-weight:800;">$40</p>
+ <small>user / month (billed annually)</small>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" class="vertical-padding col_mv">
+ <div class="separator"></div>
+ </td>
+ </tr>
+ <tr>
+ <td class="col_mv">
+ <p style="margin: 0 15px 15px;">Basic sales and marketing for up to 2 users</p>
+ </td>
+ </tr>
+ <tr>
+ <td class="col_mv">
+ <p style="margin: 0 15px 15px;">Account and sales management</p>
+ </td>
+ </tr>
+ <tr>
+ <td class="col_mv">
+ <p style="margin: 0 15px 15px;">No customization</p>
+ </td>
+ </tr>
+ <tr>
+ <td class="col_mv">
+ <p style="margin: 0 15px 15px;">No support</p>
+ </td>
+ </tr>
+ </tbody>
+ <tfoot class="bg-gray-lighter">
+ <tr>
+ <td valign="top">
+ <div class="separator"></div>
+ </td>
+ </tr>
+ <tr>
+ <td class="text-center" style="padding:15px 0;">
+ &nbsp;
+ <a href="#" class="newsletter-btn">More</a>
+ &nbsp;
+ </td>
+ </tr>
+ </tfoot>
+ </table>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+</template>
+
+<template id="s_mail_block_two_cols" name="Two Columns">
+ <div class="o_mail_block_two_cols">
+ <div class="snippet_row">
+ <div class="snippet-general">
+ <table align="center" cellspacing="0" cellpadding="0" class="table-styles" width="600">
+ <tbody>
+ <tr>
+ <td style="vertical-align:top;width:270px;padding:20px 10px 20px 20px;" class="col_mv">
+ <img src="http://www.odoocdn.com/openerp_website/static/src/img/2016/project/case_study_inspiral.jpg" style="height:auto;max-width:100%;" alt="Your Logo" />
+ <p class="display-2 text-center" style="margin-top:20px;">Step 1</p>
+ <p class="text-center no-margin">
+ We need you to update your account information. If there is ever a problem with your account, this information will make it easier for you to log back in.
+ </p>
+ <div class="text-center" style="margin-top:15px;">
+ <a href="#" class="link-color">Read More...</a>
+ </div>
+ </td>
+
+ <td style="vertical-align:top;width:270px;padding:20px 20px 20px 10px;" class="col_mv">
+ <img src="http://www.odoocdn.com/openerp_website/static/src/img/2016/project/case_study_universem.jpg" style="height:auto;max-width:100%;" alt="Your Logo" />
+ <p class="display-2 text-center" style="margin-top:20px;">Step 2</p>
+ <p class="text-center no-margin">
+ We need you to update your account information. If there is ever a problem with your account, this information will make it easier for you to log back in.
+ </p>
+ <div class="text-center" style="margin-top:15px;">
+ <a href="#" class="link-color">Read More...</a>
+ </div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+</template>
+
+<template id="s_mail_block_three_cols" name="Three Columns">
+ <div class="o_mail_block_three_cols">
+ <div class="snippet_row">
+ <div class="snippet-general">
+ <table align="center" cellspacing="0" cellpadding="0" class="table-styles" width="600">
+ <tbody>
+ <tr>
+ <td style="vertical-align:top;width:180px;padding:20px 5px 20px 20px;" class="col_mv">
+ <img src="http://www.odoocdn.com/openerp_website/static/src/img/2016/project/case_study_inspiral.jpg" style="height:auto;max-width:100%;" alt="Your Logo" />
+ <p class="display-2 text-center" style="margin-top:20px;">Step 1</p>
+ <p class="text-center no-margin">
+ We need you to update your account information. If there is ever a problem with your account, this information will make it easier for you to log back in.
+ </p>
+ <div class="text-center" style="margin-top:15px;">
+ <a href="#" class="link-color">Read More...</a>
+ </div>
+ </td>
+
+ <td style="vertical-align:top;width:180px;padding:20px 5px 20px 5px;" class="col_mv">
+ <img src="http://www.odoocdn.com/openerp_website/static/src/img/2016/project/case_study_universem.jpg" style="height:auto;max-width:100%;" alt="Your Logo" />
+ <p class="display-2 text-center" style="margin-top:20px;">Step 2</p>
+ <p class="text-center no-margin">
+ We need you to update your account information. If there is ever a problem with your account, this information will make it easier for you to log back in.
+ </p>
+ <div class="text-center" style="margin-top:15px;">
+ <a href="#" class="link-color">Read More...</a>
+ </div>
+ </td>
+
+ <td style="vertical-align:top;width:180px;padding:20px 20px 20px 5px;" class="col_mv">
+ <img src="http://www.odoocdn.com/openerp_website/static/src/img/2016/project/case_study_universem.jpg" style="height:auto;max-width:100%;" alt="Your Logo" />
+ <p class="display-2 text-center" style="margin-top:20px;">Step 3</p>
+ <p class="text-center no-margin">
+ We need you to update your account information. If there is ever a problem with your account, this information will make it easier for you to log back in.
+ </p>
+ <div class="text-center" style="margin-top:15px;">
+ <a href="#" class="link-color">Read More...</a>
+ </div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+</template>
+
+<template id="s_mail_block_image_text" name="Image - Text">
+ <div class="o_mail_block_image_text">
+ <div class="snippet_row">
+ <div class="snippet-general">
+ <table align="center" cellspacing="0" cellpadding="0" class="table-styles" width="600">
+ <tbody>
+ <tr>
+ <td style="width:270px;text-align:center;vertical-align:middle" class="col_mv horizontal-padding vertical-padding">
+ <img src="http://www.odoocdn.com/openerp_website/static/src/img/2016/crm/crm_top_banner.jpg" style="height:auto;max-width:270px;width:270px;" alt="Your Logo" />
+ </td>
+ <td style="width:270px;vertical-align:middle;text-align:justify;" class="col_mv horizontal-padding vertical-padding">
+ <p class="display-2">Account Information</p>
+ <p class="no-margin">We need you to update your account information. If there is ever a problem with your account, this information will make it easier for you to log back in.</p>
+ <div class="text-center" style="margin-top:15px;">
+ <a href="#" class="link-color">Read More...</a>
+ </div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+</template>
+
+<template id="s_mail_block_text_image" name="Text - Image">
+ <div class="o_mail_block_text_image">
+ <div class="snippet_row">
+ <div class="snippet-general">
+ <table align="center" cellspacing="0" cellpadding="0" class="table-styles" width="600">
+ <tbody>
+ <tr>
+ <td style="width:270px;vertical-align:middle;text-align:justify;" class="col_mv horizontal-padding vertical-padding mobile-col">
+ <p class="display-2">Account Information</p>
+ <p class="no-margin">We need you to update your account information. If there is ever a problem with your account, this information will make it easier for you to log back in.</p>
+ <div class="text-center" style="margin-top:15px;">
+ <a href="#" class="link-color">Read More...</a>
+ </div>
+ </td>
+ <td style="width:270px;text-align:center;vertical-align:middle" class="col_mv horizontal-padding vertical-padding">
+ <img src="http://www.odoocdn.com/openerp_website/static/src/img/2016/sales/sale_top_banner.jpg" style="height:auto;max-width:270px;width:270px;" alt="Your Logo" />
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+</template>
+
+<template id="s_mail_block_image" name="Image">
+ <div class="o_mail_block_image">
+ <div class="snippet_row">
+ <div class="snippet-general">
+ <table align="center" cellspacing="0" cellpadding="0" class="table-styles" width="600">
+ <tbody>
+ <tr>
+ <td width="100%" align="center" style="text-align:center" class="horizontal-padding vertical-padding">
+ &nbsp;
+ <span class="fa fa-camera fa-10x"></span>
+ &nbsp;
+ </td>
+ </tr>
+ <tr>
+ <td width="100%" class="horizontal-padding vertical-padding">
+ <p class="no-margin"><strong>We need you to update your account information. If there is ever a problem with your account, this information will make it easier for you to log back in.</strong></p>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+</template>
+
+<template id="s_mail_block_footer_separator" name="Separator">
+ <div class="o_mail_block_footer_separator">
+ <div class="snippet_row">
+ <div class="snippet-general">
+ <table align="center" cellspacing="0" cellpadding="0" class="table-styles" width="600">
+ <tbody>
+ <tr>
+ <td valign="top" style="width:600px;" class="vertical-padding">
+ <div style="width:600px;" class="separator"></div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+</template>
+
+<template id="s_mail_block_footer_tag_line" name="Tag Line">
+ <div class="o_mail_block_footer_tag_line">
+ <div class="snippet_row">
+ <div class="snippet-general" bgcolor="#875a7b" style="background-color:#875a7b;width:600px;">
+ <table class="table-styles" width="600" align="center" cellpadding="0" cellspacing="0">
+ <tbody>
+ <tr>
+ <td width="600" class="text-center horizontal-padding vertical-padding bg-beta">
+ <p class="display-2" style="margin:10px 0;">Apps That Help You Grow Your Business</p>
+ </td>
+ </tr>
+ <tr>
+ <td class="horizontal-padding vertical-padding bg-beta" style="padding:10px;">
+ &nbsp;
+ <a href="#" class="newsletter-btn">My Account</a>
+ &nbsp;
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <div class="bg-beta">
+ &nbsp;
+
+ </div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+</template>
- <div name="Three Columns" class="basic_theme o_mail_block_three_cols">
- <div style="padding:0px;width:600px;margin:auto;background-color:#fff;color:#000;color:#777777">
- <table cellspacing="0" cellpadding="0" style="width:100%;border-collapse:collapse;background:inherit;color:inherit">
- <tbody>
+<template id="s_mail_block_discount2" name="Discount Coupon">
+ <div class="o_mail_block_discount2">
+ <div class="snippet_row">
+ <div class="snippet-general">
+ <table align="center" cellspacing="0" cellpadding="0" class="table-styles" width="600">
+ <tbody>
+ <tr>
+ <td class="horizontal-padding vertical-padding">
+ <div class="text-center center-block">
+ <p class="display-coupon no-margin text-center text-beta" style="font-weight:800;">
+ $20
+ </p>
+ <span class="display-2">FROM YOUR NEXT ORDER!</span>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" style="width:600px;" class="vertical-padding">
+ <div style="width:600px;" class="separator"></div>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p class="text-center" style="margin-top:10px;">
+ Use This Promo Code BEFORE 1st of August
+ </p>
+ <p class="horizontal-padding vertical-padding display-2 text-center">
+ Code: <strong>45A9E77DGW8455</strong>
+ </p>
+ <p class="text-center">
+ to receive $20 from your next purchase!
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" style="width:600px;" class="vertical-padding">
+ <div style="width:600px;" class="separator"></div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+</template>
+
+<template id="s_mail_block_discount1" name="Discount Offer">
+ <div class="o_mail_block_discount1">
+ <div class="snippet_row">
+ <div class="snippet-general">
+ <table align="center" cellpadding="0" cellspacing="0" width="600" class="table-styles">
+ <tbody>
+ <tr>
+ <td class="horizontal-padding vertical-padding text-center col_mv" width="250">
+ <table>
<tr>
- <td style="padding:30px 15px;width:33%;text-align:center;background-color:#fff;color:#777777;font-size:14px" class="col_mv bg-color">
- &nbsp;
- <span class="fa fa-check fa-3x"></span>
- &nbsp;
- <p style="margin:0;font-size:24px;font-weight:bold">Step 1</p>
- <p style="margin:0">
- We need you to update your account information. If there is ever a problem with your account, this information will make it easier for you to log back in.
- </p>
+ <td>
+ <p class="display-coupon text-beta text-center no-margin" style="font-weight:800;">20%</p>
+ <p class="display-3 text-beta text-center" style="font-weight:800;">OFF</p>
</td>
- <td style="vertical-align:top; padding: 30px 15px; width:34%;text-align:center;background-color:#fff;color:#777777;font-size:14px" class="col_mv bg-color">
- &nbsp;
- <span class="fa fa-truck fa-3x"></span>
- &nbsp;
- <p style="margin:0;font-size:24px;font-weight:bold">Step 2</p>
- <p style="margin:0">
- We need you to update your account information. If there is ever a problem with your account, this information will make it easier for you to log back in.
- </p>
+ </tr>
+ <tr>
+ <td>
+ <p class="display-3 text-center">FROM YOUR NEXT ORDER! <br/> &nbsp;</p>
</td>
- <td style="vertical-align:top; padding: 30px 15px; width:33%;text-align:center;background-color:#fff;color:#777777;font-size:14px" class="col_mv bg-color">
+ </tr>
+ <tr>
+ <td class="text-center">
&nbsp;
- <span class="fa fa-usd fa-3x"></span>
+ <a href="#" class="newsletter-btn" style="margin-top:15px;">Redeem Discount!</a>
&nbsp;
- <p style="margin:0;font-size:24px;font-weight:bold">Step 3</p>
- <p style="margin:0">
- We need you to update your account information. If there is ever a problem with your account, this information will make it easier for you to log back in.
- </p>
</td>
</tr>
- </tbody>
- </table>
- </div>
- </div>
+ </table>
+ </td>
+ <td class="horizontal-padding vertical-padding col_mv" width="350">
+ <p class="no-margin">We are continuing to grow and we miss seeing you be a part of it! We've increased store hours and have lot's of new brands available. To welcome you back please accept this 20% discount on you next purchase by clicking the button.</p>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
+</template>
- <div name="Text Block" class="basic_theme o_mail_block_simple_text">
- <div class="snippet_row bg-color" style="padding:0;width:600px;max-width:600px;margin:0 auto;background: #fff repeat top /100%;color:#777777">
- <table style="width:100%;text-align:justify;margin:0 auto;background:inherit;color:inherit;border-collapse:collapse;color:inherit">
- <tr>
- <td style="padding:10px 30px;font-size:14px">
- <p style="margin:0">Dear ${object.name}</p>
- <p style="margin:0">Great stories have personality. Consider telling a great story that provides personality. Writing a story with personality for potential clients will assists with making a relationship connection. This shows up in small quirks like word choices or phrases. Write from your point of view, not from someone else's experience.<br/></p>
- <p style="margin:0">Great stories are for everyone even when only written for just one person. If you try to write with a wide general audience in mind, your story will ring false and be bland. No one will be interested. Write for one person. If it’s genuine for the one, it’s genuine for the rest.</p>
- <p style="margin:0">Kind Regards,</p>
- <p style="margin:0">Michael Fletcher</p>
+<template id="s_mail_block_event" name="Event">
+ <div class="o_mail_block_event">
+ <div class="snippet_row">
+ <div class="snippet-general">
+ <table align="center" cellpadding="0" cellspacing="0" width="600" class="table-styles">
+ <tr>
+ <td style="width:25%;height: 150px;vertical-align:middle;" class="horizontal-padding vertical-padding bg-beta text-center">
+ <span class="display-1">21</span>
+ <span class="display-1">Jul</span>
+ <span style="display: block;font-weight: 600" class="display-3">
+ ALL DAY
+ </span>
+ </td>
+ <td style="width:25%;height: 150px;" class="horizontal-padding vertical-padding text-center bg-delta">
+ <div style="margin:27px auto">
+ &nbsp;
+ <span class="fa fa-calendar fa-5x"></span>
+ &nbsp;
+ </div>
+ </td>
+ <td style="vertical-align:top;width:50%;height:150px;min-width:255px" class="col_mv">
+ <table style="width:100%;border-collapse:separate;">
+ <tr style="padding-right:5px;">
+ <td style="padding-top:20px;padding-left:20px;float:left" width="90%">
+ <div style="min-height:100px;text-align:left">
+ <p class="no-margin display-3">Your Event Name</p>
+ <p class="no-margin">Description</p>
+ </div>
+ <div style="padding-left:0">
+ <p style="display: table-cell;cursor: pointer;font-size: 11px;font-weight: 300;padding: 3px 30px;">
+ <a href="#" class="link-color">Link </a>
+ </p>
+ <p style="display: table-cell;cursor: pointer;font-size: 11px;font-weight: 300;padding: 3px 30px;">
+ <a href="#" class="link-color">Info</a>
+ </p>
+ </div>
+ </td>
+ <td style="vertical-align:middle;">
+ <div t-if="website" style="padding-left:16px">
+ <t t-if="website.social_facebook">
+ <div style="width:33%;margin-left:0">
+ <a t-att-href="website.social_facebook">
+ <span class="fa fa-facebook-square fa-2x"></span>
+ </a>
+ </div>
+ </t>
+ <t t-if="website.social_twitter">
+ <div style="width:34%;margin-left:0">
+ <a t-att-href="website.social_twitter">
+ <span class="fa fa-twitter-square fa-2x"></span>
+ </a>
+ </div>
+ </t>
+ <t t-if="website.social_googleplus">
+ <div style="width:33%;margin-left:0">
+ <a t-att-href="website.social_googleplus">
+ <span class="fa fa-google-plus-square fa-2x"></span>
+ </a>
+ </div>
+ </t>
+ </div>
</td>
</tr>
</table>
- </div>
- </div>
- </div>
+ </td>
+ </tr>
+ </table>
</div>
- <div id="email_designer_default_extra" class="o_panel">
- <div class="o_panel_header">
- <span class="fa-stack">
- <i class="fa fa-align-left fa-stack-1x" style="display: inline-block; height: 0.93em; margin-top: 0.3em; overflow: hidden;"></i>
- </span> Extra
- </div>
- <div class="o_panel_body">
- <div name="Separator" class="basic_theme o_mail_block_footer_seprator">
- <div style="padding:0px;width:600px;margin:auto;color:#777777;background-color:#FFFFFF">
- <table cellspacing="0" cellpadding="0" style="vertical-align:top;padding:0px;font-family:arial;font-size:12px;border-collapse:collapse;background:inherit;color:inherit">
- <tbody>
- <tr>
- <td valign="top" style="width:600px">
- <div>
- <hr width="100%" style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0;margin:15px auto;padding:0"/>
- </div>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
+ </div>
+ </div>
+</template>
- <div name="Tag Line" class="basic_theme o_mail_block_footer_tag_line">
- <div class="bg-color" style="padding:0px;width:600px;margin:auto;background:#fff;color:#777777">
- <table style="margin: 0 auto;border-collapse:collapse;background:inherit;color:inherit;width:600px" cellpadding="0" cellspacing="0">
- <tbody>
+<template id="s_mail_block_steps" name="Steps">
+ <div class="o_mail_block_steps">
+ <div class="snippet_row">
+ <div class="snippet-general">
+ <table align="center" cellspacing="0" cellpadding="0" class="table-styles" width="600">
+ <tbody>
+ <tr>
+ <td class="col_mv horizontal-padding vertical-padding bg-beta">
+ <table class="table-styles">
<tr>
- <td valign="center" style="text-align:center;padding:5px">
- <p style="margin:0;color:inherit;font-size:18px">Apps That Help You Grow Your Business</p>
+ <td rowspan="2">
+ &nbsp;
+ <span class="fa fa-hand-pointer-o fa-3x"></span>
+ &nbsp;
</td>
- </tr>
- </tbody>
- </table>
- </div>
- </div>
- </div>
- </div>
- <div id="email_designer_default_footer" class="o_panel">
- <div class="o_panel_header">
- <span class="fa-stack">
- <i class="fa fa-align-justify fa-stack-1x" style=" margin-top: 0.7em; height: 0.9em; display: inline-block; overflow: hidden;"></i>
- <i class="fa fa-arrow-down fa-stack-1x" style="display: inline-block; font-size: 0.6em; margin-top: -0.15em;"></i>
- </span> Footers
- </div>
- <div class="o_panel_body">
- <div t-if="website" name="Social + Text" class="basic_theme o_mail_block_footer_social">
- <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777">
- <table style="margin: 0 auto;border-collapse:collapse;background:inherit;color:inherit;width:600px" cellpadding="0" cellspacing="0">
- <tbody>
- <tr>
- <td valign="center" style="padding:10px 15px 10px 10px">
- <table border="0" cellpadding="0" cellspacing="0" align="center" style="border-collapse:collapse;color:inherit">
- <tr>
- <td align="right">
- &nbsp;
- <a t-att-href="(website.social_facebook) or '#'">
- <img src="/mass_mailing/static/src/img/theme_imgs/social_facebook.png" style="height:auto;max-width:70px" alt="social icon" />
- </a>
- </td>
- <td align="right" style="padding-left:5px">
- <a t-att-href="(website.social_twitter) or '#'">
- <img src="/mass_mailing/static/src/img/theme_imgs/social_twitter.png" style="height:auto;max-width:70px" alt="social icon" />
- </a>
- </td>
- <td align="right" style="padding-left:5px">
- <a t-att-href="(website.social_googleplus) or '#'">
- <img src="/mass_mailing/static/src/img/theme_imgs/social_googleplus.png" style="height:auto;max-width:70px" alt="social icon" />
- </a>
- </td>
- <td align="right" style="padding-left:5px">
- <a t-att-href="(website.social_linkedin) or '#'">
- <img src="/mass_mailing/static/src/img/theme_imgs/social_linkedin.png" style="height:auto;max-width:70px" alt="social icon" />
- </a>
- </td>
- <td align="right" style="padding-left:5px">
- <a href="#">
- <img src="/mass_mailing/static/src/img/theme_imgs/social_rss.png" style="height:auto;max-width:70px" alt="social icon" />
- </a>
- &nbsp;
- </td>
- </tr>
- </table>
+ <td style="padding-left:10px;">
+ <p style="font-weight:bold;margin:0 0 3px 0;" class="display-3">Step 1:</p>
+ <p class="no-margin">Register</p>
</td>
</tr>
+ </table>
+ </td>
+ <td class="col_mv horizontal-padding vertical-padding">
+ <table class="table-styles">
<tr>
- <td style="font-size:12px;text-align:center;padding:10px">
+ <td rowspan="2">
&nbsp;
- <a style="color:inherit" href="/unsubscribe_from_list">Unsubscribe</a> | <a style="color:inherit" href="/page/contactus">Contact</a>
+ <span class="fa fa-map-marker fa-3x"></span>
&nbsp;
</td>
+ <td style="padding-left:10px;">
+ <p style="font-weight:bold;margin:0 0 3px 0" class="display-3">Step 2:</p>
+ <p class="no-margin">Attend</p>
+ </td>
</tr>
- </tbody>
- </table>
- </div>
- </div>
-
- <div name="Text + Copyright" class="basic_theme o_mail_block_footer_copyright">
- <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#777777">
- <table cellspacing="0" cellpadding="0" style="margin:auto;width:600px;border-collapse:collapse;background:inherit;color:inherit">
- <tbody>
+ </table>
+ </td>
+ <td class="col_mv horizontal-padding vertical-padding">
+ <table class="table-styles">
<tr>
- <td style="font-size:12px;text-align:center;padding:10px">
+ <td rowspan="2">
&nbsp;
- <a style="color:inherit" href="/unsubscribe_from_list">Unsubscribe</a>
- <t t-if="website"> | <a style="color:inherit" href="/page/contactus">Contact</a> </t>
+ <span class="fa fa-money fa-3x"></span>
&nbsp;
</td>
- </tr>
- <tr>
- <td style="font-size:12px;text-align:center;padding-bottom:10px">
- <p style="margin:0">© 2014 All Rights Reserved</p>
+ <td style="padding-left:10px;">
+ <p style="font-weight:bold;margin:0 0 3px 0" class="display-3">Step 3:</p>
+ <p class="no-margin">Win</p>
</td>
</tr>
- </tbody>
- </table>
- </div>
- </div>
-
- <div name="Text Only" class="basic_theme o_mail_block_footer_text">
- <div class="snippet_row bg-color" style="padding:0px;width:600px;margin:auto;background: #fff repeat top /100%;color:#777777">
- <center>
- <table width="600" cellspacing="0" cellpadding="0" border="0" style="margin: 0 auto; width:600px; border-collapse:collapse;background:inherit;color:inherit">
- <tbody>
- <tr>
- <td valign="middle" align="right" style="font-size:12px;padding:20px;text-align:center">
- &nbsp;
- <t t-if="website">
- <a style="color:inherit" href="/page/contactus">Contact Us</a> |
- <a style="color:inherit" t-att-href="(website.social_facebook) or '#'">Facebook</a> |
- <a style="color:inherit" t-att-href="(website.social_twitter) or '#'">Twitter</a> |
- <a style="color:inherit" href="#">Support</a> |
- </t>
- <a href="/unsubscribe_from_list" style="color:inherit">Unsubscribe</a>
- &nbsp;
- </td>
- </tr>
- </tbody>
</table>
- </center>
- </div>
- </div>
- </div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
</div>
</div>
- </xpath>
+ </div>
+</template>
- <xpath expr="//div[@id='snippet_options']" position="inside">
- <t t-call="mass_mailing.snippet_options"/>
- </xpath>
+<template id="s_mail_block_footer_social" name="Footer">
+ <div class="o_mail_block_footer_social">
+ <div class="snippet_row">
+ <div class="snippet-general">
+ <table align="center" cellspacing="0" cellpadding="0" class="table-styles" width="600">
+ <tbody>
+ <tr>
+ <td style="text-align:center">
+ &nbsp;
+ <t t-if="website.social_facebook">
+ <a t-att-href="website.social_facebook" class="link-color">
+ <span class="fa fa-facebook-square fa-2x"></span>
+ </a>
+ </t>
+ <t t-if="website.social_googleplus">
+ <a t-att-href="website.social_googleplus" style="padding-left:5px;" class="link-color">
+ <span class="fa fa-google-plus-square fa-2x"></span>
+ </a>
+ </t>
+ <t t-if="website.social_linkedin">
+ <a t-att-href="website.social_linkedin" style="padding-left:5px;" class="link-color">
+ <span class="fa fa-linkedin-square fa-2x"></span>
+ </a>
+ </t>
+ <t t-if="website.social_twitter">
+ <a t-att-href="website.social_twitter" style="padding-left:5px;" class="link-color">
+ <span class="fa fa-twitter-square fa-2x"></span>
+ </a>
+ </t>
+ &nbsp;
+ </td>
+ </tr>
+ <tr>
+ <td style="font-size:12px;text-align:center;padding:10px">
+ &nbsp;
+ <a href="/unsubscribe_from_list" class="link-color">Unsubscribe</a> | <a href="/page/contactus" class="link-color">Contact</a>
+ &nbsp;
+ </td>
+ </tr>
+ <tr>
+ <td class="horizontal-padding vertical-padding">
+ <p style="font-size:12px;text-align:center;" class="no-margin">© 2014 All Rights Reserved</p>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div>
</template>
</odoo>
diff --git a/addons/mass_mailing/views/snippets_themes_options.xml b/addons/mass_mailing/views/snippets_themes_options.xml
index 7b2248b88c83b7f67f790b68bd49f63dff4ec0f1..8543391327832a52b68477bd521e59c9e70e8df2 100644
--- a/addons/mass_mailing/views/snippets_themes_options.xml
+++ b/addons/mass_mailing/views/snippets_themes_options.xml
@@ -2,7 +2,6 @@
<odoo>
<template id="snippet_options">
-
<t t-raw="0"/>
<div data-js='width-x'
@@ -10,8 +9,8 @@
</div>
<div data-js='table_row'
- data-selector=".row"
- data-drop-near=".row">
+ data-selector="tr:has(>.row), tr:has(>.col_mv)"
+ data-drop-near="tr:has(>.row), tr:has(>.col_mv)">
</div>
<div data-js='table_column'
@@ -25,22 +24,31 @@
</div>
<div data-js='content' class="hidden"
- data-selector="[data-oe-field='body_html'] > div, .oe_snippet_body"
- data-drop-near="[data-oe-field='body_html'] > *"
- data-drop-in="[data-oe-field='body_html']">
+ data-selector="[data-oe-field='body_html'] > div:not(.o_layout), [data-oe-field='body_html'] .oe_structure > div, .oe_snippet_body"
+ data-drop-near="[data-oe-field='body_html']:not(:has(.o_layout)) > *, .oe_structure > *"
+ data-drop-in="[data-oe-field='body_html']:not(:has(.o_layout)), .oe_structure">
</div>
<div data-js='resize'
data-selector="div.snippet_row"
- data-drop-in=".oe_structure, [data-oe-type=html]">
+ data-drop-in=".oe_structure, [data-oe-type=html]:not(:has(.o_layout))">
</div>
-
- <div data-js='background'
+
+ <!-- <div data-js='background'
data-selector="div.snippet_row">
<li data-choose_image="choose_image" data-background=""><a>Choose a background image</a></li>
<li data-background=""><a>No background image</a></li>
+ </div> -->
+
+ <div data-js="colorpicker"
+ data-selector="div.snippet_row td">
+ <li class="dropdown-submenu">
+ <a tabindex="-1" href="#"><i class="fa fa-eyedropper"/>Background Color</a>
+ <ul class="dropdown-menu">
+ <li></li>
+ </ul>
+ </li>
</div>
-
</template>
</odoo>
diff --git a/addons/mass_mailing/views/theme_list.xml b/addons/mass_mailing/views/theme_list.xml
deleted file mode 100644
index 06352512daa1ef105636c43ce056e5ae34e23ff4..0000000000000000000000000000000000000000
--- a/addons/mass_mailing/views/theme_list.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
- <template id="mass_mail_theme_list">
- <div id="email_theme_list">
- <div>
- <div class="theme_thumbnail">
- <div class="overlay text-center">
- <p>Basic Theme</p>
- <a class="btn btn-primary btn-sm" data-snippet-theme="basic_theme"> Select </a>
- </div>
- <img class="img img-responsive img-thumbnail" src="/website_mail/static/src/img/thumbnail/basic.png"/>
- </div>
- </div>
- </div>
- </template>
-
-</odoo>
diff --git a/addons/web_editor/static/src/js/backend.js b/addons/web_editor/static/src/js/backend.js
index 468fab0c72899cb45a860526efba5fba51fa18c2..a20da344b0345f2d1123acb19db9da71c5f3db0d 100644
--- a/addons/web_editor/static/src/js/backend.js
+++ b/addons/web_editor/static/src/js/backend.js
@@ -251,7 +251,7 @@ var FieldTextHtml = widget.extend({
attr.translatable = 1;
}
if (session.debug) {
- attr.debug = 1;
+ attr.debug = session.debug;
}
attr.lang = attr.enable_editor ? 'en_US' : this.session.user_context.lang;
diff --git a/addons/web_editor/static/src/js/transcoder.js b/addons/web_editor/static/src/js/transcoder.js
index 89831d35d50bf1fab8227ee5b66caa1bf4c2aaa4..fbdc4b34b8758c8a9c792e33043a6b291de4f5c9 100644
--- a/addons/web_editor/static/src/js/transcoder.js
+++ b/addons/web_editor/static/src/js/transcoder.js
@@ -58,6 +58,9 @@ var getMatchedCSSRules = function (a) {
if (style.parentRule) {
var style_obj = {};
for (var k=0, len=style.length; k<len; k++) {
+ if (style[k].indexOf('animation') !== -1) {
+ continue;
+ }
style_obj[style[k]] = style[style[k].replace(/-(.)/g, function (a, b) { return b.toUpperCase(); })];
if (new RegExp(style[k] + '\s*:[^:;]+!important' ).test(style.cssText)) {
style_obj[style[k]] += ' !important';
@@ -72,11 +75,11 @@ var getMatchedCSSRules = function (a) {
function specificity (selector) {
// http://www.w3.org/TR/css3-selectors/#specificity
var a = 0;
- selector.replace(/#[a-z0-9_-]+/gi, function () { a++; return ""; });
+ selector = selector.replace(/#[a-z0-9_-]+/gi, function () { a++; return ""; });
var b = 0;
- selector.replace(/(\.[a-z0-9_-]+)|(\[.*?\])/gi, function () { b++; return ""; });
+ selector = selector.replace(/(\.[a-z0-9_-]+)|(\[.*?\])/gi, function () { b++; return ""; });
var c = 0;
- selector.replace(/(\s+|:+)[a-z0-9_-]+/gi, function (a) { if(a.indexOf(':not(')===-1) c++; return ""; });
+ selector = selector.replace(/(^|\s+|:+)[a-z0-9_-]+/gi, function (a) { if(a.indexOf(':not(')===-1) c++; return ""; });
return a*100 + b*10 + c;
}
css.sort(function (a, b) { return specificity(a[0]) - specificity(b[0]); });
diff --git a/addons/web_editor/static/src/less/web_editor.ui.less b/addons/web_editor/static/src/less/web_editor.ui.less
index 2a4b529b73426be76db5f826aa3ffe048f3add2b..bbf8b6ce76495db57cd105544c8652992507d7c3 100644
--- a/addons/web_editor/static/src/less/web_editor.ui.less
+++ b/addons/web_editor/static/src/less/web_editor.ui.less
@@ -118,6 +118,8 @@ html[lang] > body.editor_enable{
.o-align-items(center);
.o-justify-content(center);
padding: 3%;
+ color: white;
+ margin-bottom: 3%;
i {
margin-right: 5px;
@@ -133,7 +135,7 @@ html[lang] > body.editor_enable{
.oe_snippet {
float: left;
width: 45.5%;
- margin: 0 0 3% 3%;
+ margin: 0 0 6% 3%;
box-shadow: none;
background-color: transparent;
.user-select(none);
@@ -201,12 +203,12 @@ html[lang] > body.editor_enable{
}
.oe_snippet_thumbnail_title {
display: block;
- border: 1px solid @o-we-color-normal;
+ border: 1px solid @o-we-color-dark;
padding: 5px;
font-size: 12px;
- font-weight: 600;
+ font-weight: 300;
text-shadow: none;
- color: @o-we-color-text-normal;
+ color: @o-we-color-text-light;
}
&:hover .oe_snippet_thumbnail_title {
color: white;
@@ -1055,29 +1057,15 @@ body.editor_enable {
#web_editor_inside_iframe {
background-color: @odoo-brand-secondary;
- #editable_area {
- font: inherit !important;
- line-height: inherit !important;
- color: inherit !important;
-
- p {
- margin: initial;
- }
- a, a:hover {
- color: inherit;
- }
- }
&.editor_enable #wrapwrap {
height: 100%;
- padding-top: @odoo-navbar-height;
> main {
height: 100%;
#editable_area {
position: relative;
overflow: hidden;
- max-width: 600px;
min-height: 100%;
- margin: auto;
+ margin: 0 auto;
background-color: white;
}
diff --git a/addons/web_editor/static/src/xml/backend.xml b/addons/web_editor/static/src/xml/backend.xml
index cd13dfa115a05b036eb8cf006d45ff519507cc8e..4035752cea5a11a5eb67d5fb0493df7c7355241a 100644
--- a/addons/web_editor/static/src/xml/backend.xml
+++ b/addons/web_editor/static/src/xml/backend.xml
@@ -50,8 +50,8 @@
</t>
<t t-name="web_editor.FieldTextHtml.fullscreen">
<span style="margin: 5px; position: fixed; top: 0; right: 0; z-index: 2000;">
- <button class="o_fullscreen btn btn-primary" style="height: 24px; padding: 1px 2px 1px 3px;">
- <span class="fa fa-expand fa-lg oe_input_icon"/>
+ <button class="o_fullscreen btn btn-primary" style="width: 24px; height: 24px; background-color: #337ab7; border: 1px solid #2e6da4; border-radius: 4px; padding: 0; position: relative;">
+ <img src="/web_editor/font_to_img/61541/rgb(255,255,255)/16" style="position: absolute; top: 3px; left: 4px;"/>
</button>
</span>
</t>
diff --git a/addons/web_editor/views/iframe.xml b/addons/web_editor/views/iframe.xml
index 6ed1f39eddf661ddb22548f7862b03bdc233e551..b73611f545a464f543e2a8f5fcef3127cc5b99a1 100644
--- a/addons/web_editor/views/iframe.xml
+++ b/addons/web_editor/views/iframe.xml
@@ -40,7 +40,7 @@
if (window.top.odoo && !window.top.odoo[callback+"_updown"]) {
window.top.odoo[callback+"_updown"] = function (value, fields_values) {
var editable = document.getElementsByClassName("o_editable")[0];
- if (value !== editable.innerHTML) {
+ if (editable && value !== editable.innerHTML) {
editable.innerHTML = value;
}
};