[MERGE] forward port of branch saas-9 up to 469e04e

9 files changed, 62 insertions, 54 deletions

diff --git a/addons/web_editor/i18n/es.po b/addons/web_editor/i18n/es.po
index 09ad94fddef..f8da54d6530 100644
--- a/addons/web_editor/i18n/es.po
+++ b/addons/web_editor/i18n/es.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Ana Juaristi <ajuaristio@gmail.com>, 2015
+# Antonio Trueba, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-29 10:26+0000\n"
-"PO-Revision-Date: 2015-12-07 23:11+0000\n"
-"Last-Translator: Ana Juaristi <ajuaristio@gmail.com>\n"
+"PO-Revision-Date: 2016-01-25 18:17+0000\n"
+"Last-Translator: Antonio Trueba\n"
 "Language-Team: Spanish (http://www.transifex.com/odoo/odoo-9/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -71,21 +72,21 @@ msgstr "Añadir una URL de imágen"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:761
 #, python-format
 msgid "Align center"
-msgstr ""
+msgstr "Alinear al centro"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:760
 #, python-format
 msgid "Align left"
-msgstr ""
+msgstr "Alinear a la izquierda"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:762
 #, python-format
 msgid "Align right"
-msgstr ""
+msgstr "Alinear a la derecha"
 
 #. module: web_editor
 #. openerp-web
@@ -146,7 +147,7 @@ msgstr "Estilo de bloque"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:688
 #, python-format
 msgid "Bold"
-msgstr ""
+msgstr "Negrita"
 
 #. module: web_editor
 #. openerp-web
@@ -283,7 +284,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/js/rte.summernote.js:708
 #, python-format
 msgid "Drag an image here"
-msgstr ""
+msgstr "Arrastre aquí una imagen"
 
 #. module: web_editor
 #. openerp-web
@@ -319,14 +320,14 @@ msgstr "Vídeo incrustado (HTML)"
 #: code:addons/web_editor/static/src/xml/backend.xml:44
 #, python-format
 msgid "English"
-msgstr ""
+msgstr "Inglés"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/xml/backend.xml:43
 #, python-format
 msgid "English (edit mode)"
-msgstr ""
+msgstr "Inglés (modo de edición)"
 
 #. module: web_editor
 #. openerp-web
@@ -368,21 +369,21 @@ msgstr ""
 #: code:addons/web_editor/static/src/js/rte.summernote.js:697
 #, python-format
 msgid "Font Size"
-msgstr ""
+msgstr "Tamaño de letra"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:769
 #, python-format
 msgid "Foreground Color"
-msgstr ""
+msgstr "Color de primer plano"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:753
 #, python-format
 msgid "Full Screen"
-msgstr ""
+msgstr "Pantalla completa"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_http
@@ -394,42 +395,42 @@ msgstr "Enrutado HTTP"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:740
 #, python-format
 msgid "Header 1"
-msgstr ""
+msgstr "Encabezado 1"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:741
 #, python-format
 msgid "Header 2"
-msgstr ""
+msgstr "Encabezado 2"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:742
 #, python-format
 msgid "Header 3"
-msgstr ""
+msgstr "Encabezado 3"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:743
 #, python-format
 msgid "Header 4"
-msgstr ""
+msgstr "Encabezado 4"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:744
 #, python-format
 msgid "Header 5"
-msgstr ""
+msgstr "Encabezado 5"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:745
 #, python-format
 msgid "Header 6"
-msgstr ""
+msgstr "Encabezado 6"
 
 #. module: web_editor
 #. openerp-web
@@ -523,7 +524,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/js/rte.summernote.js:689
 #, python-format
 msgid "Italic"
-msgstr ""
+msgstr "Cursiva"
 
 #. module: web_editor
 #. openerp-web
@@ -537,7 +538,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/js/rte.summernote.js:776
 #, python-format
 msgid "Keyboard shortcuts"
-msgstr ""
+msgstr "Atajos de teclado"
 
 #. module: web_editor
 #. openerp-web
@@ -649,7 +650,7 @@ msgstr "Abrir en una ventana nueva"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:749
 #, python-format
 msgid "Ordered list"
-msgstr ""
+msgstr "Lista ordenada"
 
 #. module: web_editor
 #. openerp-web
@@ -670,7 +671,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/js/rte.summernote.js:757
 #, python-format
 msgid "Paragraph"
-msgstr ""
+msgstr "Párrafo"
 
 #. module: web_editor
 #. openerp-web
@@ -712,7 +713,7 @@ msgstr "Primario"
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "Primary Color"
-msgstr ""
+msgstr "Coor primario"
 
 #. module: web_editor
 #. openerp-web
@@ -740,7 +741,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/js/rte.summernote.js:785
 #, python-format
 msgid "Redo"
-msgstr ""
+msgstr "Rehacer"
 
 #. module: web_editor
 #. openerp-web
