From 53d004b6bc75efada4f129668e05ecfadde67889 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 18 Oct 2013 16:46:04 +0200
Subject: [PATCH 01/18] [FIX] test for qweb getting cr and uid

bzr revid: xmo@openerp.com-20131018144604-z39ibj61x96foatc
---
 addons/website/tests/test_converter.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/tests/test_converter.py b/addons/website/tests/test_converter.py
index fb846342718..6aa04bf4d93 100644
--- a/addons/website/tests/test_converter.py
+++ b/addons/website/tests/test_converter.py
@@ -28,7 +28,7 @@ class TestConvertBack(common.TransactionCase):
         e.setAttribute('t-field', field_value)
 
         rendered = self.registry('website.qweb').render_tag_field(
-            e, {'field': field_value}, '', ir_qweb.QWebContext({
+            e, {'field': field_value}, '', ir_qweb.QWebContext(self.cr, self.uid, {
                 'record': record,
             }))
         element = html.fromstring(

From fbd72c436a1c6ce9437d74141f1646e222a3554d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 21 Oct 2013 10:28:40 +0200
Subject: [PATCH 02/18] [ADD] context to t-field conversion methods

bzr revid: xmo@openerp.com-20131021082840-1tdbxhpy4ut1uoif
---
 addons/website/models/ir_qweb.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/website/models/ir_qweb.py b/addons/website/models/ir_qweb.py
index f348bd7d9c3..dd7f8346e0f 100644
--- a/addons/website/models/ir_qweb.py
+++ b/addons/website/models/ir_qweb.py
@@ -39,12 +39,12 @@ class Field(orm.AbstractModel):
     _inherit = 'ir.qweb.field'
 
     def attributes(self, cr, uid, field_name, record, options,
-                   source_element, g_att, t_att, qweb_context):
+                   source_element, g_att, t_att, qweb_context, context=None):
         column = record._model._all_columns[field_name].column
         return itertools.chain(
             super(Field, self).attributes(cr, uid, field_name, record, options,
                                           source_element, g_att, t_att,
-                                          qweb_context),
+                                          qweb_context, context=context),
             [('data-oe-translate', 1 if column.translate else 0)]
         )
 
@@ -127,7 +127,7 @@ class Image(orm.AbstractModel):
     _inherit = ['website.qweb.field', 'ir.qweb.field.image']
 
     def to_html(self, cr, uid, field_name, record, options,
-                source_element, t_att, g_att, qweb_context):
+                source_element, t_att, g_att, qweb_context, context=None):
         assert source_element.nodeName != 'img',\
             "Oddly enough, the root tag of an image field can not be img. " \
             "That is because the image goes into the tag, or it gets the " \
@@ -135,9 +135,9 @@ class Image(orm.AbstractModel):
 
         return super(Image, self).to_html(
             cr, uid, field_name, record, options,
-            source_element, t_att, g_att, qweb_context)
+            source_element, t_att, g_att, qweb_context, context=context)
 
-    def record_to_html(self, cr, uid, field_name, record, column, options=None):
+    def record_to_html(self, cr, uid, field_name, record, column, options=None, context=None):
         cls = ''
         if 'class' in options:
             cls = ' class="%s"' % werkzeug.utils.escape(options['class'])

From a57c7e7c929ca30036acac9ec8a926facf889310 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Mon, 21 Oct 2013 10:48:41 +0200
Subject: [PATCH 03/18] [IMP] Ace: display 'resize' cursor when hovering over
 gutter

bzr revid: ddm@openerp.com-20131021084841-efcxt96c5x17u2m1
---
 addons/website/static/src/css/editor.css  | 3 +++
 addons/website/static/src/css/editor.sass | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index a009bf61f23..22c6f57ee8d 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -639,6 +639,9 @@ table.editorbar-panel td.selected {
   left: 0;
   width: 720px;
 }
+.oe_ace_view_editor .ace_editor .ace_gutter {
+  cursor: ew-resize;
+}
 .oe_ace_view_editor.oe_ace_open {
   filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=100);
   opacity: 1;
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 461667d8e54..0c247cbef5b 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -503,6 +503,8 @@ $navbar_height: 51px
         bottom: $navbar_height
         left: 0
         width: $ace_width
+        .ace_gutter
+            cursor: ew-resize
     &.oe_ace_open
         +opacity(1)
     &.oe_ace_closed

From 43a09310cb07444c207d7289649ae9a93d398918 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Mon, 21 Oct 2013 10:52:29 +0200
Subject: [PATCH 04/18] [FIX] Ace: close editor when 'edit' is pressed

bzr revid: ddm@openerp.com-20131021085229-k60nkz6t0ggrokqu
---
 addons/website/static/src/js/website.ace.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/website/static/src/js/website.ace.js b/addons/website/static/src/js/website.ace.js
index faf3e8f7e04..1b94afd0cfc 100644
--- a/addons/website/static/src/js/website.ace.js
+++ b/addons/website/static/src/js/website.ace.js
@@ -118,6 +118,9 @@
             document.body.addEventListener('mouseup', stopResizing, true);
             self.$('.ace_gutter').mouseup(stopResizing).mousedown(startResizing).click(stopResizing);
             $(document).mousemove(updateWidth);
