[MERGE] forward port of branch saas-10 up to 1e86774

7 files changed, 76 insertions, 46 deletions

diff --git a/addons/web_editor/i18n/cs.po b/addons/web_editor/i18n/cs.po
index c11f038e1e9..61303d96ff4 100644
--- a/addons/web_editor/i18n/cs.po
+++ b/addons/web_editor/i18n/cs.po
@@ -3,13 +3,14 @@
 # * web_editor
 # 
 # Translators:
+# Adam Kettner <cetnerix@gmail.com>, 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-10-23 14:09+0000\n"
-"Last-Translator: Martin Trigaux\n"
+"PO-Revision-Date: 2016-04-28 07:09+0000\n"
+"Last-Translator: Adam Kettner <cetnerix@gmail.com>\n"
 "Language-Team: Czech (http://www.transifex.com/odoo/odoo-9/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -261,7 +262,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 "Zobrazovaný název"
 
 #. module: web_editor
 #. openerp-web
@@ -1096,7 +1097,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/js/rte.summernote.js:724
 #, python-format
 msgid "Video Link"
-msgstr ""
+msgstr "Video odkaz"
 
 #. module: web_editor
 #. openerp-web
diff --git a/addons/web_editor/i18n/mk.po b/addons/web_editor/i18n/mk.po
index 8ff47325a7d..b80bf8a035e 100644
--- a/addons/web_editor/i18n/mk.po
+++ b/addons/web_editor/i18n/mk.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-04-22 13:33+0000\n"
+"PO-Revision-Date: 2016-04-27 13:30+0000\n"
 "Last-Translator: Aleksandar Vangelovski <aleksandarv@hbee.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/odoo/odoo-9/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -382,7 +382,7 @@ msgstr ""
 #: code:addons/web_editor/static/src/js/rte.summernote.js:753
 #, python-format
 msgid "Full Screen"
-msgstr ""
+msgstr "Цел екран"
 
 #. module: web_editor
 #: model:ir.model,name:web_editor.model_ir_http
diff --git a/addons/web_editor/i18n/nb.po b/addons/web_editor/i18n/nb.po
index fd2771625a2..79f45984b3e 100644
--- a/addons/web_editor/i18n/nb.po
+++ b/addons/web_editor/i18n/nb.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-15 07:59+0000\n"
+"PO-Revision-Date: 2016-04-30 18:51+0000\n"
 "Last-Translator: Martin Trigaux\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/odoo/odoo-9/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -261,7 +261,7 @@ msgstr "Forkast utgave"
 #. module: web_editor
 #: model:ir.model.fields,field_description:web_editor.field_web_editor_converter_test_sub_display_name
 msgid "Display Name"
-msgstr ""
+msgstr "Visnings navn"
 
 #. module: web_editor
 #. openerp-web
diff --git a/addons/web_editor/i18n/ru.po b/addons/web_editor/i18n/ru.po
index bfc2cc17ac6..8ed223776f4 100644
--- a/addons/web_editor/i18n/ru.po
+++ b/addons/web_editor/i18n/ru.po
@@ -5,13 +5,14 @@
 # Translators:
 # Amaro Vita <vita.amaro@gmail.com>, 2015
 # Gennady Marchenko <gennadym@gmail.com>, 2016
+# Viktor Pogrebniak <vp@aifil.ru>, 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: 2016-02-01 13:46+0000\n"
-"Last-Translator: Gennady Marchenko <gennadym@gmail.com>\n"
+"PO-Revision-Date: 2016-05-01 02:57+0000\n"
+"Last-Translator: Viktor Pogrebniak <vp@aifil.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/odoo/odoo-9/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -126,7 +127,7 @@ msgstr "Автозапуск"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:768
 #, python-format
 msgid "Background Color"
-msgstr "Цвет Фона"
+msgstr "Цвет фона"
 
 #. module: web_editor
 #. openerp-web
@@ -231,7 +232,7 @@ msgstr "Опасность"
 #. module: web_editor
 #: model:ir.ui.view,arch_db:web_editor.colorpicker
 msgid "Danger Color"
-msgstr "Цвет Предупреждений"
+msgstr "Цвет предупреждений"
 
 #. module: web_editor
 #. openerp-web
@@ -277,7 +278,7 @@ msgstr "Документ"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:781
 #, python-format
 msgid "Document Style"
-msgstr "Стиль Документа"
+msgstr "Стиль документа"
 
 #. module: web_editor
 #. openerp-web
@@ -298,7 +299,7 @@ msgstr "Нажмите и удерживайте, чтобы перемести�
 #: code:addons/web_editor/static/src/xml/snippets.xml:39
 #, python-format
 msgid "Duplicate Container"
-msgstr "Дублировать хранилище"
+msgstr "Дублировать элемент"
 
 #. module: web_editor
 #. openerp-web
@@ -463,7 +464,7 @@ msgstr "Изображение"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:710
 #, python-format
 msgid "Image URL"
-msgstr "Адрес Изображения"
+msgstr "URL изображения"
 
 #. module: web_editor
 #. openerp-web
@@ -524,7 +525,7 @@ msgstr "Вставить видео "
 #: code:addons/web_editor/static/src/js/rte.summernote.js:689
 #, python-format
 msgid "Italic"
-msgstr "Наклонный"
+msgstr "Курсив"
 
 #. module: web_editor
 #. openerp-web
@@ -573,7 +574,7 @@ msgstr "Светлый"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:695
 #, python-format
 msgid "Line Height"
