[MERGE] forward port branch saas-11 up to 7ae5121

5 files changed, 20 insertions, 32 deletions

diff --git a/addons/website/static/src/js/website.contentMenu.js b/addons/website/static/src/js/website.contentMenu.js
index 2a0040b2500..2ee11463475 100644
--- a/addons/website/static/src/js/website.contentMenu.js
+++ b/addons/website/static/src/js/website.contentMenu.js
@@ -308,7 +308,6 @@ var EditMenuDialog = widget.Dialog.extend({
 });
 
 var MenuEntryDialog = widget.LinkDialog.extend({
-    template: 'website.contentMenu.dialog.add',
     init: function (parent, options, editor, data) {
         data.text = data.name || '';
         data.isNewWindow = data.new_window;
@@ -317,10 +316,11 @@ var MenuEntryDialog = widget.LinkDialog.extend({
     },
     start: function () {
         var self = this;
-        var result = $.when(this._super.apply(this, arguments)).then(function () {
-            if (self.data) {
-                self.bind_data();
-            }
+
+        this.$(".link-style").remove();
+        this.$("label[for=link-new]").text("Menu Label");
+
+        return $.when(this._super.apply(this, arguments)).then(function () {
             var $link_text = self.$('#link-text').focus();
             self.$('#link-page').change(function (e) {
                 if ($link_text.val()) { return; }
@@ -329,7 +329,6 @@ var MenuEntryDialog = widget.LinkDialog.extend({
                 $link_text.focus();
             });
         });
-        return result;
     },
     save: function () {
         var $e = this.$('#link-text');
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 0ed17be589b..b62b6c2e6ac 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -163,11 +163,11 @@ widget.LinkDialog.include({
         }
         return this._super();
     },
-    get_data_buy_url: function (def, $e, isNewWindow, label, classes) {
+    get_data_buy_url: function (def, $e, isNewWindow, label, classes, test) {
         var val = $e.val();
         if (val && val.length && $e.hasClass('page')) {
             var data = $e.select2('data');
-            if (!data.create) {
+            if (!data.create || test) {
                 def.resolve(data.id, isNewWindow, label || data.text, classes);
             } else {
                 // Create the page, get the URL back
@@ -178,7 +178,7 @@ widget.LinkDialog.include({
                     });
             }
         } else {
-            def.resolve(val, isNewWindow, label, classes);
+            return this._super.apply(this, arguments);
         }
     },
     changed: function (e) {
diff --git a/addons/website/static/src/js/website.mobile.js b/addons/website/static/src/js/website.mobile.js
index 1392f0981ad..d5c46a4a8f1 100644
--- a/addons/website/static/src/js/website.mobile.js
+++ b/addons/website/static/src/js/website.mobile.js
@@ -26,7 +26,7 @@ var MobilePreviewDialog = Dialog.extend({
         });
         this.$iframe = this.$('iframe');
         this.$iframe.on('load', function (e) {
-            self.$iframe.contents().find('body').removeAttr('user');
+            self.$iframe.contents().find('body').removeClass('o_connected_user');
             self.$iframe.contents().find('#oe_main_menu_navbar, #o_website_add_page_modal').remove();
         });
 
diff --git a/addons/website/static/src/less/website.ui.components.less b/addons/website/static/src/less/website.ui.components.less
index 5517b0d6677..ab91b6fa199 100644
--- a/addons/website/static/src/less/website.ui.components.less
+++ b/addons/website/static/src/less/website.ui.components.less
@@ -99,20 +99,21 @@ body .modal {
                     @mobile-preview-width: 320px;
                     @mobile-preview-height: 530px;
 
-                    > iframe {
-                        display: block;
-                        width: @mobile-preview-width + 15;
-                        height: @mobile-preview-height;
-                        max-height: 100%;
-                        border: none;
-
-                        .o-transition(all, 400ms);
-                    }
+                    .o-flex-display();
+                    width: @mobile-preview-width + 15;
+                    height: @mobile-preview-height;
+                    .o-transition(all, 400ms);
 
-                    &.o_invert_orientation > iframe {
+                    &.o_invert_orientation {
                         width: @mobile-preview-height + 15;
                         height: @mobile-preview-width;
                     }
+
+                    > iframe {
+                        display: block;
+                        width: 100%;
+                        border: none;
+                    }
                 }
 
                 .modal-footer {
diff --git a/addons/website/static/src/xml/website.contentMenu.xml b/addons/website/static/src/xml/website.contentMenu.xml
index f3334fc2500..1d20236386c 100644
--- a/addons/website/static/src/xml/website.contentMenu.xml
+++ b/addons/website/static/src/xml/website.contentMenu.xml
@@ -49,16 +49,4 @@
         </div>
     </div>
 </div>
-<t t-name="website.contentMenu.dialog.add" t-extend="web_editor.dialog.link">
-    <t t-jquery="t[t-set='title']" t-operation="inner">
-        <t t-if="!widget.update_mode">Add Menu Entry</t>
-        <t t-if="widget.update_mode">Edit Menu Entry</t>
-    </t>
-    <t t-jquery="form > div.form-horizontal" t-operation="replace"/>
-    <t t-jquery="form > div.list-group:first label" t-operation="replace">
-        <label for="link-new" class="control-label">
-            Menu Label
-        </label>
-    </t>
-</t>
 </templates>