+            $('button[data-action=edit]').click(function () {
+               self.close();
+            });
         },
         loadViews: function (views) {
             var self = this;

From a403bc0318bc113e2d6801174d3e4164f0a53186 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Mon, 21 Oct 2013 11:10:04 +0200
Subject: [PATCH 05/18] [IMP] Ace: remember editor width when resizing

bzr revid: ddm@openerp.com-20131021091004-nchmsogl6349az8h
---
 addons/website/static/src/css/editor.css    | 2 --
 addons/website/static/src/css/editor.sass   | 3 ---
 addons/website/static/src/js/website.ace.js | 9 +++++++++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 22c6f57ee8d..b939ec11b6d 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -608,7 +608,6 @@ table.editorbar-panel td.selected {
   right: 0;
   z-index: 1000;
   height: 100%;
-  width: 720px;
 }
 .oe_ace_view_editor .oe_ace_view_editor_title {
   width: 100%;
@@ -637,7 +636,6 @@ table.editorbar-panel td.selected {
   right: 0;
   bottom: 51px;
   left: 0;
-  width: 720px;
 }
 .oe_ace_view_editor .ace_editor .ace_gutter {
   cursor: ew-resize;
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 0c247cbef5b..092194e9e10 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -466,7 +466,6 @@ $highlighted_text_color: #ffffff
 
 /* ---- ACE EDITOR ---- */
 
-$ace_width: 720px
 $editorbar_height: 30px
 // TODO Fix => might break with themes
 $navbar_height: 51px
@@ -481,7 +480,6 @@ $navbar_height: 51px
     right: 0
     z-index: 1000
     height: 100%
-    width: $ace_width
     .oe_ace_view_editor_title
         width: 100%
         padding-top: 0
@@ -502,7 +500,6 @@ $navbar_height: 51px
         right: 0
         bottom: $navbar_height
         left: 0
-        width: $ace_width
         .ace_gutter
             cursor: ew-resize
     &.oe_ace_open
diff --git a/addons/website/static/src/js/website.ace.js b/addons/website/static/src/js/website.ace.js
index 1b94afd0cfc..66984731ac0 100644
--- a/addons/website/static/src/js/website.ace.js
+++ b/addons/website/static/src/js/website.ace.js
@@ -100,6 +100,13 @@
                 self.aceEditor.resize();
                 self.$el.width(width);
             }
+            function storeEditorWidth() {
+                window.localStorage.setItem('ace_editor_width', self.$el.width());
+            }
+            function readEditorWidth() {
+                var width = window.localStorage.getItem('ace_editor_width');
+                return parseInt(width || 720, 10);
+            }
             function startResizing (e) {
                 self.refX = e.pageX;
                 self.resizing = true;
@@ -113,6 +120,7 @@
                     var width = self.$el.width() - offset;
                     self.refX = e.pageX;
                     resizeEditor(width);
+                    storeEditorWidth();
                 }
             }
             document.body.addEventListener('mouseup', stopResizing, true);
@@ -121,6 +129,7 @@
             $('button[data-action=edit]').click(function () {
                self.close();
             });
+            resizeEditor(readEditorWidth());
         },
         loadViews: function (views) {
             var self = this;

From 0a74b6ef77b8671dcb409d6e8057d9657993573d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 21 Oct 2013 11:15:42 +0200
Subject: [PATCH 06/18] [ADD] security rules for qweb.field.integer model

bzr revid: xmo@openerp.com-20131021091542-m2e213pa6kq0bmqz
---
 addons/website/security/ir.model.access.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/website/security/ir.model.access.csv b/addons/website/security/ir.model.access.csv
index 4fe9a0888b4..70d6877d313 100644
--- a/addons/website/security/ir.model.access.csv
+++ b/addons/website/security/ir.model.access.csv
@@ -5,6 +5,7 @@ access_website_converter_test,access_website_converter_test,model_website_conver
 access_website_converter_test_sub,access_website_converter_test_sub,model_website_converter_test_sub,,1,1,1,1
 access_website_qweb,access_website_qweb,model_website_qweb,,0,0,0,0
 access_website_qweb_field,access_website_qweb_field,model_website_qweb_field,,0,0,0,0
+access_website_qweb_field_integer,access_website_qweb_field_integer,model_website_qweb_field_integer,,0,0,0,0
 access_website_qweb_field_float,access_website_qweb_field_float,model_website_qweb_field_float,,0,0,0,0
 access_website_qweb_field_text,access_website_qweb_field_text,model_website_qweb_field_text,,0,0,0,0
 access_website_qweb_field_selection,access_website_qweb_field_selection,model_website_qweb_field_selection,,0,0,0,0

From 6ee4768a426b83f521921c9933859860f1c33096 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Mon, 21 Oct 2013 11:39:59 +0200
Subject: [PATCH 07/18] [IMP] Tutorial: extract first tour to own style

bzr revid: ddm@openerp.com-20131021093959-ojzaceh2lul0afja
---
 .../static/src/js/website.tour.basic.js       | 161 +++++++++++++++++
 addons/website/static/src/js/website.tour.js  | 167 +-----------------
 addons/website/views/website_templates.xml    |   1 +
 3 files changed, 168 insertions(+), 161 deletions(-)
 create mode 100644 addons/website/static/src/js/website.tour.basic.js

diff --git a/addons/website/static/src/js/website.tour.basic.js b/addons/website/static/src/js/website.tour.basic.js
new file mode 100644
index 00000000000..82ad4790c25
--- /dev/null
+++ b/addons/website/static/src/js/website.tour.basic.js
@@ -0,0 +1,161 @@
+(function () {
+    'use strict';
+
+    var website = openerp.website;
+
+    var render = website.tour.render;
+
+    website.EditorBasicTour = website.EditorTour.extend({
+        id: 'add_banner_tour',
+        name: "Insert a banner",
+        init: function (editor) {
+            var self = this;
+            self.steps = [
+                {
+                    stepId: 'welcome',
+                    orphan: true,
+                    backdrop: true,
+                    title: "Welcome to your website!",
+                    content: "This tutorial will guide you to build your first page. We will start by adding a banner.",
+                    template: render('website.tour_popover', { next: "Start Tutorial", end: "Skip It" }),
+                },
+                {
+                    stepId: 'edit-page',
+                    element: 'button[data-action=edit]',
+                    placement: 'bottom',
+                    reflex: true,
+                    title: "Edit this page",
+                    content: "Every page of your website can be modified through the <i>Edit</i> button.",
+                    template: render('website.tour_popover'),
+                },
+                {
+                    stepId: 'add-block',
+                    element: 'button[data-action=snippet]',
+                    placement: 'bottom',
+                    title: "Insert building blocks",
+                    content: "To add content in a page, you can insert building blocks.",
+                    template: render('website.tour_popover'),
+                    onShow: function () {
+                        function refreshAddBlockStep () {
+                            self.tour.showStep(self.indexOfStep('add-block'));
+                            editor.off('rte:ready', editor, refreshAddBlockStep);
+                        }
+                        editor.on('rte:ready', editor, refreshAddBlockStep);
+                        $('button[data-action=snippet]').click(function () {
+                            self.movetoStep('drag-banner');
+                        });
+                    }
+                },
+                {
+                    stepId: 'drag-banner',
+                    element: '#website-top-navbar [data-snippet-id=carousel].ui-draggable',
+                    placement: 'bottom',
+                    title: "Drag & Drop a Banner",
+                    content: "Drag the <em>Banner</em> block and drop it in your page. <p class='text-muted'>Tip: release the mouse button when you are in a valid zone, with a preview of the banner.</p>",
+                    template: render('website.tour_popover'),
+                    onShow: function () {
+                        function beginDrag () {
+                            $('.popover.tour').remove();
+                            $('body').off('mousedown', beginDrag);
+                            function goToNextStep () {
+                                $('#oe_snippets').hide();
+                                self.movetoStep('edit-title');
+                                $('body').off('mouseup', goToNextStep);
+                            }
+                            $('body').on('mouseup', goToNextStep);
+                        }
+                        $('body').on('mousedown', beginDrag);
+                    },
+                },
+                {
+                    stepId: 'edit-title',
+                    element: '#wrap [data-snippet-id=carousel]:first .carousel-caption',
+                    placement: 'left',
+                    title: "Customize banner's text",
+                    content: "Click in the text and start editing it. Click continue once it's done.",
+                    template: render('website.tour_popover', { next: "Continue" }),
+                    onHide: function () {
+                        var $banner = $("#wrap [data-snippet-id=carousel]:first");
+                        if ($banner.length) {
+                            $banner.click();
+                        }
+                    },
+                },
+                {
+                    stepId: 'customize-banner',
+                    element: '.oe_overlay_options .oe_options',
+                    placement: 'left',
+                    title: "Customize the banner",
+                    content: "You can customize components of your page through the <em>Customize</em> menu. Try to change the background of your banner.",
+                    template: render('website.tour_popover', { next: "Continue" }),
+                    onShow: function () {
+                        $('.dropdown-menu [name=carousel-background]').click(function () {
+                            self.movetoStep('save-changes');
+                        });
+                    },
+                },
+                {
+                    stepId: 'save-changes',
+                    element: 'button[data-action=save]',
+                    placement: 'right',
+                    reflex: true,
+                    title: "Save your modifications",
+                    content: "Once you click on save, your website page is updated.",
+                    template: render('website.tour_popover'),
+                    onHide: function () {
+                        self.saveStep('part-2');
+                    },
+
+                },
+                {
+                    stepId: 'part-2',
+                    orphan: true,
+                    title: "Congratulation!",
+                    content: "Your homepage have been updated. Now, we suggest you to insert others building blocks like texts and images to structure your page.",
+                    template: render('website.tour_popover', { next: "Continue" }),
+                },
+                {
+                    stepId: 'show-tutorials',
+                    element: '#help-menu-button',
+                    placement: 'left',
+                    title: "Help is always available",
+                    content: "But you can always click here if you want more tutorials.",
+                    template: render('website.tour_popover', { end: "Close" }),
+                },
+            ];
+            return this._super();
+        },
+        startOfPart2: function () {
+            var currentStepIndex = this.currentStepIndex();
+            var secondPartIndex = this.indexOfStep('part-2');
+            var showTutorialsIndex = this.indexOfStep('show-tutorials');
+            return (currentStepIndex === secondPartIndex || currentStepIndex === showTutorialsIndex) && !this.tour.ended();
+        },
+        canResume: function () {
+            return this.startOfPart2() || this._super();
+        },
+    });
+
+    website.EditorBar.include({
+        start: function () {
+            var menu = $('#help-menu');
+            var basicTour = new website.EditorBasicTour(this);
+            var $menuItem = $($.parseHTML('<li><a href="#">'+basicTour.name+'</a></li>'));
+            $menuItem.click(function () {
+                basicTour.reset();
+                basicTour.start();
+            });
+            menu.append($menuItem);
+            var url = new website.UrlParser(window.location.href);
+            if (url.search.indexOf('?tutorial=true') === 0 || basicTour.startOfPart2()) {
+                basicTour.start();
+            }
+            $('.tour-backdrop').click(function (e) {
+                e.stopImmediatePropagation();
+                e.preventDefault();
+            });
+            return this._super();
+        },
+    });
+
+}());
\ No newline at end of file
diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index bfb9a0461d9..f5d3237c28d 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -4,9 +4,11 @@
     var website = openerp.website;
     website.templates.push('/website/static/src/xml/website.tour.xml');
 
-    function render (template, dict)  {
-        return openerp.qweb.render(template, dict);
-    }
+    website.tour = {
+        render: function render (template, dict)  {
+            return openerp.qweb.render(template, dict);
+        }
+    };
 
     website.EditorTour = openerp.Class.extend({
         tour: undefined,
@@ -19,7 +21,7 @@
                 keyboard: false,
             });
             this.tour.addSteps(_.map(this.steps, function (step) {
-               step.title = render('website.tour_popover_title', { title: step.title });
+               step.title = website.tour.render('website.tour_popover_title', { title: step.title });
                return step;
             }));
             this.monkeyPatchTour();
@@ -81,137 +83,6 @@
         },
     });
 