@@ -883,7 +884,7 @@ msgstr "Establecer una URL de vídeo"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:771
 #, python-format
 msgid "Set transparent"
-msgstr ""
+msgstr "Fijar a transparente"
 
 #. module: web_editor
 #. openerp-web
@@ -974,14 +975,14 @@ msgstr "Tabla"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:778
 #, python-format
 msgid "Text formatting"
-msgstr ""
+msgstr "Formato de texto"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/rte.summernote.js:718
 #, python-format
 msgid "Text to display"
-msgstr ""
+msgstr "Texto a mostrar"
 
 #. module: web_editor
 #. openerp-web
@@ -1005,7 +1006,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/xml/editor.xml:203
 #, python-format
 msgid "Title:"
-msgstr ""
+msgstr "Título:"
 
 #. module: web_editor
 #. openerp-web
@@ -1026,7 +1027,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/js/rte.summernote.js:770
 #, python-format
 msgid "Transparent"
-msgstr ""
+msgstr "Transparente"
 
 #. module: web_editor
 #. openerp-web
@@ -1047,7 +1048,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/js/rte.summernote.js:784
 #, python-format
 msgid "Undo"
-msgstr ""
+msgstr "Deshacer"
 
 #. module: web_editor
 #. openerp-web
@@ -1061,7 +1062,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/js/rte.summernote.js:748
 #, python-format
 msgid "Unordered list"
-msgstr ""
+msgstr "Lista sin ordenar"
 
 #. module: web_editor
 #. openerp-web
diff --git a/addons/web_editor/i18n/es_MX.po b/addons/web_editor/i18n/es_MX.po
index 2db7c1a1cf8..1f09acd2cb9 100644
--- a/addons/web_editor/i18n/es_MX.po
+++ b/addons/web_editor/i18n/es_MX.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-29 10:26+0000\n"
-"PO-Revision-Date: 2016-01-20 17:35+0000\n"
+"PO-Revision-Date: 2016-01-27 17:34+0000\n"
 "Last-Translator: David Hernandez <davidhernandez.ctam@gmail.com>\n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/odoo/odoo-9/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
@@ -1151,7 +1151,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/xml/editor.xml:179
 #, python-format
 msgid "all"
-msgstr ""
+msgstr "todo"
 
 #. module: web_editor
 #. openerp-web
diff --git a/addons/web_editor/i18n/it.po b/addons/web_editor/i18n/it.po
index 26868cfa6d8..18034ad3058 100644
--- a/addons/web_editor/i18n/it.po
+++ b/addons/web_editor/i18n/it.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-29 10:26+0000\n"
-"PO-Revision-Date: 2016-01-15 14:21+0000\n"
+"PO-Revision-Date: 2016-01-26 10:43+0000\n"
 "Last-Translator: Riccardo Di Maio <riccardodimaio11@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/odoo/odoo-9/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -1047,7 +1047,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/js/rte.summernote.js:784
 #, python-format
 msgid "Undo"
-msgstr ""
+msgstr "Annulla"
 
 #. module: web_editor
 #. openerp-web
diff --git a/addons/web_editor/i18n/ko.po b/addons/web_editor/i18n/ko.po
index b6ad5a4f8a8..52d1090cc8b 100644
--- a/addons/web_editor/i18n/ko.po
+++ b/addons/web_editor/i18n/ko.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-29 10:26+0000\n"
-"PO-Revision-Date: 2016-01-09 20:02+0000\n"
+"PO-Revision-Date: 2016-01-25 08:56+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: Korean (http://www.transifex.com/odoo/odoo-9/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -261,7 +261,7 @@ msgstr "편집본 폐기"
 #. module: web_editor
 #: model:ir.model.fields,field_description:web_editor.field_web_editor_converter_test_sub_display_name
 msgid "Display Name"
-msgstr ""
+msgstr "표시 이름"
 
 #. module: web_editor
 #. openerp-web
diff --git a/addons/web_editor/i18n/ru.po b/addons/web_editor/i18n/ru.po
index 4639039689b..9afa0080b83 100644
--- a/addons/web_editor/i18n/ru.po
+++ b/addons/web_editor/i18n/ru.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: Odoo 9.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-29 10:26+0000\n"
-"PO-Revision-Date: 2016-01-19 19:13+0000\n"
+"PO-Revision-Date: 2016-01-30 07:47+0000\n"
 "Last-Translator: Gennady Marchenko <gennadym@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/odoo/odoo-9/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -982,7 +982,7 @@ msgstr "Порматирование Текста"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:718
 #, python-format
 msgid "Text to display"
-msgstr ""
+msgstr "Отображаемый текст"
 
 #. module: web_editor
 #. openerp-web
@@ -1041,7 +1041,7 @@ msgstr "URL или адрес электронной почты"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:690
 #, python-format
 msgid "Underline"
