@@ -555,7 +555,7 @@
Button
-
Button
@@ -792,12 +792,26 @@
-
-
diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py
index bf344a18eae..aa032a56dbc 100644
--- a/addons/website_blog/controllers/main.py
+++ b/addons/website_blog/controllers/main.py
@@ -38,7 +38,7 @@ class WebsiteBlog(http.Controller):
def nav_list(self):
blog_post_obj = request.registry['blog.post']
- groups = blog_post_obj.read_group(request.cr, request.uid, [], ['name', 'create_date'],
+ groups = blog_post_obj.read_group(request.cr, request.uid, [], ['name', 'create_date'],
groupby="create_date", orderby="create_date asc", context=request.context)
for group in groups:
group['date'] = "%s_%s" % (group['__domain'][0][2], group['__domain'][1][2])
@@ -76,7 +76,7 @@ class WebsiteBlog(http.Controller):
'/blog/cat/
-
Enlight Background
- dark
+
+
+ Darken
+ Background
+
+
+ Green
+ Background
+
+
+ Red
+ Background
+
+
+ Black
+ Background
+
+
-
Custom Picture...
+ Background
diff --git a/addons/website_blog/static/src/js/website.tour.blog.js b/addons/website_blog/static/src/js/website.tour.blog.js
new file mode 100644
index 00000000000..02c69530ce5
--- /dev/null
+++ b/addons/website_blog/static/src/js/website.tour.blog.js
@@ -0,0 +1,91 @@
+(function () {
+ 'use strict';
+
+ var website = openerp.website;
+
+ var render = website.tour.render;
+
+ website.EditorBar.include({
+ start: function () {
+ this.registerTour(new website.BlogTour(this));
+ return this._super();
+ },
+ });
+
+ website.BlogTour = website.Tour.extend({
+ id: 'blog-tutorial',
+ name: "Create a blog post",
+ startPath: '/blog/cat/1/',
+ init: function (editor) {
+ var self = this;
+ self.steps = [
+ {
+ stepId: 'welcome-blog',
+ orphan: true,
+ backdrop: true,
+ title: "Blog",
+ content: "We will show how to create a new blog post.",
+ template: render('website.tour_popover', { next: "Start Tutorial", end: "Skip It" }),
+ },
+ {
+ stepId: 'content-menu',
+ element: '#content-menu-button',
+ placement: 'left',
+ reflex: true,
+ title: "Edit the content",
+ content: "Click here to add content to your site.",
+ template: render('website.tour_popover'),
+ },
+ {
+ stepId: 'new-post-entry',
+ element: 'a[data-action=new_blog_post]',
+ placement: 'left',
+ title: "New blog post",
+ content: "Click here to create a blog post.",
+ template: render('website.tour_popover'),
+ onShow: function () {
+ $(document).one('shown.bs.modal', function () {
+ $('.modal button.btn-primary').click(function () {
+ self.movetoStep('post-page');
+ });
+ self.movetoStep('choose-category');
+ });
+ },
+ },
+ {
+ stepId: 'choose-category',
+ element: '.modal select',
+ placement: 'right',
+ title: "Choose the post category",
+ content: "Select the 'News' category and click 'Continue'.",
+ template: render('website.tour_popover'),
+ },
+ {
+ stepId: 'post-page',
+ orphan: true,
+ backdrop: true,
+ title: "New blog post created",
+ content: "You just created a new blog post. We are now going to edit it.",
+ template: render('website.tour_popover', { next: "OK" }),
+ },
+ {
+ stepId: 'add-block',
+ element: 'button[data-action=snippet]',
+ placement: 'bottom',
+ reflex: true,
+ title: "Layout your blog post",
+ content: "Insert blocks like text-image to layout the body of your blog post.",
+ template: render('website.tour_popover'),
+ },
+ ];
+ return this._super();
+ },
+ continueTour: function () {
+ return this.isCurrentStep('post-page') && !this.tour.ended();
+ },
+ isTriggerUrl: function () {
+ return (this.continueTour() && this.testUrl(/^\/blog\/[0-9]+\/\?enable_editor=1/)) || this._super();
+ },
+ });
+
+}());
diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index 26fd8806422..abf91e3c99f 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -4,6 +4,7 @@
+
@@ -59,7 +60,7 @@
- In
+ In
diff --git a/addons/website_event/data/event_data.xml b/addons/website_event/data/event_data.xml
index baf732b781b..d2e717ebb3e 100644
--- a/addons/website_event/data/event_data.xml
+++ b/addons/website_event/data/event_data.xml
@@ -11,14 +11,14 @@
Website Home
self
- /event
+ /event?event-tutorial=true
open
-
+
view_event_twitter_form
event.event
diff --git a/addons/website_event/data/event_demo.xml b/addons/website_event/data/event_demo.xml
index 35654f0282e..4da5b931d32 100644
--- a/addons/website_event/data/event_demo.xml
+++ b/addons/website_event/data/event_demo.xml
@@ -142,7 +142,7 @@
-
+
-
A great content...
@@ -305,7 +305,7 @@
+
-
A great content...
@@ -480,7 +480,7 @@
+
+
diff --git a/addons/website_hr_recruitment/data/website_hr_recruitment_demo.xml b/addons/website_hr_recruitment/data/website_hr_recruitment_demo.xml
index e2a64d5505b..c65d4a02ee0 100644
--- a/addons/website_hr_recruitment/data/website_hr_recruitment_demo.xml
+++ b/addons/website_hr_recruitment/data/website_hr_recruitment_demo.xml
@@ -5,7 +5,7 @@
True
-
+
A great content...
diff --git a/addons/website_event/static/src/js/website.tour.event.js b/addons/website_event/static/src/js/website.tour.event.js new file mode 100644 index 00000000000..8bbd470d1e6 --- /dev/null +++ b/addons/website_event/static/src/js/website.tour.event.js @@ -0,0 +1,91 @@ +(function () { + 'use strict'; + + var website = openerp.website; + + var render = website.tour.render; + + website.EditorBar.include({ + start: function () { + this.registerTour(new website.EventTour(this)); + return this._super(); + }, + }); + + website.EventTour = website.Tour.extend({ + id: 'event-tutorial', + name: "Create an event", + startPath: '/event', + init: function (editor) { + var self = this; + self.steps = [ + { + stepId: 'welcome-event', + orphan: true, + backdrop: true, + title: "Event", + content: "We will show how to create a new event.", + template: render('website.tour_popover', { next: "Start Tutorial", end: "Skip It" }), + }, + { + stepId: 'content-menu', + element: '#content-menu-button', + placement: 'left', + reflex: true, + title: "Edit the content", + content: "Click here to add content to your site.", + template: render('website.tour_popover'), + }, + { + stepId: 'new-post-entry', + element: 'a[data-action=new_event]', + placement: 'left', + title: "New event", + content: "Click here to create an event.", + template: render('website.tour_popover'), + onShow: function () { + $(document).one('shown.bs.modal', function () { + $('.modal button.btn-primary').click(function () { + self.movetoStep('event-page'); + }); + self.movetoStep('choose-category'); + }); + }, + }, + { + stepId: 'choose-name', + element: '.modal input', + placement: 'right', + title: "Choose the event name", + content: "Choose a name for the new event and click 'Continue'.", + template: render('website.tour_popover'), + }, + { + stepId: 'event-page', + orphan: true, + backdrop: true, + title: "New event created", + content: "You just created a new event. We are now going to edit it.", + template: render('website.tour_popover', { next: "OK" }), + }, + { + stepId: 'add-block', + element: 'button[data-action=snippet]', + placement: 'bottom', + reflex: true, + title: "Layout your event", + content: "Insert blocks like text-image to layout the body of your event.", + template: render('website.tour_popover'), + }, + ]; + return this._super(); + }, + continueTour: function () { + return this.isCurrentStep('event-page') && !this.tour.ended(); + }, + isTriggerUrl: function () { + return (this.continueTour() && this.testUrl(/^\/event\/[0-9]+\/\?enable_editor=1/)) || this._super(); + }, + }); + +}()); diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml index e41ab05494e..fbb75e49736 100644 --- a/addons/website_event/views/website_event.xml +++ b/addons/website_event/views/website_event.xml @@ -5,6 +5,7 @@
@@ -137,7 +137,7 @@
True
-
+
@@ -270,7 +270,7 @@
True
-
+
@@ -403,7 +403,7 @@
-
+
@@ -532,7 +532,7 @@
-
+
@@ -660,7 +660,7 @@
-
+
@@ -788,7 +788,7 @@
-
+
diff --git a/addons/website_hr_recruitment/views/website_hr_recruitment.xml b/addons/website_hr_recruitment/views/website_hr_recruitment.xml
index 03b0454f68f..aee5995ebbd 100644
--- a/addons/website_hr_recruitment/views/website_hr_recruitment.xml
+++ b/addons/website_hr_recruitment/views/website_hr_recruitment.xml
@@ -86,7 +86,7 @@
-
+
+
@@ -220,7 +220,7 @@
we will get back to you soon.
-
diff --git a/addons/website_sale/static/src/js/website.tour.shop.js b/addons/website_sale/static/src/js/website.tour.shop.js
index afe51eedc10..6b67836ac84 100644
--- a/addons/website_sale/static/src/js/website.tour.shop.js
+++ b/addons/website_sale/static/src/js/website.tour.shop.js
@@ -5,13 +5,19 @@
var render = website.tour.render;
- website.EditorShopTour = website.EditorTour.extend({
+ website.EditorBar.include({
+ start: function () {
+ this.registerTour(new website.EditorShopTour(this));
+ return this._super();
+ },
+ });
+
+ website.EditorShopTour = website.Tour.extend({
id: 'shop-tutorial',
name: "Create a product",
startPath: '/shop',
init: function (editor) {
var self = this;
- var $body = $(document.body);
self.steps = [
{
stepId: 'welcome-shop',
@@ -83,25 +89,11 @@
];
return this._super();
},
- productPage: function () {
- var currentStepIndex = this.currentStepIndex();
- var productPageIndex = this.indexOfStep('product-page');
- return (currentStepIndex === productPageIndex) && !this.tour.ended();
- },
continueTour: function () {
- return this.productPage();
+ return this.isCurrentStep('product-page') && !this.tour.ended();
},
isTriggerUrl: function (url) {
- url = url || new website.UrlParser(window.location.href);
- var addProductPattern = /^\/shop\/product\/[0-9]+\/\?enable_editor=1/;
- return (this.productPage() && addProductPattern.test(url.pathname+url.search)) || this._super();
- },
- });
-
- website.EditorBar.include({
- start: function () {
- this.registerTour(new website.EditorShopTour(this));
- return this._super();
+ return (this.continueTour() && this.testUrl(/^\/shop\/product\/[0-9]+\/\?enable_editor=1/)) || this._super();
},
});
diff --git a/addons/website_sale/website_sale_demo.xml b/addons/website_sale/website_sale_demo.xml
index ef47ae7db59..981d66a28ee 100644
--- a/addons/website_sale/website_sale_demo.xml
+++ b/addons/website_sale/website_sale_demo.xml
@@ -13,7 +13,7 @@
5
-
+
-
+
@@ -97,7 +97,7 @@
@@ -175,7 +175,7 @@ Ultrafast wireless
iOS7
-
+
-
+
-
+
-
+
-
+
@@ -213,7 +213,7 @@ iOS7
@@ -251,7 +251,7 @@ iOS7
@@ -358,7 +358,7 @@ Weight: 0.4 ounce
@@ -450,7 +450,7 @@ Weight: 1.1 ounces