From bf5c9b2d3208652edbd716adedaf523a6516ded6 Mon Sep 17 00:00:00 2001 From: ddm Date: Wed, 27 Nov 2013 11:03:51 +0100 Subject: [PATCH] [IMP] Minor fixes/imps before demo bzr revid: ddm@openerp.com-20131127100351-l8l3e651zq0l9m8a --- addons/website/static/src/js/website.tour.js | 2 +- addons/website_event/static/src/js/website.tour.event.js | 3 +++ addons/website_payment/__openerp__.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js index 1ffa36ea054..d8d27506a59 100644 --- a/addons/website/static/src/js/website.tour.js +++ b/addons/website/static/src/js/website.tour.js @@ -124,7 +124,7 @@ if (stepId) { self.moveToStep(stepId); } else { - self.moveToNextStep() + self.moveToNextStep(); } } $(document.body).one('mouseup', advance); diff --git a/addons/website_event/static/src/js/website.tour.event.js b/addons/website_event/static/src/js/website.tour.event.js index 5a7c27f1e37..7fb5c6e7ca8 100644 --- a/addons/website_event/static/src/js/website.tour.event.js +++ b/addons/website_event/static/src/js/website.tour.event.js @@ -100,6 +100,9 @@ triggers: function () { self.onSnippetDraggedAdvance('text-block'); }, + onHide: function () { + window.scrollTo(0, 0); + }, }, { stepId: 'add-three-columns', diff --git a/addons/website_payment/__openerp__.py b/addons/website_payment/__openerp__.py index fb0e011e4f0..01b69d33ddd 100644 --- a/addons/website_payment/__openerp__.py +++ b/addons/website_payment/__openerp__.py @@ -37,6 +37,6 @@ 'data': [ 'views/website_payment_templates.xml', ], - 'installable': True, + 'installable': False, 'active': False, }