[MERGE] forward port branch saas-14 up to b780e4a0e43

4 files changed, 9 insertions, 5 deletions

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 89c4365376a..69966da9eb8 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -63,7 +63,7 @@ class Website(Home):
     @http.route('/', type='http', auth="public", website=True)
     def index(self, **kw):
         page = 'homepage'
-        main_menu = request.env.ref('website.main_menu', raise_if_not_found=False)
+        main_menu = request.website.menu_id or request.env.ref('website.main_menu', raise_if_not_found=False)
         if main_menu:
             first_menu = main_menu.child_id and main_menu.child_id[0]
             if first_menu:
diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml
index 9344ed70e4a..e2d702596a2 100644
--- a/addons/website/data/website_data.xml
+++ b/addons/website/data/website_data.xml
@@ -94,7 +94,7 @@
         <record id="website.library_image_02" model="ir.attachment">
             <field name="public" eval="True"/>
             <field name="name">Website Library Image 02</field>
-            <field name="datas_fname">deliver.png</field>
+            <field name="datas_fname">deliver.jpg</field>
             <field name="res_model">ir.ui.view</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/library/deliver.jpg</field>
@@ -139,7 +139,7 @@
         <record id="website.library_image_07" model="ir.attachment">
             <field name="public" eval="True"/>
             <field name="name">Website Library Image 07</field>
-            <field name="datas_fname">mobile_device.png</field>
+            <field name="datas_fname">mobile_device.jpg</field>
             <field name="res_model">ir.ui.view</field>
             <field name="type">url</field>
             <field name="url">/website/static/src/img/library/mobile_device.jpg</field>
diff --git a/addons/website/models/res_partner.py b/addons/website/models/res_partner.py
index d0f4a76b199..d3a3b1bc9f9 100644
--- a/addons/website/models/res_partner.py
+++ b/addons/website/models/res_partner.py
@@ -21,7 +21,7 @@ class Partner(models.Model):
             return False
         params = {
             'center': '%s, %s %s, %s' % (self.street or '', self.city or '', self.zip or '', self.country_id and self.country_id.name_get()[0][1] or ''),
-            'size': "%sx%s" % (height, width),
+            'size': "%sx%s" % (width, height),
             'zoom': zoom,
             'sensor': 'false',
             'key': google_maps_api_key,
diff --git a/addons/website/static/src/js/website.snippets.animation.js b/addons/website/static/src/js/website.snippets.animation.js
index d0547dcf9db..1213b986472 100644
--- a/addons/website/static/src/js/website.snippets.animation.js
+++ b/addons/website/static/src/js/website.snippets.animation.js
@@ -413,7 +413,11 @@ animation.registry.share = animation.Class.extend({
 animation.registry.media_video = animation.Class.extend({
     selector: ".media_iframe_video",
     start: function () {
-        if (!this.$target.has('> iframe').length) {
+        // TODO: this code should be refactored to make more sense and be better
+        // integrated with Odoo (this refactoring should be done in master).
+        this.$target.find('iframe').remove();
+
+        if (!this.$target.has('.media_iframe_video_size').length) {
             var editor = '<div class="css_editable_mode_display">&nbsp;</div>';
             var size = '<div class="media_iframe_video_size">&nbsp;</div>';
             this.$target.html(editor+size);