[FIX] website: display or not editor edit button; website_sale: test tour; website: contact qweb widget

bzr revid: chm@openerp.com-20140121123912-0ya4ziusj09efti3

6 files changed, 17 insertions, 4 deletions

diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 25980633fd2..5f4cd8978c2 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -463,6 +463,10 @@
             $(window).on('resize', _.debounce(this.check_height.bind(this), 50));
             this.check_height();
 
+            if (website.is_editable_button) {
+                this.$("button[data-action=edit]").removeClass("hidden");
+            }
+
             return $.when(
                 this._super.apply(this, arguments),
                 this.rte.appendTo(this.$('#website-top-edit .nav.pull-right'))
diff --git a/addons/website/static/src/js/website.editor.newpage.js b/addons/website/static/src/js/website.editor.newpage.js
index e333e2e451e..fd84c7c893e 100644
--- a/addons/website/static/src/js/website.editor.newpage.js
+++ b/addons/website/static/src/js/website.editor.newpage.js
@@ -3,11 +3,12 @@
 
     var website = openerp.website;
     website.is_editable = true;
+    website.is_editable_button = true;
+    
     website.EditorBar.include({
         start: function() {
             var res = this._super();
             this.$("a[data-action=new_page]").parents("li").removeClass("hidden");
-            this.$("button[data-action=edit]").removeClass("hidden");
             this.$(".oe_content_menu li.divider").removeClass("hidden");
             return res;
         },
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index 78a6202c58c..e232a050b27 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -67,6 +67,7 @@
     var dom_ready = website.dom_ready = $.Deferred();
     $(document).ready(function () {
         website.is_editable = website.is_editable || $('html').data('editable');
+        website.is_editable_button= website.is_editable_button || $('html').data('editable');
         dom_ready.resolve();
     });
 
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 1d28df08c75..89f226adfae 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -76,6 +76,9 @@
         hack_to_add_snippet_id();
     });
 
+    // 'snippet-dropped' is triggered on '#oe_snippets' whith $target as attribute when a snippet is dropped
+    // 'snippet-activated' is triggered on '#oe_snippets' (and on snippet) when a snippet is activated
+
     website.snippet.styles = {};
     website.snippet.selector = [];
     website.snippet.BuildingBlock = openerp.Widget.extend({
diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index 00dba53fe55..eef3d1b8ae7 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -366,7 +366,7 @@
                         overlapsCrash = setTimeout(function () {
                             window.localStorage.removeItem(testId);
                             throw "Test: '" + testId + "' can't resolve stape: '" + step.stepId + "'";
-                        }, step.delay || defaultDelay);
+                        }, (step.delay || defaultDelay) + 500);
 
                         var $element = $(step.element);
                         if (step.triggers) step.triggers(next);
diff --git a/addons/website/static/src/js/website.translator.js b/addons/website/static/src/js/website.translator.js
index 812f8902c65..399e5e731b2 100644
--- a/addons/website/static/src/js/website.translator.js
+++ b/addons/website/static/src/js/website.translator.js
@@ -13,9 +13,13 @@
             var self = this;
             this.initial_content = {};
             return this._super.apply(this, arguments).then(function () {
+                self.$("button[data-action=edit]").removeClass("hidden");
                 self.$('button[data-action=edit]')
-                    .text("Translate")
-                    .after(openerp.qweb.render('website.TranslatorAdditionalButtons'));
+                    .text("Translate");
+                if (website.is_editable_button) {
+                    self.$('button[data-action=edit]')
+                        .after(openerp.qweb.render('website.TranslatorAdditionalButtons'));
+                }
                 self.$('.js_hide_on_translate').hide();
             });
         },