From efe1e4a183867aa19a2f4d3063091c0e373ddda6 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 7 Feb 2014 16:54:54 +0100
Subject: [PATCH 01/12] [FIX] website test: remove hack for runbot

bzr revid: chm@openerp.com-20140207155454-jf3pwp3hl9nvay6m
---
 addons/website/tests/test_ui.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/addons/website/tests/test_ui.py b/addons/website/tests/test_ui.py
index e79a2eb13ec..eafe791c204 100644
--- a/addons/website/tests/test_ui.py
+++ b/addons/website/tests/test_ui.py
@@ -86,10 +86,6 @@ class WebsiteUiSuite(unittest.TestSuite):
         self._options['timeout'] = self._timeout
         self._options['port'] = tools.config.get('xmlrpc_port', 80)
         self._options['db'] = tools.config.get('db_name', '')
-        # FIX for runbot test
-        if hasattr(os, 'uname') and os.uname()[1].startswith('runbot.'):
-            self._options['host'] = tools.config.get('db_name', '') + ".runbot.openerp.com"
-
         if 'user' not in self._options:
             self._options['user'] = 'admin'
             self._options['password'] = 'admin'

From 234aa3928584fe1a83def860df1ae9d706b02ea3 Mon Sep 17 00:00:00 2001
From: jke-openerp <jke@openerp.com>
Date: Fri, 7 Feb 2014 18:16:37 +0100
Subject: [PATCH 02/12] [FIX] Fix bug when an event with date_startand
 date_stop (and not datetime as calendar) have always 1 days in more.

bzr revid: jke@openerp.com-20140207171637-j37cnt63cywstrtj
---
 addons/web_calendar/static/src/js/web_calendar.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/addons/web_calendar/static/src/js/web_calendar.js b/addons/web_calendar/static/src/js/web_calendar.js
