From 0e52fe93499593ebfbb992c7ce930fbad9671944 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 3 Dec 2013 15:20:42 +0100
Subject: [PATCH] [FIX] Banner tour was skipping a step

bzr revid: ddm@openerp.com-20131203142042-sho26izkdxgcoajp
---
 addons/website/static/src/js/website.tour.banner.js | 10 +++++++---
 addons/website/static/src/js/website.tour.js        |  1 -
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/addons/website/static/src/js/website.tour.banner.js b/addons/website/static/src/js/website.tour.banner.js
index 3253bcc957c..c3b3936b8d0 100644
--- a/addons/website/static/src/js/website.tour.banner.js
+++ b/addons/website/static/src/js/website.tour.banner.js
@@ -32,7 +32,11 @@
                     title: "Edit this page",
                     content: "Every page of your website can be modified through the <i>Edit</i> button.",
                     triggers: function () {
-                        editor.on('tour:editor_bar_loaded', self, self.moveToNextStep);
+                        function advance () {
+                            self.moveToNextStep();
+                            editor.off('tour:editor_bar_loaded', self, advance);
+                        }
+                        editor.on('tour:editor_bar_loaded', self, advance);
                     },
                 },
                 {
@@ -115,11 +119,11 @@
                 },
                 {
                     stepId: 'remove-text-block-title',
-                    element: '.oe_snippet_remove:last',
+                    element: '.ui-draggable.oe_active .oe_snippet_remove',
                     placement: 'top',
                     reflex: true,
                     title: "Delete the Title",
-                    content: "From this toolbar you can move, duplicate or delete the selected zone. Click on the cross to delete the title.",
+                    content: "From this toolbar you can move, duplicate or delete the selected zone. Click on the trash can to delete the title.",
                 },
                 {
                     stepId: 'save-changes',
diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index ff0b9444cc0..a14a55bded5 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -92,7 +92,6 @@
                 this.stop();
             } else if (index >= 0) {
                 var self = this;
-                self.tourStorage.setItem(step.id+'_current_step', index);
                 setTimeout(function () {
                     $('.popover.tour').remove();
                     self.tour.goto(index);