[MERGE] saas-3

bzr revid: fme@openerp.com-20140210143646-kv87fekab804phqh

addons/website/models/ir_ui_view.py

@@ -133,8 +133,9 @@ class view(osv.osv):
             if not context:
                 context = {}
 
-            qcontext = context.copy()
+            qcontext = dict(editable=False)
             qcontext.update(
+                context.copy(),
                 website=request.website,
                 url_for=website.url_for,
                 slug=website.slug,

addons/website/static/src/js/website.editor.js

@@ -638,7 +638,7 @@
                 image_dialog(editor, new CKEDITOR.dom.element(previous));
                 $image_button.hide();
                 previous = null;
-            });
+            }, 'btn-sm');
 
             // previous is the state of the button-trigger: it's the
             // currently-ish hovered element which can trigger a button showing.

addons/website/views/website_templates.xml

@@ -224,7 +224,7 @@
     <xpath expr="//body" position="attributes">
         <attribute name="style">padding-top: 51px;</attribute>
     </xpath>
-    <xpath expr="//body/*[1]" position="before">
+    <xpath expr="//body" position="inside">
         <div id="website-top-navbar-placeholder" class="navbar navbar-inverse navbar-fixed-top hidden-xs">
             <div class="navbar-header">
                 <form class="navbar-form navbar-left">