index b283f8b5cb1..ef84f8a2784 100644
--- a/addons/web_calendar/static/src/js/web_calendar.js
+++ b/addons/web_calendar/static/src/js/web_calendar.js
@@ -492,11 +492,7 @@ openerp.web_calendar = function(instance) {
                 all_day = this.all_day ? evt[this.all_day] : false,
                 res_computed_text = '',
                 the_title = '',
-                attendees = [];                
-
-            if (this.date_stop && this.fields[this.date_stop].type == 'date') {
-                date_stop.addDay(1);
-            }
+                attendees = [];          
 
             if (this.info_fields) {
                 var temp_ret = {};

From 38b7c38e32575e736251e0a7c52a40dfee31ca9d Mon Sep 17 00:00:00 2001
From: Denis Ledoux <dle@openerp.com>
Date: Fri, 7 Feb 2014 18:21:57 +0100
Subject: [PATCH 03/12] [FIX] website: config settings does write the values on
 the website model

This config contains only related fields of the website_id many2one.
The problem is that applying the change CREATE a res config settings
And the create orm method does not forward and write the values on the related fields.
Write does.
The best fix should be to change all these related fields to char fields,
and to create the set_ method who will acutally set the value to the website_id.
But, unfortunately, this is a stable branch
And we cannot alter the database structure in stable branches.

bzr revid: dle@openerp.com-20140207172157-6upyhuin93qlkrfa
---
 addons/website/models/res_config.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/addons/website/models/res_config.py b/addons/website/models/res_config.py
index 9823d286f37..1ae491388a3 100644
--- a/addons/website/models/res_config.py
+++ b/addons/website/models/res_config.py
@@ -29,6 +29,14 @@ class website_config_settings(osv.osv_memory):
                 values[fname] = v[0] if v and self._columns[fname]._type == 'many2one' else v
         return {'value' : values}
 
+    # FIXME in trunk for god sake. Change the fields above to fields.char instead of fields.related, 
+    # and create the function set_website who will set the value on the website_id
+    # create does not forward the values to the related many2one. Write does.
+    def create(self, cr, uid, vals, context=None):
+        config_id = super(website_config_settings, self).create(cr, uid, vals, context=context)
+        self.write(cr, uid, config_id, vals, context=context)
+        return config_id
+
     _defaults = {
         'website_id': lambda self,cr,uid,c: self.pool.get('website').search(cr, uid, [], context=c)[0],
     }

From 0b831e4df064d31eac32a3afd8b0786b2b24e29c Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Fri, 7 Feb 2014 19:48:29 +0100
Subject: [PATCH 04/12] [FIX] auth_oauth_signup: handle the case when there is
 no providers

bzr revid: chs@openerp.com-20140207184829-qdy0jbx5pku1z072
---
 addons/auth_oauth_signup/views/auth_oauth_signup.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/auth_oauth_signup/views/auth_oauth_signup.xml b/addons/auth_oauth_signup/views/auth_oauth_signup.xml
index e6735ebd58a..139f36a4c0f 100644
--- a/addons/auth_oauth_signup/views/auth_oauth_signup.xml
+++ b/addons/auth_oauth_signup/views/auth_oauth_signup.xml
@@ -5,7 +5,7 @@
     <template id="auth_oauth_signup.signup" inherit_id="auth_signup.signup" name="OAuth Signup buttons">
       <xpath expr="//button[@type='submit']" position="before">
         <div class="pull-right">
-          <div t-foreach="providers" t-as="p">
+          <div t-foreach="providers or []" t-as="p">
             <a t-att-href="p['auth_link']" class="btn btn-link">
               <i t-att-class="p['css_class']"/>
               <t t-esc="p['body']"/>

From a3710efdb13d108887bdb9655f77fbab7742b48c Mon Sep 17 00:00:00 2001
From: "al@openerp.com" <>
Date: Sat, 8 Feb 2014 01:47:31 +0100
Subject: [PATCH 05/12] dirty fix for auth_signup

bzr revid: al@openerp.com-20140208004731-atwco93ghwspmlh3
---
 addons/auth_signup/controllers/main.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py
index 06c916d9580..3f53b28b075 100644
--- a/addons/auth_signup/controllers/main.py
+++ b/addons/auth_signup/controllers/main.py
@@ -36,7 +36,10 @@ class AuthSignup(openerp.addons.web.controllers.main.Home):
     def web_login(self, *args, **kw):
         mode = request.params.get('mode')
         qcontext = request.params.copy()
+        super_response = super(AuthSignup, self).web_login(*args, **kw)
         response = webmain.render_bootstrap_template(request.session.db, 'auth_signup.signup', qcontext, lazy=True)
+        if isinstance(super_response, LazyResponse):
+            response.params['values'].update(super_response.params['values'])
         token = qcontext.get('token', None)
         token_infos = None
         if token:
@@ -60,10 +63,9 @@ class AuthSignup(openerp.addons.web.controllers.main.Home):
         qcontext.update(config)
 
         if 'error' in qcontext or mode not in ('reset', 'signup') or (not token and not config[mode]):
-            response = super(AuthSignup, self).web_login(*args, **kw)
-            if isinstance(response, LazyResponse):
-                response.params['values'].update(config)
-            return response
+            if isinstance(super_response, LazyResponse):
+                super_response.params['values'].update(config)
+            return super_response
 
         if request.httprequest.method == 'GET':
             if token_infos:

From 0821af1af96c0ff59770a32c03b0bd5cdf960c39 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 10 Feb 2014 13:34:16 +0100
Subject: [PATCH 06/12] [FIX] close autocomplete listing on input

Closing previously occured on search request (so that a user wouldn't be able
to select "old" data on new search request), but ``search`` is only triggered
after the search delay. Worked when delay was 0, with it being moved to 250 a
user can get results matching the previous search instead of the current one.

Trigger a closing of the current results list on any ``input`` event, which is
when text is entered in any of the searchview's ``InputView``.

bzr revid: xmo@openerp.com-20140210123416-cfc0x24bfkiv4lse
---
 addons/web/static/src/js/search.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js
index fa9bae9969d..903a9f4683e 100644
--- a/addons/web/static/src/js/search.js
+++ b/addons/web/static/src/js/search.js
@@ -473,12 +473,9 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
      * Sets up search view's view-wide auto-completion widget
      */
     setup_global_completion: function () {
-        var self = this;
-
         var autocomplete = this.$el.autocomplete({
             source: this.proxy('complete_global_search'),
             select: this.proxy('select_completion'),
-            search: function () { self.$el.autocomplete('close'); },
             focus: function (e) { e.preventDefault(); },
             html: true,
             autoFocus: true,
@@ -486,6 +483,10 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
             delay: 250,
         }).data('autocomplete');
 
+        this.$el.on('input', function () {
+            this.$el.autocomplete('close');
+        }.bind(this));
+
         // MonkeyPatch autocomplete instance
         _.extend(autocomplete, {
             _renderItem: function (ul, item) {

From e95eb140a74487a91a4c657c3616e4ceb10ea9b4 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 10 Feb 2014 14:05:04 +0100
Subject: [PATCH 07/12] [CHG] website: fp wants image 'change' buttons to be
 btn-sm

bzr revid: xmo@openerp.com-20140210130504-hejvay436emh7f36
---
 addons/website/static/src/js/website.editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 1e8246366a9..7e867dca685 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -638,7 +638,7 @@
                 image_dialog(editor, new CKEDITOR.dom.element(previous));
                 $image_button.hide();
                 previous = null;
-            });
+            }, 'btn-sm');
 
             // previous is the state of the button-trigger: it's the
             // currently-ish hovered element which can trigger a button showing.

From d4c7de4b03c7f21f79bdad97ff4475e367572c61 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 10 Feb 2014 14:28:55 +0100
Subject: [PATCH 08/12] [FIX] work around distribute_branding

distribute_branding is applied after view inheritance is applied, and does not
take it in account. As a result, altering an existing view "from the top"
(e.g. adding a div element preceding an existing div) will alter the xpath
leading to whatever element we need to deal with.

Move fakebar injection to the bottom of the body, where it can't have any
impact on preceding node paths.

bzr revid: xmo@openerp.com-20140210132855-lwh1ow1tq1e0pidp
---
 addons/website/views/website_templates.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index bf61f64a1b9..9073ccb7a4a 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -224,7 +224,7 @@
     <xpath expr="//body" position="attributes">
         <attribute name="style">padding-top: 51px;</attribute>
     </xpath>
-    <xpath expr="//body/*[1]" position="before">
+    <xpath expr="//body" position="inside">
         <div id="website-top-navbar-placeholder" class="navbar navbar-inverse navbar-fixed-top hidden-xs">
             <div class="navbar-header">
                 <form class="navbar-form navbar-left">

From 0da8cdda9046a15191b75374643c922ac66e98d3 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 10 Feb 2014 15:35:46 +0100
Subject: [PATCH 09/12] [FIX] Set default 'editable' key in website's rendering
 context

bzr revid: fme@openerp.com-20140210143546-1t82gog330n5x89t
---
 addons/website/models/ir_ui_view.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/website/models/ir_ui_view.py b/addons/website/models/ir_ui_view.py
index f8c0eadbfa9..a789657dad3 100644
--- a/addons/website/models/ir_ui_view.py
+++ b/addons/website/models/ir_ui_view.py
@@ -133,8 +133,9 @@ class view(osv.osv):
             if not context:
                 context = {}
 
-            qcontext = context.copy()
+            qcontext = dict(editable=False)
             qcontext.update(
+                context.copy(),
                 website=request.website,
                 url_for=website.url_for,
                 slug=website.slug,

From abc49aebd5ab904c598c16374db17df65eb2e408 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 10 Feb 2014 15:59:23 +0100
Subject: [PATCH 10/12] [FIX] website: don't set tour as automatic when reload
 page

bzr revid: chm@openerp.com-20140210145923-2w9vbxqqgewgkb0w
---
 addons/website/static/src/js/website.tour.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index 408a4c01539..8b1284f0a07 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -77,7 +77,11 @@ website.Tour = openerp.Class.extend({
 
         website.Tour.busy = true;
 
-        this.localStorage.setItem("tour-"+this.id+"-test-automatic", automatic);
+        if (automatic) {
+            this.localStorage.setItem("tour-"+this.id+"-test-automatic", true);
+        } else {
+            this.localStorage.removeItem("tour-"+this.id+"-test-automatic");
+        }
         this.automatic = automatic;
 
         if (this.path) {

From 3a273b989cf403d4c35f03f7032fcb5b5a5239db Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 10 Feb 2014 16:17:41 +0100
Subject: [PATCH 11/12] [IMP] website: typo for tutorial

bzr revid: chm@openerp.com-20140210151741-grf5wsvjonuihxw0
---
 .../static/src/js/website.tour.banner.js      | 28 +++++++++++++++----
 .../website/static/src/xml/website.tour.xml   |  2 +-
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/addons/website/static/src/js/website.tour.banner.js b/addons/website/static/src/js/website.tour.banner.js
index c5b04091b40..7bcd4fbcbd1 100644
--- a/addons/website/static/src/js/website.tour.banner.js
+++ b/addons/website/static/src/js/website.tour.banner.js
@@ -71,8 +71,8 @@
                 {
                     snippet:   'three-columns',
                     placement: 'bottom',
-                    title:     _t("Drag & Drop a Block"),
-                    content:   _t("Drag the <em>'3 Columns'</em> block and drop it below the banner."),
+                    title:     _t("Drag & Drop This Block"),
+                    content:   _t("Drag the <em>'Three Columns'</em> block and drop it below the banner."),
                     popover:   { fixed: true },
                 },
                 {
@@ -98,16 +98,32 @@
                     popover:   { fixed: true },
                 },
                 {
-                    element:   'button[data-dismiss=modal]',
+                    element:   '.modal:has(#mobile-viewport) button[data-dismiss=modal]',
                     placement: 'right',
                     title:     _t("Close Mobile Preview"),
                     content:   _t("Scroll in the mobile preview to test the rendering. Once it's ok, close this dialog."),
                 },
                 {
                     waitNot:   '.modal',
-                    title:     _t("Congrats"),
-                    content:   _t("Congratulation. This tour is finished."),
-                    popover:   { fixed: true, next: _t("Close Tutorial") },
+                    element:   '#content-menu-button',
+                    placement: 'bottom',
+                    title:     _t("Add new pages and menus"),
+                    content:   _t("The 'Content' menu allows you to add pages or add the top menu."),
+                    popover:   { next: _t("Continue") },
+                },
+                {
+                    element:   '#customize-menu-button',
+                    placement: 'bottom',
+                    title:     _t("Customize your pages"),
+                    content:   _t("The 'Customize' menu allows you to activate options and change the theme."),
+                    popover:   { next: _t("Continue") },
+                },
+                {
+                    element:   'a[data-action="promote-current-page"]',
+                    placement: 'bottom',
+                    title:     _t("Promote your website"),
+                    content:   _t("The 'Promote' menu allows you to promote each page for google and other search engines."),
+                    popover:   { next: _t("Close Tutorial") },
                 },
             ];
             return this._super();
diff --git a/addons/website/static/src/xml/website.tour.xml b/addons/website/static/src/xml/website.tour.xml
index 1365ba08307..dcecef021bb 100644
--- a/addons/website/static/src/xml/website.tour.xml
+++ b/addons/website/static/src/xml/website.tour.xml
@@ -22,6 +22,6 @@
         </div>
     </t>
     <t t-name="website.tour_popover_title">
-        <t t-esc="title"/><button title="Close Tutorial" type="button" class="close" data-role="end">×</button>
+        <t t-esc="title"/><button title="End This Tutorial" type="button" class="close" data-role="end">×</button>
     </t>
 </templates>

From 1ac9b4d20d0c549be3aa51c13ae4b1448334ff5b Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 10 Feb 2014 16:52:51 +0100
Subject: [PATCH 12/12] [IMP] website: banner tutorial: remove step about
 customize and promote

bzr revid: chm@openerp.com-20140210155251-iyj3v06r18vexj7d
---
 .../website/static/src/js/website.tour.banner.js   | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/addons/website/static/src/js/website.tour.banner.js b/addons/website/static/src/js/website.tour.banner.js
index 7bcd4fbcbd1..e23ea01d0d6 100644
--- a/addons/website/static/src/js/website.tour.banner.js
+++ b/addons/website/static/src/js/website.tour.banner.js
@@ -109,20 +109,6 @@
                     placement: 'bottom',
                     title:     _t("Add new pages and menus"),
                     content:   _t("The 'Content' menu allows you to add pages or add the top menu."),
-                    popover:   { next: _t("Continue") },
-                },
-                {
-                    element:   '#customize-menu-button',
-                    placement: 'bottom',
-                    title:     _t("Customize your pages"),
-                    content:   _t("The 'Customize' menu allows you to activate options and change the theme."),
-                    popover:   { next: _t("Continue") },
-                },
-                {
-                    element:   'a[data-action="promote-current-page"]',
-                    placement: 'bottom',
-                    title:     _t("Promote your website"),
-                    content:   _t("The 'Promote' menu allows you to promote each page for google and other search engines."),
                     popover:   { next: _t("Close Tutorial") },
                 },
             ];