[MERGE] forward port of branch 9.0 up to ddd3e08

3 files changed, 5 insertions, 2 deletions

diff --git a/addons/web_editor/static/src/css/backend.css b/addons/web_editor/static/src/css/backend.css
index 29871c3d305..42871187d12 100644
--- a/addons/web_editor/static/src/css/backend.css
+++ b/addons/web_editor/static/src/css/backend.css
@@ -5,6 +5,9 @@
     line-height: initial !important;
     color: initial !important;
 }
+.oe_form_field_html_text .note-editable.o_readonly {
+    min-height: 1em;
+}
 .oe_form_field_html_text .note-editable p {
     margin: initial;
 }
diff --git a/addons/web_editor/static/src/js/backend.js b/addons/web_editor/static/src/js/backend.js
index eca913e1309..acf603697b8 100644
--- a/addons/web_editor/static/src/js/backend.js
+++ b/addons/web_editor/static/src/js/backend.js
@@ -64,7 +64,7 @@ var FieldTextHtmlSimple = widget.extend({
         this.$textarea = this.$("textarea").val(this.get('value') || "<p><br/></p>");
 
         if (this.get("effective_readonly")) {
-            this.$textarea.hide().after('<div class="note-editable"/>');
+            this.$textarea.hide().after('<div class="note-editable o_readonly"/>');
         } else {
             this.$textarea.summernote(this._config());
 
diff --git a/addons/web_editor/static/src/js/translator.js b/addons/web_editor/static/src/js/translator.js
index b9ed671020d..39efbe1db2f 100644
--- a/addons/web_editor/static/src/js/translator.js
+++ b/addons/web_editor/static/src/js/translator.js
@@ -319,7 +319,7 @@ if (edit_translations) {
             this.action = this.action.replace(/[$?]edit_translations[^&?]+/, '');
         });
 
-        $('title').html($('title').html().replace(/&lt;span data-oe-translation-id.+?&gt;(.+?)&lt;\/span&gt;/, '\$1'));
+        $('title').html($('title').html().replace(/&lt;span data-oe-model.+?&gt;(.+?)&lt;\/span&gt;/, '\$1'));
     });
 }