[MERGE] forward port branch saas-11.1 up to 7e469eb77aa

3 files changed, 26 insertions, 16 deletions

diff --git a/addons/mass_mailing/i18n/zh_CN.po b/addons/mass_mailing/i18n/zh_CN.po
index 479bec65409..23fbbde7ef7 100644
--- a/addons/mass_mailing/i18n/zh_CN.po
+++ b/addons/mass_mailing/i18n/zh_CN.po
@@ -3,13 +3,13 @@
 # * mass_mailing
 # 
 # Translators:
-# Jeffery CHEN <jeffery9@gmail.com>, 2016
-# fausthuang <faust_huang@hotmail.com>, 2017
+# Jeffery CHEN Fan <jeffery9@gmail.com>, 2016
+# fausthuang, 2017
 # 卓忆科技 <zhanghao@jointd.com>, 2017
 # LIYan <liliane.li@elico-corp.com>, 2017
-# Bo Cao <cao.poobo@hotmail.com>, 2017
+# Bo Cao, 2017
 # Yuan Xulei <hi@yxl.name>, 2017
-# Martin Trigaux <mat@odoo.com>, 2017
+# Martin Trigaux, 2017
 # 钟小华 <mackz@sina.com>, 2017
 # Gary Wei <Gary.wei@elico-corp.com>, 2017
 # niulin lnc. <admin@niulin.net>, 2017
@@ -35,7 +35,7 @@ msgstr ""
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_comparison_table
 msgid "$18"
-msgstr ""
+msgstr "$18"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_discount2
@@ -77,6 +77,9 @@ msgid ""
 "                                        <span class=\"fa fa-compass fa-2x text-delta\"/>\n"
 "                                        &amp;nbsp;"
 msgstr ""
+"&amp;nbsp;\n"
+" 1\n"
+" &amp;nbsp"
 
 #. module: mass_mailing
 #: model:ir.ui.view,arch_db:mass_mailing.s_mail_block_steps
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 e88d77864d2..62f2062b75c 100644
--- a/addons/mass_mailing/static/src/js/mass_mailing_editor.js
+++ b/addons/mass_mailing/static/src/js/mass_mailing_editor.js
@@ -327,20 +327,20 @@ snippets_editor.Class.include({
             $body.removeClass(all_classes).addClass(theme_params.className);
 
             var $old_layout = $editable_area.find(".o_layout");
-            // This wrapper structure is the only way to have a responsive and
-            // centered fixed-width content column on all mail clients
             var $new_wrapper, $new_wrapper_content;
 
             if (theme_params.nowrap) {
                 $new_wrapper = $new_wrapper_content = $("<div/>", {"class": "oe_structure"});
             }
             else {
+                // This wrapper structure is the only way to have a responsive and
+                // centered fixed-width content column on all mail clients
                 $new_wrapper = $('<table/>', {class: 'o_mail_wrapper'});
-                $new_wrapper_content = $("<td/>", {class: 'o_mail_no_resize o_mail_wrapper_td oe_structure'});
+                $new_wrapper_content = $("<td/>", {class: 'o_mail_no_resize o_mail_no_colorpicker o_mail_wrapper_td oe_structure'});
                 $new_wrapper.append($('<tr/>').append(
-                    $("<td/>", {class: 'o_mail_no_resize'}),
+                    $("<td/>", {class: 'o_mail_no_resize o_not_editable', contenteditable: 'false'}),
                     $new_wrapper_content,
-                    $("<td/>", {class: 'o_mail_no_resize'})
+                    $("<td/>", {class: 'o_mail_no_resize o_not_editable', contenteditable: 'false'})
                 ));
             }
             var $new_layout = $("<div/>", {"class": "o_layout " + theme_params.className}).append($new_wrapper);
diff --git a/addons/mass_mailing/views/snippets_themes_options.xml b/addons/mass_mailing/views/snippets_themes_options.xml
index 50c40473f12..dd8cdee5a9e 100644
--- a/addons/mass_mailing/views/snippets_themes_options.xml
+++ b/addons/mass_mailing/views/snippets_themes_options.xml
@@ -6,9 +6,12 @@
     <t t-raw="0"/>
 
     <div data-js="sizing_x"
-        data-selector="img, .mv, .col_mv, td:not(.o_mail_no_resize), th"/>
+        data-selector="img, .mv, .col_mv, td, th"
+        data-exclude=".o_mail_no_resize, .o_mail_wrapper_td"/>
 
-    <div data-js="table_item" data-selector="td, th"/>
+    <div data-js="table_item"
+        data-selector="td, th"
+        data-exclude=".o_mail_wrapper_td"/>
 
     <div data-js="table_row"
         data-selector="tr:has(> .row), tr:has(> .col_mv)"
@@ -17,11 +20,13 @@
 
     <div data-js="table_column"
         data-selector=".col>td, .col>th"
+        data-exclude=".o_mail_wrapper_td"
         data-drop-near=".col>td, .col>th">
     </div>
 
     <div data-js="table_column_mv"
         data-selector=".col_mv, td, th"
+        data-exclude=".o_mail_wrapper_td"
         data-drop-near=".col_mv, td, th">
     </div>
 
@@ -32,14 +37,16 @@
     </div>
 
     <div data-js="sizing_y"
-        data-selector="[data-oe-field='body_html'] > div:not(.o_layout), [data-oe-field='body_html'] .oe_structure > div, td:not(.o_mail_no_resize), th"/>
+        data-selector="[data-oe-field='body_html'] > div:not(.o_layout), [data-oe-field='body_html'] .oe_structure > div, th"
+        data-exclude=".o_mail_no_resize, .o_mail_wrapper_td">
 
     <div data-js="colorpicker"
         data-selector="
-            [data-oe-field='body_html'] > div:not(.o_layout):not(.o_mail_no_colorpicker),
-            [data-oe-field='body_html'] .oe_structure > div:not(.o_mail_no_colorpicker),
+            [data-oe-field='body_html'] > div:not(.o_layout),
+            [data-oe-field='body_html'] .oe_structure > div,
             td, th
-        ">
+        "
+        data-exclude=".o_mail_no_colorpicker">
         <li class="dropdown-submenu">
             <a tabindex="-1" href="#"><i class="fa fa-eyedropper"/>Background Color</a>
             <ul class="dropdown-menu">