-msgstr "Высота Строки"
+msgstr "Высота cтроки"
 
 #. module: web_editor
 #. openerp-web
@@ -741,7 +742,7 @@ msgstr "Последний цвет"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:785
 #, python-format
 msgid "Redo"
-msgstr ""
+msgstr "Повторить"
 
 #. module: web_editor
 #. openerp-web
@@ -849,7 +850,7 @@ msgstr "Поиск Контактов"
 #: code:addons/web_editor/static/src/xml/snippets.xml:33
 #, python-format
 msgid "Select Container Block"
-msgstr "Выбрать блок хранилища"
+msgstr "Выбрать блок элемента"
 
 #. module: web_editor
 #. openerp-web
@@ -942,7 +943,7 @@ msgstr "Стиль"
 #: code:addons/web_editor/static/src/js/rte.summernote.js:692
 #, python-format
 msgid "Subscript"
-msgstr "Нижний Индекс"
+msgstr "Нижний индекс"
 
 #. module: web_editor
 #. openerp-web
@@ -1124,14 +1125,14 @@ msgstr "Цвет предупреждения"
 #: 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/i18n/zh_CN.po b/addons/web_editor/i18n/zh_CN.po
index 23a1e3bb621..b0927275fd9 100644
--- a/addons/web_editor/i18n/zh_CN.po
+++ b/addons/web_editor/i18n/zh_CN.po
@@ -15,7 +15,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-04-20 00:31+0000\n"
+"PO-Revision-Date: 2016-05-02 09:07+0000\n"
 "Last-Translator: Jeffery Chenn <jeffery9@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -145,7 +145,7 @@ msgstr "基本"
 #: code:addons/web_editor/static/src/xml/snippets.xml:8
 #, python-format
 msgid "Block style"
-msgstr "模块的风格"
+msgstr "区块风格"
 
 #. module: web_editor
 #. openerp-web
diff --git a/addons/web_editor/static/src/less/web_editor.backend.less b/addons/web_editor/static/src/less/web_editor.backend.less
index 0ff97e327aa..53789aae8af 100644
--- a/addons/web_editor/static/src/less/web_editor.backend.less
+++ b/addons/web_editor/static/src/less/web_editor.backend.less
@@ -83,3 +83,21 @@
         box-shadow: #DDCC33 0 0 5px 2px inset;
     }
 }
+
+// FIX (to improve in next versions)
+// ---------------------------------
+// The web_editor.colorpicker defines a series of color buttons which toggle the bg-* and text-* classes.
+// The problem is that themes can define new buttons whose bg-* and text-* classes only exist in the frontend.
+// So these buttons should not be displayed in the backend. Only solution for the current implementation is
+// to add this ugly rule (in this backend file) which hides every button and redisplayed the default ones.
+.note-editor {
+    .colorpicker .o_colorpicker_section > button {
+        display: none;
+
+        &[data-color="alpha"], &[data-color="beta"], &[data-color="gamma"], &[data-color="delta"], &[data-color="epsilon"],
+        &[data-color="white"], &[data-color="gray-lighter"], &[data-color="gray-light"], &[data-color="gray"], &[data-color="gray-dark"], &[data-color="gray-darker"], &[data-color="black"],
+        &[data-color="primary"], &[data-color="success"], &[data-color="info"], &[data-color="warning"], &[data-color="danger"] {
+            display: block;
+        }
+    }
+}
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 33edd55dc61..df96dac896d 100644
--- a/addons/web_editor/static/src/less/web_editor.ui.less
+++ b/addons/web_editor/static/src/less/web_editor.ui.less
@@ -643,8 +643,10 @@
     width: auto;
     text-align: center;
     box-shadow: none;
+    
     .popover-content {
         height: @odoo-navbar-height;
+
         .btn {
             height: @odoo-navbar-height;
             border: none;
@@ -684,13 +686,6 @@
                     background-color: @o-we-tab-active-bg;
                     color: white;
                 }
-
-                > i {
-                    visibility: hidden;
-                }
-                &.checked > i {
-                    visibility: visible;
-                }
             }
         }
         #colors_preview {
@@ -707,26 +702,41 @@
 
         // COLORPICKER
         .note-color {
-            .dropdown-toggle {
-                width: auto;
-            }
-            .o_foreground_toggle > button:before {
-                font-family: FontAwesome;
-                content: '\f1fc';
-            }
-            .o_background_toggle > button:before {
-                font-family: FontAwesome;
-                content: '\f0c3';
-            }
-
             border: 1px solid @o-we-color-divider;
             border-width: 0 1px;
-            .dropdown-menu {
-                min-width: 250px!important;
-                padding: 0!important;
+        }
+    }
+}
+
+.note-popover .popover, .note-editor {
+    .dropdown-menu {
+        > li > a {
+            > i {
+                visibility: hidden;
+            }
+            &.checked > i {
+                visibility: visible;
             }
         }
     }
+
+    .note-color {
+        .dropdown-toggle {
+            width: auto;
+        }
+        .o_foreground_toggle > button:before {
+            font-family: FontAwesome;
+            content: '\f1fc';
+        }
+        .o_background_toggle > button:before {
+            font-family: FontAwesome;
+            content: '\f0c3';
+        }
+        .dropdown-menu {
+            min-width: 250px!important;
+            padding: 0!important;
+        }
+    }
 }
 
 table.colorpicker {