diff options
| author | ddm <ddm@openerp.com> | 2013-10-04 12:03:15 +0200 |
|---|---|---|
| committer | ddm <ddm@openerp.com> | 2013-10-04 12:03:15 +0200 |
| commit | e76ce7da829cb5665fcd953ecb1697a50fa2e7f8 (patch) | |
| tree | 21eeb6155ea070e71915ea90fd39fc64d798c131 | |
| parent | 0dc3c46655e759ba5c0c31ff0717fcb0b09ab500 (diff) | |
[IMP] Minor tutorial improvements
bzr revid: ddm@openerp.com-20131004100315-hshfanxesnm478n3
| -rw-r--r-- | addons/website/static/src/js/website.tour.js | 10 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.xml | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js index 2f13116d47c..464d72b2354 100644 --- a/addons/website/static/src/js/website.tour.js +++ b/addons/website/static/src/js/website.tour.js @@ -32,12 +32,12 @@ step.title = render('website.tour_title', { title: step.title }); return step; })); - if (!self.doNotContinue()) { + if (self.canResume()) { self.tour.start(); } }, - doNotContinue: function () { - return this.currentStepIndex() > 0 || this.tour.ended(); + canResume: function () { + return this.currentStepIndex() === 0 && !this.tour.ended(); }, currentStepIndex: function () { return parseInt(this.tourStorage.getItem(this.id+'_current_step'), 10); @@ -185,10 +185,10 @@ ]; return this._super(); }, - doNotContinue: function () { + canResume: function () { var currentStepIndex = this.currentStepIndex(); var secondPartIndex = this.indexOfStep('part-2'); - return currentStepIndex > 0 && currentStepIndex !== secondPartIndex; + return currentStepIndex === 0 || currentStepIndex === secondPartIndex; } }); diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml index a47449606bc..b3e4cacd32a 100644 --- a/addons/website/static/src/xml/website.xml +++ b/addons/website/static/src/xml/website.xml @@ -23,13 +23,13 @@ <li class="divider-vertical"></li> <li><a data-action="promote-current-page" href="#"><span title="Promote page on the web">Promote</span></a></li> <li class="dropdown"> - <a id="customize-menu-button" class="dropdown-toggle" data-toggle="dropdown" href="#">Customize<span class="caret"></span></a> + <a id="customize-menu-button" class="dropdown-toggle" data-toggle="dropdown" href="#">Customize <span class="caret"></span></a> <ul class="dropdown-menu" role="menu" id="customize-menu"> <!-- filled in JS --> </ul> </li> <li class="dropdown"> - <a id="help-menu-button" class="dropdown-toggle" data-toggle="dropdown" href="#">Help<span class="caret"></span></a> + <a id="help-menu-button" class="dropdown-toggle" data-toggle="dropdown" href="#">Help <span class="caret"></span></a> <ul class="dropdown-menu" role="menu" id="help-menu"> <!-- filled in JS --> </ul> |