-    website.EditorBasicTour = website.EditorTour.extend({
-        id: 'add_banner_tour',
-        name: "Insert a banner",
-        init: function (editor) {
-            var self = this;
-            self.steps = [
-                {
-                    stepId: 'welcome',
-                    orphan: true,
-                    backdrop: true,
-                    title: "Welcome to your website!",
-                    content: "This tutorial will guide you to build your first page. We will start by adding a banner.",
-                    template: render('website.tour_popover', { next: "Start Tutorial", end: "Skip It" }),
-                },
-                {
-                    stepId: 'edit-page',
-                    element: 'button[data-action=edit]',
-                    placement: 'bottom',
-                    reflex: true,
-                    title: "Edit this page",
-                    content: "Every page of your website can be modified through the <i>Edit</i> button.",
-                    template: render('website.tour_popover'),
-                },
-                {
-                    stepId: 'add-block',
-                    element: 'button[data-action=snippet]',
-                    placement: 'bottom',
-                    title: "Insert building blocks",
-                    content: "To add content in a page, you can insert building blocks.",
-                    template: render('website.tour_popover'),
-                    onShow: function () {
-                        function refreshAddBlockStep () {
-                            self.tour.showStep(self.indexOfStep('add-block'));
-                            editor.off('rte:ready', editor, refreshAddBlockStep);
-                        }
-                        editor.on('rte:ready', editor, refreshAddBlockStep);
-                        $('button[data-action=snippet]').click(function () {
-                            self.movetoStep('drag-banner');
-                        });
-                    }
-                },
-                {
-                    stepId: 'drag-banner',
-                    element: '#website-top-navbar [data-snippet-id=carousel].ui-draggable',
-                    placement: 'bottom',
-                    title: "Drag & Drop a Banner",
-                    content: "Drag the <em>Banner</em> block and drop it in your page. <p class='text-muted'>Tip: release the mouse button when you are in a valid zone, with a preview of the banner.</p>",
-                    template: render('website.tour_popover'),
-                    onShow: function () {
-                        function beginDrag () {
-                            $('.popover.tour').remove();
-                            $('body').off('mousedown', beginDrag);
-                            function goToNextStep () {
-                                $('#oe_snippets').hide();
-                                self.movetoStep('edit-title');
-                                $('body').off('mouseup', goToNextStep);
-                            }
-                            $('body').on('mouseup', goToNextStep);
-                        }
-                        $('body').on('mousedown', beginDrag);
-                    },
-                },
-                {
-                    stepId: 'edit-title',
-                    element: '#wrap [data-snippet-id=carousel]:first .carousel-caption',
-                    placement: 'left',
-                    title: "Customize banner's text",
-                    content: "Click in the text and start editing it. Click continue once it's done.",
-                    template: render('website.tour_popover', { next: "Continue" }),
-                    onHide: function () {
-                        var $banner = $("#wrap [data-snippet-id=carousel]:first");
-                        if ($banner.length) {
-                            $banner.click();
-                        }
-                    },
-                },
-                {
-                    stepId: 'customize-banner',
-                    element: '.oe_overlay_options .oe_options',
-                    placement: 'left',
-                    title: "Customize the banner",
-                    content: "You can customize components of your page through the <em>Customize</em> menu. Try to change the background of your banner.",
-                    template: render('website.tour_popover', { next: "Continue" }),
-                    onShow: function () {
-                        $('.dropdown-menu [name=carousel-background]').click(function () {
-                            self.movetoStep('save-changes');
-                        });
-                    },
-                },
-                {
-                    stepId: 'save-changes',
-                    element: 'button[data-action=save]',
-                    placement: 'right',
-                    reflex: true,
-                    title: "Save your modifications",
-                    content: "Once you click on save, your website page is updated.",
-                    template: render('website.tour_popover'),
-                    onHide: function () {
-                        self.saveStep('part-2');
-                    },
-
-                },
-                {
-                    stepId: 'part-2',
-                    orphan: true,
-                    title: "Congratulation!",
-                    content: "Your homepage have been updated. Now, we suggest you to insert others building blocks like texts and images to structure your page.",
-                    template: render('website.tour_popover', { next: "Continue" }),
-                },
-                {
-                    stepId: 'show-tutorials',
-                    element: '#help-menu-button',
-                    placement: 'left',
-                    title: "Help is always available",
-                    content: "But you can always click here if you want more tutorials.",
-                    template: render('website.tour_popover', { end: "Close" }),
-                },
-            ];
-            return this._super();
-        },
-        startOfPart2: function () {
-            var currentStepIndex = this.currentStepIndex();
-            var secondPartIndex = this.indexOfStep('part-2');
-            var showTutorialsIndex = this.indexOfStep('show-tutorials');
-            return (currentStepIndex === secondPartIndex || currentStepIndex === showTutorialsIndex) && !this.tour.ended();
-        },
-        canResume: function () {
-            return this.startOfPart2() || this._super();
-        },
-    });
-
     website.UrlParser = openerp.Class.extend({
         init: function (url) {
             var a = document.createElement('a');
@@ -227,30 +98,4 @@
         },
     });
 
