');
+ self.trigger('rte:customize_menu_ready');
}
);
});
diff --git a/addons/website/static/src/js/website.seo.js b/addons/website/static/src/js/website.seo.js
index 635b80bb192..945b0ed353d 100644
--- a/addons/website/static/src/js/website.seo.js
+++ b/addons/website/static/src/js/website.seo.js
@@ -1,6 +1,6 @@
(function () {
'use strict';
-
+
var website = openerp.website;
website.templates.push('/website/static/src/xml/website.seo.xml');
diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index 34f3948ef60..147ed80c50c 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -26,6 +26,7 @@
reset: function () {
this.tourStorage.removeItem(this.id+'_current_step');
this.tourStorage.removeItem(this.id+'_end');
+ this.tour._current = 0;
$('.popover.tour').remove();
},
start: function () {
@@ -34,7 +35,7 @@
}
},
canResume: function () {
- return this.currentStepIndex() === 0 && !this.tour.ended();
+ return (this.currentStepIndex() === 0) && !this.tour.ended();
},
currentStepIndex: function () {
var index = this.tourStorage.getItem(this.id+'_current_step') || 0;
@@ -68,7 +69,7 @@
website.EditorBasicTour = website.EditorTour.extend({
id: 'add_banner_tour',
name: "How to add a banner",
- init: function () {
+ init: function (editor) {
var self = this;
self.steps = [
{
@@ -77,7 +78,7 @@
backdrop: true,
title: "Welcome to your website!",
content: "This tutorial will guide you through the firsts steps to build your enterprise class website.",
- template: render('website.tour_full', { next: "OK", end: "Close" }),
+ template: render('website.tour_full', { next: "Continue", end: "Close Tutorial" }),
},
{
stepId: 'edit-page',
@@ -85,32 +86,32 @@
placement: 'right',
reflex: true,
title: "Edit this page",
- content: "Every page of your website can be edited. Click the Edit button to modify your homepage.",
+ content: "Every page of your website can be edited. Click the Edit button to modify your homepage.",
template: render('website.tour_simple'),
},
{
- stepId: 'show-bar',
- element: '#website-top-navbar',
- placement: 'bottom',
- title: "Editor bar",
- content: "This is the Editor Bar, use it to modify your website's pages.",
- template: render('website.tour_confirm', { next: "OK" }),
+ stepId: 'add-banner',
+ orphan: true,
+ backdrop: true,
+ title: "Now, let's add a banner",
+ content: "Let's add a banner on the top of the page to make your homepage more attractive.",
+ template: render('website.tour_confirm', { next: "Continue" }),
},
{
stepId: 'add-block',
element: 'button[data-action=snippet]',
placement: 'right',
reflex: true,
- title: "Add a block to your page",
- content: "Click on the Insert Blocks button to open the block collection.",
+ title: "Shows Building Blocks",
+ content: "Click on the Insert Blocks button to show the available building blocks.",
template: render('website.tour_simple'),
},
{
stepId: 'drag-banner',
element: '#website-top-navbar [data-snippet-id=carousel]',
placement: 'bottom',
- title: "Add a banner to your page",
- content: "Drag the Banner block to the body of the page and drop it on a purple zone.",
+ title: "Drag & Drop a Banner",
+ content: "Drag the Banner block and drop it to the top of your page (purple zone).",
template: render('website.tour_simple'),
onShown: function () {
function beginDrag () {
@@ -130,9 +131,9 @@
stepId: 'edit-title',
element: '#wrap [data-snippet-id=carousel]:first .carousel-caption',
placement: 'top',
- title: "Change the title",
- content: "Click on the title and modify it to fit your needs then click Done.",
- template: render('website.tour_confirm', { next: "Done" }),
+ title: "Set your Banner text",
+ content: "Click on the text to start modifying it then click Continue to continue the tutorial. You can also use the options of the top menubar to change the look of the banner. ",
+ template: render('website.tour_confirm', { next: "Continue" }),
onHide: function () {
var $banner = $("#wrap [data-snippet-id=carousel]:first");
if ($banner.length) {
@@ -144,9 +145,9 @@
stepId: 'customize-banner',
element: '.oe_overlay_options .oe_options',
placement: 'left',
- title: "Customize the banner",
- content: "Click on Customize and change the background of your banner.",
- template: render('website.tour_confirm', { next: "Not now" }),
+ title: "Customize your new Banner style",
+ content: "Click on Customize and change the background of your banner. If your are satisfied with the current background, just click Continue.",
+ template: render('website.tour_confirm', { next: "Continue" }),
onShow: function () {
$('.dropdown-menu [name=carousel-background]').click(function () {
self.movetoStep('save-changes');
@@ -159,7 +160,7 @@
placement: 'right',
reflex: true,
title: "Save your modifications",
- content: "Click the Save button to apply modifications on your website.",
+ content: "Click the Save button to apply modifications on your website.",
template: render('website.tour_simple'),
onHide: function () {
self.saveStep('part-2');
@@ -169,16 +170,39 @@
{
stepId: 'part-2',
orphan: true,
+ backdrop: true,
title: "Congratutaltions!",
content: "Congratulations on your first modifications.",
template: render('website.tour_confirm', { next: "OK" }),
},
+ {
+ stepId: 'show-customize',
+ element: '#customize-menu-button',
+ placement: 'left',
+ title: "Customize your Website",
+ content: "Go on the Customize menu to get access customization options for the current page.",
+ template: render('website.tour_simple'),
+ onShow: function () {
+ editor.on('rte:customize_menu_ready', self, function () {
+ self.movetoStep('change-themes');
+ });
+ },
+ },
+ {
+ stepId: 'change-themes',
+ element: '.js_change_theme',
+ placement: 'left',
+ reflex: true,
+ title: "Click to View Themes",
+ content: "You can change the theme at any time to customize the look and feel of your website.",
+ template: render('website.tour_simple'),
+ },
{
stepId: 'show-tutorials',
element: '#help-menu-button',
placement: 'left',
title: "Help is always available",
- content: "You can find more tutorials in the Help menu.",
+ content: "You can find more tutorials in the Help menu.",
template: render('website.tour_end', { end: "Close" }),
},
];
@@ -187,7 +211,8 @@
startOfPart2: function () {
var currentStepIndex = this.currentStepIndex();
var secondPartIndex = this.indexOfStep('part-2');
- return currentStepIndex === secondPartIndex && !this.tour.ended();
+ var showTutorialsIndex = this.indexOfStep('show-tutorials');
+ return (currentStepIndex === secondPartIndex || currentStepIndex === showTutorialsIndex) && !this.tour.ended();
},
canResume: function () {
return this.startOfPart2() || this._super();
@@ -212,7 +237,7 @@
website.EditorBar.include({
start: function () {
website.tutorials = {
- basic: new website.EditorBasicTour(),
+ basic: new website.EditorBasicTour(this),
};
var menu = $('#help-menu');
_.each(website.tutorials, function (tutorial) {
@@ -227,6 +252,10 @@
if (url.search === '?tutorial=true' || website.tutorials.basic.startOfPart2()) {
website.tutorials.basic.start();
}
+ $('.tour-backdrop').click(function (e) {
+ e.stopImmediatePropagation();
+ e.preventDefault();
+ });
return this._super();
},
});
diff --git a/addons/website/static/src/xml/website.tour.xml b/addons/website/static/src/xml/website.tour.xml
index 6d2ef140610..75ffe0fe505 100644
--- a/addons/website/static/src/xml/website.tour.xml
+++ b/addons/website/static/src/xml/website.tour.xml
@@ -39,6 +39,6 @@
-
+
\ No newline at end of file