-msgstr ""
+msgstr "Подчеркивание"
 
 #. module: web_editor
 #. openerp-web
@@ -1062,7 +1062,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/js/rte.summernote.js:748
 #, python-format
 msgid "Unordered list"
-msgstr ""
+msgstr "Неупорядоченный список"
 
 #. module: web_editor
 #. openerp-web
@@ -1076,7 +1076,7 @@ msgstr "Загрузите изображение со своего компью
 #: code:addons/web_editor/static/src/xml/editor.xml:102
 #, python-format
 msgid "Upload image without optimization"
-msgstr ""
+msgstr "Загрузить изображение без оптимизации"
 
 #. module: web_editor
 #. openerp-web
@@ -1117,21 +1117,21 @@ msgstr "Внимание"
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "Warning Color"
-msgstr ""
+msgstr "Цвет предупреждения"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/editor.js:104
 #, python-format
 msgid "Write Your Text Here"
-msgstr ""
+msgstr "Введите Ваш текст здесь"
 
 #. module: web_editor
 #. openerp-web
 #: code:addons/web_editor/static/src/js/editor.js:108
 #, python-format
 msgid "Write Your Text or Drag a Block Here"
-msgstr ""
+msgstr "Введите Ваш текст или перетащите блок сюда"
 
 #. module: web_editor
 #. openerp-web
diff --git a/addons/web_editor/static/src/css/backend.css b/addons/web_editor/static/src/css/backend.css
index 33a7155354c..2512b1de9c0 100644
--- a/addons/web_editor/static/src/css/backend.css
+++ b/addons/web_editor/static/src/css/backend.css
@@ -5,7 +5,7 @@
     line-height: initial !important;
     color: initial !important;
 }
-.oe_form_field_html_text iframe.o_readonly {
+.oe_form_field_html_text .o_readonly {
     min-height: 1em;
     width: 100%;
     margin: 0;
diff --git a/addons/web_editor/static/src/js/backend.js b/addons/web_editor/static/src/js/backend.js
index becd0fe4769..7649d923f98 100644
--- a/addons/web_editor/static/src/js/backend.js
+++ b/addons/web_editor/static/src/js/backend.js
@@ -73,7 +73,7 @@ var FieldTextHtmlSimple = widget.extend({
                     self.resize();
                 });
             } else {
-                this.$content = $('<div class="note-editable o_readonly"/>');
+                this.$content = $('<div class="o_readonly"/>');
                 this.$textarea.hide().after(this.$content);
             }
         } else {
diff --git a/addons/web_editor/static/src/js/summernote.js b/addons/web_editor/static/src/js/summernote.js
index e31faaab601..e4d1c5b27c4 100644
--- a/addons/web_editor/static/src/js/summernote.js
+++ b/addons/web_editor/static/src/js/summernote.js
@@ -1065,11 +1065,6 @@ $.summernote.pluginEvents.enter = function (event, editor, layoutInfo) {
     var exist = r.sc.childNodes[r.so] || r.sc;
     var node = dom.node(exist);
     exist = dom.isVisibleText(exist) || dom.isBR(exist) ? exist : dom.hasContentAfter(exist) || (dom.hasContentBefore(exist) || exist);
-    var last = node;
-    while (node && dom.isSplitable(node) && !dom.isList(node)) {
-        last = node;
-        node = node.parentNode;
-    }
 
     // table: add a tr
     var td = dom.ancestor(node, dom.isCell);
@@ -1083,7 +1078,15 @@ $.summernote.pluginEvents.enter = function (event, editor, layoutInfo) {
         dom.scrollIntoViewIfNeeded(br);
         event.preventDefault();
         return false;
-    } else if (last === node && !dom.isBR(node)) {
+    }
+
+    var last = node;
+    while (node && dom.isSplitable(node) && !dom.isList(node)) {
+        last = node;
+        node = node.parentNode;
+    }
+
+    if (last === node && !dom.isBR(node)) {
         node = r.insertNode(br, true);
         if (isFormatNode(last.firstChild) && $(last).closest(options.styleTags.join(',')).length) {
             dom.moveContent(last.firstChild, last);
diff --git a/addons/web_editor/static/src/js/transcoder.js b/addons/web_editor/static/src/js/transcoder.js
index c26ba163d11..361c072a48c 100644
--- a/addons/web_editor/static/src/js/transcoder.js
+++ b/addons/web_editor/static/src/js/transcoder.js
@@ -173,7 +173,11 @@ var class_to_style = function ($editable) {
                 style = k+":"+v+";"+style;
             }
         });
-        $target.attr("style", style);
+        if (_.isEmpty(style)) {
+            $target.removeAttr("style");
+        } else {
+            $target.attr("style", style);
+        }
     });
 };
 // convert style into inline class from mail