-    website.EditorBar.include({
-        start: function () {
-            website.tutorials = {
-                basic: new website.EditorBasicTour(this),
-            };
-            var menu = $('#help-menu');
-            _.each(website.tutorials, function (tutorial) {
-                var $menuItem = $($.parseHTML('<li><a href="#">'+tutorial.name+'</a></li>'));
-                $menuItem.click(function () {
-                    tutorial.reset();
-                    tutorial.start();
-                });
-                menu.append($menuItem);
-            });
-            var url = new website.UrlParser(window.location.href);
-            if (url.search.indexOf('?tutorial=true') === 0 || 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/views/website_templates.xml b/addons/website/views/website_templates.xml
index 46bf0996221..85767884773 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -73,6 +73,7 @@
                             <script type="text/javascript" src="/website/static/src/js/website.mobile.js"></script>
                             <script type="text/javascript" src="/website/static/src/js/website.seo.js"></script>
                             <script type="text/javascript" src="/website/static/src/js/website.tour.js"></script>
+                            <script type="text/javascript" src="/website/static/src/js/website.tour.basic.js"></script>
                             <script t-if="not translatable" type="text/javascript" src="/website/static/src/js/website.snippets.js"></script>
                             <script t-if="not translatable" type="text/javascript" src="/website/static/src/js/website.ace.js"></script>
                             <script t-if="translatable" type="text/javascript" src="/website/static/src/js/website.translator.js"></script>

From ff07f6dcdd537563030057bb9fbc8a0cc0b6fd81 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 21 Oct 2013 11:45:33 +0200
Subject: [PATCH 08/18] [ADD] decimal precision support to float t-field
 rendering

bzr revid: xmo@openerp.com-20131021094533-e510uy6byck85xma
---
 addons/decimal_precision/decimal_precision.py | 29 +++++++-
 addons/decimal_precision/tests/__init__.py    |  6 ++
 .../tests/test_qweb_float.py                  | 66 +++++++++++++++++++
 3 files changed, 99 insertions(+), 2 deletions(-)
 create mode 100644 addons/decimal_precision/tests/__init__.py
 create mode 100644 addons/decimal_precision/tests/test_qweb_float.py

diff --git a/addons/decimal_precision/decimal_precision.py b/addons/decimal_precision/decimal_precision.py
index b237f053ebb..5576038d54d 100644
--- a/addons/decimal_precision/decimal_precision.py
+++ b/addons/decimal_precision/decimal_precision.py
@@ -22,9 +22,9 @@
 import openerp
 from openerp import SUPERUSER_ID
 from openerp import tools
-from openerp.osv import osv, fields
+from openerp.osv import orm, fields
 
-class decimal_precision(osv.osv):
+class decimal_precision(orm.Model):
     _name = 'decimal.precision'
     _columns = {
         'name': fields.char('Usage', size=50, select=True, required=True),
@@ -71,4 +71,29 @@ def get_precision(application):
         return (16, res)
     return change_digit
 
+class DecimalPrecisionFloat(orm.AbstractModel):
+    """ Override qweb.field.float to add a `decimal_precision` domain option
+    and use that instead of the column's own value if it is specified
+    """
+    _inherit = 'ir.qweb.field.float'
+
+
+    def precision(self, cr, uid, column, options=None, context=None):
+        dp = options and options.get('decimal_precision')
+        if dp:
+            return self.pool['decimal.precision'].precision_get(
+                cr, uid, dp)
+
+        return super(DecimalPrecisionFloat, self).precision(
+            cr, uid, column, options=options, context=context)
+
+class DecimalPrecisionTestModel(orm.Model):
+    _name = 'decimal.precision.test'
+
+    _columns = {
+        'float': fields.float(),
+        'float_2': fields.float(digits=(16, 2)),
+        'float_4': fields.float(digits=(16, 4)),
+    }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/decimal_precision/tests/__init__.py b/addons/decimal_precision/tests/__init__.py
new file mode 100644
index 00000000000..feee24c8f15
--- /dev/null
+++ b/addons/decimal_precision/tests/__init__.py
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+import test_qweb_float
+
+checks = [
+    test_qweb_float
+]
diff --git a/addons/decimal_precision/tests/test_qweb_float.py b/addons/decimal_precision/tests/test_qweb_float.py
new file mode 100644
index 00000000000..93334170f37
--- /dev/null
+++ b/addons/decimal_precision/tests/test_qweb_float.py
@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+from openerp.tests import common
+
+class TestFloatExport(common.TransactionCase):
+    def setUp(self):
+        super(TestFloatExport, self).setUp()
+        self.Model = self.registry('decimal.precision.test')
+
+    def get_converter(self, name):
+        converter = self.registry('ir.qweb.field.float')
+        column = self.Model._all_columns[name].column
+
+        return lambda value, options=None: converter.value_to_html(
+            self.cr, self.uid, value, column, options=options, context=None)
+
+    def test_basic_float(self):
+        converter = self.get_converter('float')
+        self.assertEqual(
+            converter(42.0),
+            "42.0")
+        self.assertEqual(
+            converter(42.12345),
+            "42.12345")
+
+        converter = self.get_converter('float_2')
+        self.assertEqual(
+            converter(42.0),
+            "42.00")
+        self.assertEqual(
+            converter(42.12345),
+            "42.12")
+
+        converter = self.get_converter('float_4')
+        self.assertEqual(
+            converter(42.0),
+            '42.0000')
+        self.assertEqual(
+            converter(42.12345),
+            '42.1234')
+
+    def test_precision_domain(self):
+        DP = self.registry('decimal.precision')
+        DP.create(self.cr, self.uid, {
+            'name': 'A',
+            'digits': 2,
+        })
+        DP.create(self.cr, self.uid, {
+            'name': 'B',
+            'digits': 6,
+        })
+
+        converter = self.get_converter('float')
+        self.assertEqual(
+            converter(42.0, {'decimal_precision': 'A'}),
+            '42.00')
+        self.assertEqual(
+            converter(42.0, {'decimal_precision': 'B'}),
+            '42.000000')
+
+        converter = self.get_converter('float_4')
+        self.assertEqual(
+            converter(42.12345, {'decimal_precision': 'A'}),
+            '42.12')
+        self.assertEqual(
+            converter(42.12345, {'decimal_precision': 'B'}),
+            '42.123450')

From 24c3e4016b428b69dc70a22598ea30b5eca9416e Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Mon, 21 Oct 2013 11:51:58 +0200
Subject: [PATCH 09/18] [IMP] Ace: light opacity trick

bzr revid: ddm@openerp.com-20131021095158-6037xha2bqyihv0q
---
 addons/website/static/src/css/editor.css  | 4 ++--
 addons/website/static/src/css/editor.sass | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index b939ec11b6d..a3151d14855 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -641,8 +641,8 @@ table.editorbar-panel td.selected {
   cursor: ew-resize;
 }
 .oe_ace_view_editor.oe_ace_open {
-  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=100);
-  opacity: 1;
+  filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=97);
+  opacity: 0.97;
 }
 .oe_ace_view_editor.oe_ace_closed {
   z-index: -1000;
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 092194e9e10..dcfa88b89e7 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -503,7 +503,7 @@ $navbar_height: 51px
         .ace_gutter
             cursor: ew-resize
     &.oe_ace_open
-        +opacity(1)
+        +opacity(0.97)
     &.oe_ace_closed
         z-index: -1000
         +opacity(0)

From 75a4a7e3f827ad559a65f73c60fbc3cfb595dc53 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Mon, 21 Oct 2013 12:28:40 +0200
Subject: [PATCH 10/18] [IMP] Ace: proper template naming

bzr revid: ddm@openerp.com-20131021102840-h8s2nflqdmuumun0
---
 addons/website_mail/views/website_mail.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml
index 8ed809a6eab..5fdff8d4c04 100644
--- a/addons/website_mail/views/website_mail.xml
+++ b/addons/website_mail/views/website_mail.xml
@@ -17,7 +17,7 @@
             </div>
         </template>
 
-        <template id="website.layout" inherit_id="website.layout">
+        <template id="website.layout" name="Mail customization" inherit_id="website.layout">
             <!-- Load stylesheets before scripts to avoid blocking -->
             <xpath expr="//head/link" position="after">
                 <link rel='stylesheet' href='/website_mail/static/src/css/website_mail.css'/>

From 2771c47379a7542143da64304054fa1c02cd06f9 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Mon, 21 Oct 2013 15:39:57 +0200
Subject: [PATCH 11/18] [FIX] Ace: proper template naming

bzr revid: ddm@openerp.com-20131021133957-7ktyfk21a0huj1vl
---
 addons/website/static/src/js/website.ace.js |  4 +++-
 addons/website/views/website_templates.xml  |  2 +-
 addons/website_sale/views/website_sale.xml  | 22 ++++++++++-----------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/addons/website/static/src/js/website.ace.js b/addons/website/static/src/js/website.ace.js
index 66984731ac0..02f5eb68d5e 100644
--- a/addons/website/static/src/js/website.ace.js
+++ b/addons/website/static/src/js/website.ace.js
@@ -133,8 +133,10 @@
         },
         loadViews: function (views) {
             var self = this;
-            var activeViews = _.filter(views, function (view) {
+            var activeViews = _.uniq(_.filter(views, function (view) {
                return view.active;
+            }), false, function (view) {
+                return view.id;
             });
             var $viewList = self.$('#ace-view-list');
             _.each(activeViews, function (view) {
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 85767884773..19ff01ba997 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -259,7 +259,7 @@
             </t>
         </template>
 
-        <template id="pager">
+        <template id="pager" name="Pager">
             <ul t-if="pager['page_count'] > 1" t-attf-class="#{ classname or '' } pagination">
                 <li t-att-class=" 'disabled' if pager['page']['num'] == 1 else '' ">
                      <a t-att-href=" pager['page_start']['url'] if pager['page']['num'] != 1 else '' ">Prev</a>
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index a263a01ed2e..d8e446e79d3 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -19,7 +19,7 @@
 
     <!-- List of categories -->
 
-    <template id="categories_recursive">
+    <template id="categories_recursive" name="Category list">
         <li t-att-class="category.id == search.get('category') and 'active' or ''">
             <a t-att-class="category.id not in categ[1] and 'unpublish' or ''" t-href="/shop/?category=#{ category.id }" t-field="category.name" t-keep-query="search,facettes"></a>
             <ul t-if="category.child_id" class="nav nav-pills nav-stacked nav-hierarchy">
@@ -32,9 +32,9 @@
         </li>
     </template>
 
-    <!-- Product list --> 
+    <!-- Product list -->
 
-    <template id="products_cart">
+    <template id="products_cart" name="Shopping cart">
       <div class="ribbon-wrapper">
         <div class="ribbon">Promo</div>
       </div>
@@ -65,7 +65,7 @@
       </div>
     </template>
 
-    <template id="products" page="True">
+    <template id="products" name="Products" page="True">
         <t t-call="website.layout">
             <t t-set="head">
                 <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
@@ -108,7 +108,7 @@
                                 t-attf-class="oe_product oe-height-#{td_product['y']*2} #{ td_product['class'] }">
 
                                 <div class="oe_product_cart" t-att-data-publish="product.website_published and 'on' or 'off'">
-                                  
+
                                   <div class="css_options" t-ignore="true" t-if="editable">
                                     <div t-attf-class="dropdown js_options" t-att-data-id="product.id">
                                       <a class="btn btn-default" t-att-id="'dopprod-%s' % product.id" role="button" data-toggle="dropdown">Options <span class="caret"></span></a>
@@ -215,7 +215,7 @@
     </template>
 
 
-    <!-- product --> 
+    <!-- product -->
 
     <template id="product" name="Product">
         <t t-call="website.layout">
@@ -287,7 +287,7 @@
                           <div class="product_price mt16">
                               <h4>
                                   <b><span class="oe_price" t-esc="product.product_variant_ids[0].price" /> €</b>
-                              
+
                                   <t t-if="product.product_variant_ids[0].lst_price != product.product_variant_ids[0].price">
                                     <span class="text-danger" style="text-decoration: line-through;">
                                         <t t-esc="product.product_variant_ids[0].lst_price" /> €
@@ -338,7 +338,7 @@
         </xpath>
     </template>
 
-    <!-- Page Shop my cart --> 
+    <!-- Page Shop my cart -->
 
     <template id="mycart" name="Your Cart" page="True">
         <t t-call="website.layout">
@@ -419,7 +419,7 @@
                                             </a>
                                         </span>
                                     </div>
-                                    
+
                                 </td>
                             </tr>
                         </tbody>
@@ -478,7 +478,7 @@
         </t>
     </template>
 
-    <!-- Page Shop --> 
+    <!-- Page Shop -->
 
     <template id="products_categories" inherit_option_id="website_sale.products" name="Product Categories">
         <xpath expr="//div[@id='products_grid']" position="before">
@@ -622,7 +622,7 @@
                 <div class="row">
                 <div class="col-md-8 oe_mycart">
                     <h3 class="page-header mt16">Set Billing Information
-                        <small t-if="user_id.id == website.public_user.id"> or 
+                        <small t-if="user_id.id == website.public_user.id"> or
                             <a t-if="not partner" t-attf-href="/web#action=redirect&amp;url=#{ request.httprequest.host_url }/shop/checkout/">sign in</a>
                         </small>
                     </h3>

From 05476f9b3112d90401cb2272468e79a61a2d29da Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 21 Oct 2013 17:01:24 +0200
Subject: [PATCH 12/18] [IMP] double click on image change on banner

bzr revid: fp@tinyerp.com-20131021150124-411dxmatcxorto0m
---
 .../website/static/src/js/website.snippets.js | 58 +++++++++----------
 1 file changed, 26 insertions(+), 32 deletions(-)

diff --git a/addons/website/static/src/js/website.snippets.js b/addons/website/static/src/js/website.snippets.js
index e411ee7065c..477eadcd759 100644
--- a/addons/website/static/src/js/website.snippets.js
+++ b/addons/website/static/src/js/website.snippets.js
@@ -341,13 +341,13 @@
                     });
                 },
                 stop: function(ev, ui){
-		    if (action === 'insert' && ! dropped) {
-		        var el = $('.oe_drop_zone').nearest({x: ui.position.left, y: ui.position.top}).first()
-			if (el) {
-			    el.after($toInsert)
-			    dropped = true;
-			}
-		    }
+                    if (action === 'insert' && ! dropped) {
+                        var el = $('.oe_drop_zone').nearest({x: ui.position.left, y: ui.position.top}).first()
+                        if (el) {
+                            el.after($toInsert)
+                            dropped = true;
+                        }
+                    }
 
                     $('.oe_drop_zone').droppable('destroy').remove();
                     if (dropped) {
@@ -967,23 +967,25 @@
 
         _drag_and_drop_after_insert_dropzone: function(){
             var self = this;
-            var $zones = $(".row:has(> .oe_drop_zone)").each(function () {
-                var $row = $(this);
-                var width = $row.innerWidth();
-                var pos = 0;
-                while (width > pos + self.size.width) {
-                    var $last = $row.find("> .oe_drop_zone:last");
-                    $last.each(function () {
-                        pos = $(this).position().left;
-                    });
-                    if (width > pos + self.size.width) {
-                        $row.append("<div class='col-md-1 oe_drop_to_remove'/>");
-                        var $add_drop = $last.clone();
-                        $row.append($add_drop);
-                        self._drag_and_drop_active_drop_zone($add_drop);
-                    }
-                }
-            });
+            // commented for perf
+
+            // var $zones = $(".row:has(> .oe_drop_zone)").each(function () {
+            //     var $row = $(this);
+            //     var width = $row.innerWidth();
+            //     var pos = 0;
+            //     while (width > pos + self.size.width) {
+            //         var $last = $row.find("> .oe_drop_zone:last");
+            //         $last.each(function () {
+            //             pos = $(this).position().left;
+            //         });
+            //         if (width > pos + self.size.width) {
+            //             $row.append("<div class='col-md-1 oe_drop_to_remove'/>");
+            //             var $add_drop = $last.clone();
+            //             $row.append($add_drop);
+            //             self._drag_and_drop_active_drop_zone($add_drop);
+            //         }
+            //     }
+            // });
         },
         _drag_and_drop_start: function () {
             this._super();
@@ -1077,14 +1079,6 @@
                 self.$target.carousel();
             });
 
-            this.$target.on('dblclick', '.item.active .carousel-image img', function (event) {
-                var $img = $(event.currentTarget);
-                var editor = new website.editor.ImageDialog();
-                editor.on('start', self, function (o) {o.url = $img.attr("src");});
-                editor.on('save', self, function (o) {$img.attr("src", o.url);});
-                editor.appendTo($('body'));
-            });
-
             this.rebind_event();
         },
         // rebind event to active carousel on edit mode

From 9da0ead28dd46e8b482291f8e9760b000dcdad7c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 21 Oct 2013 17:26:51 +0200
Subject: [PATCH 13/18] [ADD] support for formatted date and datetime t-field
 in website

bzr revid: xmo@openerp.com-20131021152651-ner2zggjfofb5rc4
---
 addons/website/models/ir_qweb.py            | 8 ++++++++
 addons/website/security/ir.model.access.csv | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/addons/website/models/ir_qweb.py b/addons/website/models/ir_qweb.py
index dd7f8346e0f..8de6ede6a50 100644
--- a/addons/website/models/ir_qweb.py
+++ b/addons/website/models/ir_qweb.py
@@ -69,6 +69,14 @@ class Float(orm.AbstractModel):
 
     value_from_string = float
 
+class Date(orm.AbstractModel):
+    _name = 'website.qweb.field.date'
+    _inherit = ['website.qweb.field', 'ir.qweb.field.date']
+
+class DateTime(orm.AbstractModel):
+    _name = 'website.qweb.field.datetime'
+    _inherit = ['website.qweb.field', 'ir.qweb.field.datetime']
+
 class Text(orm.AbstractModel):
     _name = 'website.qweb.field.text'
     _inherit = ['website.qweb.field', 'ir.qweb.field.text']
diff --git a/addons/website/security/ir.model.access.csv b/addons/website/security/ir.model.access.csv
index 70d6877d313..431170e462b 100644
--- a/addons/website/security/ir.model.access.csv
+++ b/addons/website/security/ir.model.access.csv
@@ -7,6 +7,8 @@ access_website_qweb,access_website_qweb,model_website_qweb,,0,0,0,0
 access_website_qweb_field,access_website_qweb_field,model_website_qweb_field,,0,0,0,0
 access_website_qweb_field_integer,access_website_qweb_field_integer,model_website_qweb_field_integer,,0,0,0,0
 access_website_qweb_field_float,access_website_qweb_field_float,model_website_qweb_field_float,,0,0,0,0
+access_website_qweb_field_date,access_website_qweb_field_date,model_website_qweb_field_date,,0,0,0,0
+access_website_qweb_field_datetime,access_website_qweb_field_datetime,model_website_qweb_field_datetime,,0,0,0,0
 access_website_qweb_field_text,access_website_qweb_field_text,model_website_qweb_field_text,,0,0,0,0
 access_website_qweb_field_selection,access_website_qweb_field_selection,model_website_qweb_field_selection,,0,0,0,0
 access_website_qweb_field_many2one,access_website_qweb_field_many2one,model_website_qweb_field_many2one,,0,0,0,0

From 24e87a724a1d76fd47c301d4b404e0e675aba119 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 21 Oct 2013 17:39:18 +0200
Subject: [PATCH 14/18] [IMP] uncomment for perf

bzr revid: fp@tinyerp.com-20131021153918-zpnp0xhisorgg3ws
---
 .../website/static/src/js/website.snippets.js | 36 +++++++++----------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/addons/website/static/src/js/website.snippets.js b/addons/website/static/src/js/website.snippets.js
index 477eadcd759..ee759e3d153 100644
--- a/addons/website/static/src/js/website.snippets.js
+++ b/addons/website/static/src/js/website.snippets.js
@@ -967,25 +967,23 @@
 
         _drag_and_drop_after_insert_dropzone: function(){
             var self = this;
-            // commented for perf
-
-            // var $zones = $(".row:has(> .oe_drop_zone)").each(function () {
-            //     var $row = $(this);
-            //     var width = $row.innerWidth();
-            //     var pos = 0;
-            //     while (width > pos + self.size.width) {
-            //         var $last = $row.find("> .oe_drop_zone:last");
-            //         $last.each(function () {
-            //             pos = $(this).position().left;
-            //         });
-            //         if (width > pos + self.size.width) {
-            //             $row.append("<div class='col-md-1 oe_drop_to_remove'/>");
-            //             var $add_drop = $last.clone();
-            //             $row.append($add_drop);
-            //             self._drag_and_drop_active_drop_zone($add_drop);
-            //         }
-            //     }
-            // });
+            var $zones = $(".row:has(> .oe_drop_zone)").each(function () {
+                var $row = $(this);
+                var width = $row.innerWidth();
+                var pos = 0;
+                while (width > pos + self.size.width) {
+                    var $last = $row.find("> .oe_drop_zone:last");
+                    $last.each(function () {
+                        pos = $(this).position().left;
+                    });
+                    if (width > pos + self.size.width) {
+                        $row.append("<div class='col-md-1 oe_drop_to_remove'/>");
+                        var $add_drop = $last.clone();
+                        $row.append($add_drop);
+                        self._drag_and_drop_active_drop_zone($add_drop);
+                    }
+                }
+            });
         },
         _drag_and_drop_start: function () {
             this._super();

From 730d0c69fe19c406ee71f35b2d9cff0c308f777c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 22 Oct 2013 09:33:26 +0200
Subject: [PATCH 15/18] [IMP] ensure we don't unwittingly save wrongly
 formatted dates and datetimes

bzr revid: xmo@openerp.com-20131022073326-gxmcfd60ytq2f1oc
---
 addons/website/models/ir_qweb.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/addons/website/models/ir_qweb.py b/addons/website/models/ir_qweb.py
index 8de6ede6a50..d21f6b9c1d9 100644
--- a/addons/website/models/ir_qweb.py
+++ b/addons/website/models/ir_qweb.py
@@ -73,10 +73,16 @@ class Date(orm.AbstractModel):
     _name = 'website.qweb.field.date'
     _inherit = ['website.qweb.field', 'ir.qweb.field.date']
 
+    def from_html(self, cr, uid, model, column, element, context=None):
+        raise NotImplementedError("Can not parse and save localized dates")
+
 class DateTime(orm.AbstractModel):
     _name = 'website.qweb.field.datetime'
     _inherit = ['website.qweb.field', 'ir.qweb.field.datetime']
 
+    def from_html(self, cr, uid, model, column, element, context=None):
+        raise NotImplementedError("Can not parse and save localized datetimes")
+
 class Text(orm.AbstractModel):
     _name = 'website.qweb.field.text'
     _inherit = ['website.qweb.field', 'ir.qweb.field.text']

From 1687668026138b3504af1cc69f4ab65a3cfd932f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 22 Oct 2013 10:54:50 +0200
Subject: [PATCH 16/18] [ADD] parsing of locale-formatted floats

bzr revid: xmo@openerp.com-20131022085450-mhymubsywkonepjx
---
 addons/website/models/ir_qweb.py       | 8 +++++++-
 addons/website/tests/test_converter.py | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/addons/website/models/ir_qweb.py b/addons/website/models/ir_qweb.py
index d21f6b9c1d9..3193cbc3c9e 100644
--- a/addons/website/models/ir_qweb.py
+++ b/addons/website/models/ir_qweb.py
@@ -67,7 +67,13 @@ class Float(orm.AbstractModel):
     _name = 'website.qweb.field.float'
     _inherit = ['website.qweb.field', 'ir.qweb.field.float']
 
-    value_from_string = float
+    def from_html(self, cr, uid, model, column, element, context=None):
+        lang = self.user_lang(cr, uid, context=context)
+
+        value = element.text_content().strip()
+
+        return float(value.replace(lang.thousands_sep, '')
+                          .replace(lang.decimal_point, '.'))
 
 class Date(orm.AbstractModel):
     _name = 'website.qweb.field.date'
diff --git a/addons/website/tests/test_converter.py b/addons/website/tests/test_converter.py
index 6aa04bf4d93..1086ec8e8d3 100644
--- a/addons/website/tests/test_converter.py
+++ b/addons/website/tests/test_converter.py
@@ -53,6 +53,7 @@ class TestConvertBack(common.TransactionCase):
 
     def test_float(self):
         self.field_roundtrip('float', 42.567890)
+        self.field_roundtrip('float', 324542.567890)
 
     def test_numeric(self):
         self.field_roundtrip('numeric', 42.77)

From 13777d3a7981dceb06b2bc247ff23f07e6d3f194 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 22 Oct 2013 11:08:43 +0200
Subject: [PATCH 17/18] [ADD] parsing of localized monetary t-field

bzr revid: xmo@openerp.com-20131022090843-pcr6orrumzm4hf6a
---
 addons/website/models/ir_qweb.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/website/models/ir_qweb.py b/addons/website/models/ir_qweb.py
index 3193cbc3c9e..948422e8296 100644
--- a/addons/website/models/ir_qweb.py
+++ b/addons/website/models/ir_qweb.py
@@ -203,4 +203,9 @@ class Monetary(orm.AbstractModel):
     _inherit = ['website.qweb.field', 'ir.qweb.field.monetary']
 
     def from_html(self, cr, uid, model, column, element, context=None):
-        return float(element.find('span').text)
+        lang = self.user_lang(cr, uid, context=context)
+
+        value = element.find('span').text.strip()
+
+        return float(value.replace(lang.thousands_sep, '')
+                          .replace(lang.decimal_point, '.'))

From 3c87025227567778c87698155e6d5b92aaf75771 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 22 Oct 2013 12:37:03 +0200
Subject: [PATCH 18/18] [FIX] Convert url attributes to their
 t-(src,href,action) counterparts on ir.ui.view#save()

bzr revid: fme@openerp.com-20131022103703-cnydralsbt45i6eo
---
 addons/website/models/ir_ui_view.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/addons/website/models/ir_ui_view.py b/addons/website/models/ir_ui_view.py
index d6ad607fa3f..955ca4f758b 100644
--- a/addons/website/models/ir_ui_view.py
+++ b/addons/website/models/ir_ui_view.py
@@ -2,6 +2,7 @@
 
 from lxml import etree, html
 from openerp.osv import osv, fields
+from urlparse import urlparse
 
 
 class view(osv.osv):
@@ -91,6 +92,23 @@ class view(osv.osv):
             arch = previous_arch
         return arch
 
+    def _normalize_urls(self, element):
+        attr = None
+        if element.tag == 'form':
+            attr = 'action' if 'action' in element.attrib else None
+        elif element.tag in ['a', 'link']:
+            attr = 'href' if 'href' in element.attrib else None
+        elif element.tag in ['frame', 'iframe', 'img', 'input', 'script']:
+            attr = 'src' if 'src' in element.attrib else None
+        if attr:
+            value = element.attrib[attr]
+            if not urlparse(value).scheme:
+                element.attrib.pop(attr)
+                element.attrib['t-' + attr] = value
+        for el in list(element):
+            self._normalize_urls(el)
+        return element
+
     def save(self, cr, uid, res_id, value, xpath=None, context=None):
         """ Update a view section. The view section may embed fields to write
 
@@ -103,6 +121,8 @@ class view(osv.osv):
         arch_section = html.fromstring(
             value, parser=html.HTMLParser(encoding='utf-8'))
 
+        self._normalize_urls(arch_section)
+
         if xpath is None:
             # value is an embedded field on its own, not a view section
             self.save_embedded_field(cr, uid, arch_section, context=context)