From c8999f8553418b6eacd8f644345a1171ef508252 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 6 Aug 2013 09:53:46 +0200
Subject: [PATCH 01/27] [IMP] website_sale: description_website

bzr revid: chm@openerp.com-20130806075346-6bi5zbjw39juheih
---
 addons/website_sale/product.py          | 1 +
 addons/website_sale/views/ecommerce.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/website_sale/product.py b/addons/website_sale/product.py
index c6f8da63613..27e34f1cd9d 100644
--- a/addons/website_sale/product.py
+++ b/addons/website_sale/product.py
@@ -7,4 +7,5 @@ class product_pricelist(osv.osv):
     _inherit = "product.product"
     _columns = {
         'website_published': fields.boolean('Available in the website'),
+        'description_website': fields.html('Description for the website'),
     }
\ No newline at end of file
diff --git a/addons/website_sale/views/ecommerce.xml b/addons/website_sale/views/ecommerce.xml
index 3a96895a457..a7ac8d8b136 100644
--- a/addons/website_sale/views/ecommerce.xml
+++ b/addons/website_sale/views/ecommerce.xml
@@ -153,7 +153,7 @@
                         </button>
                     </div>
                     <img class="media-object" t-att-src="'data:image/png;base64,' + product.image"/>
-                    <div t-field="product.description_sale"></div>
+                    <div t-field="product.description_website"></div>
                     <div class="oe_ecommerce_price" t-field="product.list_price"><t t-esc="product.list_price"/> €</div>
                     <t t-call="website_sale.product_recommended"/>
                 </div>

From bf86ccf433f9c76d9467a9fdd18048f060f52774 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 6 Aug 2013 10:04:12 +0200
Subject: [PATCH 02/27] [IMP] website: clean xml

bzr revid: chm@openerp.com-20130806080412-aq2mtf577zt1t3pl
---
 addons/website_event/views/website_event.xml |  78 ++++++++-------
 addons/website_hr/views/website_hr.xml       |  48 ++++-----
 addons/website_mail/views/website_mail.xml   | 100 +++++++++----------
 3 files changed, 110 insertions(+), 116 deletions(-)

diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 125bec739a1..82811cdd76d 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -51,19 +51,7 @@
     </record>
 
     <!-- Page --> 
-    <template id="button">
-        <t t-if="event_id.register_avail">
-            <span t-if="event_id.register_avail == 9999" class="label pull-right">No ticket available.</span>
-            <span t-if="event_id.register_avail != 9999" t-att-class="'label pull-right label-%%s' %% (event_id.register_avail &lt;= 10 and 'warning' or 'info')">
-                <t t-if="event_id.register_avail &lt;= 10">Only</t>
-                <t t-esc="event_id.register_avail"/>
-                <t t-if="event_id.register_avail &gt; 1">tickets </t>
-                <t t-if="event_id.register_avail == 1">ticket </t>
-                available.
-            </span>
-        </t>
-    </template>
-
+ 
     <template id="index">
         <t t-call="website.layout">
             <t t-set="head">
@@ -101,30 +89,37 @@
                     </div>
                     <div class="span8">
                         <ul class="media-list mt32">
-                            <t t-foreach="event_ids" t-as="event_id">
-                                <li class="media thumbnail">
-                                    <div class="media-body">
-                                        <t t-call="website_event.button"/>
-                                        <h4 class="media-heading"><a t-att-href="'/event/%%s' %% event_id.id"><span t-field="event_id.name"> </span></a></h4>
-                                        <a t-if="editable" href="#" t-att-data-id="event_id.id" class="pull-right">
-                                            <span t-att-class="'label label-success js_unpublish %%s' %% (not event_id.website_published and 'hidden' or '')">Click to Unpublish</span>
-                                            <span t-att-class="'label label-important js_publish %%s' %% (event_id.website_published and 'hidden' or '')">Click to Publish</span>
-                                        </a>
-                                        <div>
-                                            <span t-field="event_id.type">: </span>
-                                            <t t-if="event_id.user_id">
-                                                Organized by: <span t-field="event_id.user_id"> </span>
-                                            </t>
-                                        </div>
-                                        <div>
-                                            <i class="icon-time"></i> <span t-field="event_id.date_begin"> </span> <i>to</i> <span t-field="event_id.date_end"> </span>
-                                        </div>
-                                        <div t-if="event_id.country_id">
-                                            <i class="icon-map-marker"></i> <span t-field="event_id.city"> </span>  <span t-field="event_id.zip"> </span>, <span t-field="event_id.country_id"> </span>
-                                        </div>
+                            <li t-foreach="event_ids" t-as="event_id" class="media thumbnail">
+                                <div class="media-body">
+                                    <t t-if="event_id.register_avail">
+                                        <span t-if="event_id.register_avail == 9999" class="label pull-right">No ticket available.</span>
+                                        <span t-if="event_id.register_avail != 9999" t-att-class="'label pull-right label-%%s' %% (event_id.register_avail &lt;= 10 and 'warning' or 'info')">
+                                            <t t-if="event_id.register_avail &lt;= 10">Only</t>
+                                            <t t-esc="event_id.register_avail"/>
+                                            <t t-if="event_id.register_avail &gt; 1">tickets </t>
+                                            <t t-if="event_id.register_avail == 1">ticket </t>
+                                            available.
+                                        </span>
+                                    </t>
+                                    <h4 class="media-heading"><a t-att-href="'/event/%%s' %% event_id.id"><span t-field="event_id.name"> </span></a></h4>
+                                    <a t-if="editable" href="#" t-att-data-id="event_id.id" class="pull-right">
+                                        <span t-att-class="'label label-success js_unpublish %%s' %% (not event_id.website_published and 'hidden' or '')">Click to Unpublish</span>
+                                        <span t-att-class="'label label-important js_publish %%s' %% (event_id.website_published and 'hidden' or '')">Click to Publish</span>
+                                    </a>
+                                    <div>
+                                        <span t-field="event_id.type">: </span>
+                                        <t t-if="event_id.user_id">
+                                            Organized by: <span t-field="event_id.user_id"> </span>
+                                        </t>
                                     </div>
-                                </li>
-                            </t>
+                                    <div>
+                                        <i class="icon-time"></i> <span t-field="event_id.date_begin"> </span> <i>to</i> <span t-field="event_id.date_end"> </span>
+                                    </div>
+                                    <div t-if="event_id.country_id">
+                                        <i class="icon-map-marker"></i> <span t-field="event_id.city"> </span>  <span t-field="event_id.zip"> </span>, <span t-field="event_id.country_id"> </span>
+                                    </div>
+                                </div>
+                            </li>
                         </ul>
                     </div>
                 </div>
@@ -161,7 +156,16 @@
                     </div>
                     <div class="span8">
                         <div class="media-body">
-                            <t t-call="website_event.button"/>
+                            <t t-if="event_id.register_avail">
+                                <span t-if="event_id.register_avail == 9999" class="label pull-right">No ticket available.</span>
+                                <span t-if="event_id.register_avail != 9999" t-att-class="'label pull-right label-%%s' %% (event_id.register_avail &lt;= 10 and 'warning' or 'info')">
+                                    <t t-if="event_id.register_avail &lt;= 10">Only</t>
+                                    <t t-esc="event_id.register_avail"/>
+                                    <t t-if="event_id.register_avail &gt; 1">tickets </t>
+                                    <t t-if="event_id.register_avail == 1">ticket </t>
+                                    available.
+                                </span>
+                            </t>
                             <h4 class="media-heading"><a t-att-href="'/event/%%s' %% event_id.id"><span t-field="event_id.name"> </span></a></h4>
                             <a t-if="editable" href="#" t-att-data-id="event_id.id" class="pull-right">
                                 <span t-att-class="'label label-success js_unpublish %%s' %% (not event_id.website_published and 'hidden' or '')">Click to Unpublish</span>
diff --git a/addons/website_hr/views/website_hr.xml b/addons/website_hr/views/website_hr.xml
index 66c380b176b..59bfb9feb46 100644
--- a/addons/website_hr/views/website_hr.xml
+++ b/addons/website_hr/views/website_hr.xml
@@ -27,35 +27,31 @@
             <t t-set="title">Team</t>
             <div class="container">
                 <div class="thumbnails">
-                    <t t-foreach="employee_ids" t-as="employee_id">
-                        <div class="span4 mt16">
-                            <div class="media thumbnail">
-                                <a class="pull-left" href="#">
-                                    <img class="media-object" t-att-src="'data:image/png;base64,%%s' %% employee_id.image_small"/>
-                                </a>
-                                <div class="media-body">
-                                    <t t-if="editable">
-                                        <div class="pull-right">
-                                            <a href="#" t-att-data-id="employee_id.id">
-                                                <span t-att-class="'label label-success js_unpublish %%s' %% (not employee_id.website_published and 'hidden' or '')">Click to Unpublish</span>
-                                                <span t-att-class="'label label-important js_publish %%s' %% (employee_id.website_published and 'hidden' or '')">Click to Publish</span>
-                                            </a><br/>
-                                            <a href="#" t-att-data-id="employee_id.id">
-                                                <span t-att-class="'label label-success js_unpublish_contact %%s' %% (not employee_id.website_published and 'hidden' or '')">hidden on Contacts</span>
-                                                <span t-att-class="'label label-important js_publish_contact %%s' %% (employee_id.website_published and 'hidden' or '')">display in Contacts</span>
-                                            </a>
-                                        </div>
-                                    </t>
-                                    <h5 class="media-heading"><t t-esc="employee_id.name"/></h5>
-                                    <div t-record="employee_id" t-field="department_id"> </div>
-                                    <div t-record="employee_id" t-field="job_id"> </div>
-                                    <div t-record="employee_id" t-field="work_location"> </div>
-                                    <div t-record="employee_id" t-field="work_phone"> </div>
-                                    <div t-record="employee_id" t-field="work_email"> </div>
+                    <div t-foreach="employee_ids" t-as="employee_id" class="span4 mt16">
+                        <div class="media thumbnail">
+                            <a class="pull-left" href="#">
+                                <img class="media-object" t-att-src="'data:image/png;base64,%%s' %% employee_id.image_small"/>
+                            </a>
+                            <div class="media-body">
+                                <div t-if="editable" class="pull-right">
+                                    <a href="#" t-att-data-id="employee_id.id">
+                                        <span t-att-class="'label label-success js_unpublish %%s' %% (not employee_id.website_published and 'hidden' or '')">Click to Unpublish</span>
+                                        <span t-att-class="'label label-important js_publish %%s' %% (employee_id.website_published and 'hidden' or '')">Click to Publish</span>
+                                    </a><br/>
+                                    <a href="#" t-att-data-id="employee_id.id">
+                                        <span t-att-class="'label label-success js_unpublish_contact %%s' %% (not employee_id.website_published and 'hidden' or '')">hidden on Contacts</span>
+                                        <span t-att-class="'label label-important js_publish_contact %%s' %% (employee_id.website_published and 'hidden' or '')">display in Contacts</span>
+                                    </a>
                                 </div>
+                                <h5 class="media-heading"><t t-esc="employee_id.name"/></h5>
+                                <div t-record="employee_id" t-field="department_id"> </div>
+                                <div t-record="employee_id" t-field="job_id"> </div>
+                                <div t-record="employee_id" t-field="work_location"> </div>
+                                <div t-record="employee_id" t-field="work_phone"> </div>
+                                <div t-record="employee_id" t-field="work_email"> </div>
                             </div>
                         </div>
-                    </t>
+                    </div>
                 </div>
             </div>
         </t>
diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml
index 68e51bca55d..687024210d2 100644
--- a/addons/website_mail/views/website_mail.xml
+++ b/addons/website_mail/views/website_mail.xml
@@ -50,20 +50,19 @@
                     <div class="span4">
                         <ul class="nav nav-list">
                             <a t-if="mail_group_id and editable" t-att-href="'/blog/%%s/new' %% mail_group_id" class="btn">Add a new Blog</a>
-                            <li class="nav-header">BLOG ARCHIVE</li>
+                            <li class="nav-header"><a t-att-href="'/blog/%%s' %% mail_group_id">BLOG ARCHIVE</a></li>
                             <!-- TODO: check qweb iteration -->
-                            <t t-foreach="nav_list" t-as="year">
+                            <li t-foreach="nav_list" t-as="year" class="js_nav_year">
                                 <t t-set="year" t-value="nav_list[year]"/>
-                                <li class="js_nav_year"><a href="#"><t t-esc="year['name']"/> <small>(<t t-esc="year['date_count']"/>)</small></a>
-                                    <ul class="nav nav-list css_nav_month">
-                                        <t t-foreach="year['months']">
-                                            <li class="js_nav_month"><a href="#" t-att-data-domain="__domain"><t t-esc="date"/> <small>(<t t-esc="date_count"/>)</small></a>
-                                                <ul class="nav nav-list"/>
-                                            </li>
-                                        </t>
-                                    </ul>
-                                </li>
-                            </t>
+                                <a href="#"><t t-esc="year['name']"/> <small>(<t t-esc="year['date_count']"/>)</small></a>
+                                <ul class="nav nav-list css_nav_month">
+                                    <t t-foreach="year['months']">
+                                        <li class="js_nav_month"><a href="#" t-att-data-domain="__domain"><t t-esc="date"/> <small>(<t t-esc="date_count"/>)</small></a>
+                                            <ul class="nav nav-list"/>
+                                        </li>
+                                    </t>
+                                </ul>
+                            </li>
                         </ul>
                     </div>
                     <div class="span8" t-if="blog_id">
@@ -73,30 +72,27 @@
                                     <span t-att-class="'label label-success js_unpublish %%s' %% (not blog_id.website_published and 'hidden' or '')">Click to Unpublish</span>
                                     <span t-att-class="'label label-important js_publish %%s' %% (blog_id.website_published and 'hidden' or '')">Click to Publish</span>
                                 </a>
-                                <h3 t-field="blog_id.subject"></h3>
-                                <div t-field="blog_id.body"></div>
+                                <h3 t-field="blog_id.subject"/>
+                                <div t-field="blog_id.body"/>
                                 <small class="pull-right muted text-right">
-                                    <div><t t-field="blog_id.author_id"/></div>
-                                    <div><t t-field="blog_id.date"/></div>
+                                    <div t-field="blog_id.author_id"/>
+                                    <div t-field="blog_id.date"/>
                                 </small>
                             </div>
                             <ul class="media-list">
-                                <t t-foreach="blog_id.child_ids" t-as="comment">
-                                    <!-- TODO: check qweb iteration -->
-                                    <li class="media">
-                                        <div class="media-body">
-                                            <a href="#" t-att-data-id="blog_id.id" class="pull-right" t-if="editable">
-                                                <span t-att-class="'label label-success js_unpublish %%s' %% (not comment.website_published and 'hidden' or '')">Click to Unpublish</span>
-                                                <span t-att-class="'label label-important js_publish %%s' %% (comment.website_published and 'hidden' or '')">Click to Publish</span>
-                                            </a>
-                                            <t t-raw="comment.body"/>
-                                            <small class="pull-right muted text-right">
-                                                <div><t t-esc="comment.author_id"/></div>
-                                                <div><t t-esc="comment.date"/></div>
-                                            </small>
-                                        </div>
-                                    </li>
-                                </t>
+                                <li t-foreach="blog_id.child_ids" t-as="comment" class="media">
+                                    <div class="media-body">
+                                        <a href="#" t-att-data-id="blog_id.id" class="pull-right" t-if="editable">
+                                            <span t-att-class="'label label-success js_unpublish %%s' %% (not comment.website_published and 'hidden' or '')">Click to Unpublish</span>
+                                            <span t-att-class="'label label-important js_publish %%s' %% (comment.website_published and 'hidden' or '')">Click to Publish</span>
+                                        </a>
+                                        <t t-raw="comment.body"/>
+                                        <small class="pull-right muted text-right">
+                                            <div t-esc="comment.author_id"/>
+                                            <div t-esc="comment.date"/>
+                                        </small>
+                                    </div>
+                                </li>
                                 <form id="post" t-att-action="'/blog/%%s/%%s/post#post' %% (blog_id.res_id, blog_id.id)" method="POST" class="form-horizontal text-center" groups="group_website_mail_reply">
                                     <textarea rows="4" placeholder="Your message" class="span7"> </textarea>
                                     <button type="submit" class="btn">Post your message</button>
@@ -106,28 +102,26 @@
                     </div>
                     <div class="span8" t-if="not blog_id and blog_ids">
                         <ul class="media-list">
-                            <t t-foreach="blog_ids" t-as="blog">
-                                <li class="media well">
-                                    <div t-att-class="'media-body %%s' %% (blog.website_published and 'css_published' or '')">
-                                        <a href="#" t-att-data-id="blog.id" class="pull-right" t-if="editable">
-                                            <span t-att-class="'label label-success js_unpublish %%s' %% (not blog.website_published and 'hidden' or '')">Click to Unpublish</span>
-                                            <span t-att-class="'label label-important js_publish %%s' %% (blog.website_published and 'hidden' or '')">Click to Publish</span>
-                                        </a>
-                                        <h4 class="media-heading" ><a t-att-href="'/blog/%%s/%%s' %% (blog.res_id, blog.id)" t-field="blog.subject"></a></h4>
-                                        <div class="media">
-                                            <div t-field="blog.body"></div>
-                                            <small class="pull-left muted text-right" t-if="len(blog.child_ids)">
-                                                <a t-if="len(blog.child_ids) &lt;= 1" t-att-href="'/blog/%%s/%%s' %% (blog.res_id, blog.id)"><t t-esc="len(blog.child_ids)"/> Message</a>
-                                                <a t-if="len(blog.child_ids) > 1" t-att-href="'/blog/%%s/%%s' %% (blog.res_id, blog.id)"><t t-esc="len(blog.child_ids)"/> Messages</a>
-                                            </small>
-                                            <small class="pull-right muted text-right">
-                                                <div><t t-field="blog.author_id"/></div>
-                                                <div><t t-field="blog.date"/></div>
-                                            </small>
-                                        </div>
+                            <li t-foreach="blog_ids" t-as="blog" class="media well">
+                                <div t-att-class="'media-body %%s' %% (blog.website_published and 'css_published' or '')">
+                                    <a href="#" t-att-data-id="blog.id" class="pull-right" t-if="editable">
+                                        <span t-att-class="'label label-success js_unpublish %%s' %% (not blog.website_published and 'hidden' or '')">Click to Unpublish</span>
+                                        <span t-att-class="'label label-important js_publish %%s' %% (blog.website_published and 'hidden' or '')">Click to Publish</span>
+                                    </a>
+                                    <h4 class="media-heading" ><a t-att-href="'/blog/%%s/%%s' %% (blog.res_id, blog.id)" t-field="blog.subject"></a></h4>
+                                    <div class="media">
+                                        <div t-field="blog.body"/>
+                                        <small class="pull-left muted text-right" t-if="len(blog.child_ids)">
+                                            <a t-if="len(blog.child_ids) &lt;= 1" t-att-href="'/blog/%%s/%%s' %% (blog.res_id, blog.id)"><t t-esc="len(blog.child_ids)"/> Message</a>
+                                            <a t-if="len(blog.child_ids) > 1" t-att-href="'/blog/%%s/%%s' %% (blog.res_id, blog.id)"><t t-esc="len(blog.child_ids)"/> Messages</a>
+                                        </small>
+                                        <small class="pull-right muted text-right">
+                                            <div t-field="blog.author_id"/>
+                                            <div t-field="blog.author_id"/>
+                                        </small>
                                     </div>
-                                </li>
-                            </t>
+                                </div>
+                            </li>
                         </ul>
                         <ul class="pager">
                             <li t-if="next_date" class="previous">

From c0f75a59310540d93eec64f6cdfa577c803e5905 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 6 Aug 2013 10:56:54 +0200
Subject: [PATCH 03/27] [IMP] website_mail: subscribe (add followers)

bzr revid: chm@openerp.com-20130806085654-n3z6f9u991k9wky3
---
 addons/website_mail/controllers/main.py    | 50 ++++++++++++++++++++--
 addons/website_mail/views/website_mail.xml | 22 +++++++---
 2 files changed, 61 insertions(+), 11 deletions(-)

diff --git a/addons/website_mail/controllers/main.py b/addons/website_mail/controllers/main.py
index 2c67e3c6ba8..37178f05c7c 100644
--- a/addons/website_mail/controllers/main.py
+++ b/addons/website_mail/controllers/main.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+from openerp import SUPERUSER_ID
 from openerp.addons.web import http
 from openerp.addons.web.http import request
 import werkzeug
@@ -12,11 +13,12 @@ _months = {1:_("January"), 2:_("February"), 3:_("March"), 4:_("April"), 5:_("May
 
 class website_mail(http.Controller):
 
-    @http.route(['/blog', '/blog/<int:mail_group_id>', '/blog/<int:mail_group_id>/<int:blog_id>'], type='http', auth="public")
+    @http.route(['/blog', '/blog/<int:mail_group_id>/', '/blog/<int:mail_group_id>/<int:blog_id>/'], type='http', auth="public")
     def blog(self, mail_group_id=None, blog_id=None, **post):
         website = request.registry['website']
         group_obj = request.registry['mail.group']
         message_obj = request.registry['mail.message']
+        user_obj = request.registry['res.users']
 
         values = website.get_rendering_context({
             'blog_ids': None,
@@ -25,7 +27,14 @@ class website_mail(http.Controller):
             'prev_date': None,
             'next_date': None,
             'mail_group_id': mail_group_id,
+            'subscribe': post.get('subscribe'),
         })
+
+        if request.uid != request.public_uid and mail_group_id:
+            message_follower_ids = group_obj.read(request.cr, request.uid, [mail_group_id], ['message_follower_ids'])[0]['message_follower_ids']
+            parent_id = user_obj.browse(request.cr, request.uid, request.uid).partner_id.id
+            values['subscribe'] = parent_id in message_follower_ids
+
         domain = mail_group_id and [("res_id", "=", mail_group_id)] or []
 
         for group in message_obj.read_group(request.cr, request.uid, domain + group_obj.get_public_blog(request.cr, request.uid), ['subject', 'date'], groupby="date", orderby="create_date asc"):
@@ -88,9 +97,9 @@ class website_mail(http.Controller):
             request.session.body = False
 
         if post.get('body'):
-            return '%s/blog/%s/%s' % (url, mail_group_id, blog_id)
+            return '%s/blog/%s/%s/' % (url, mail_group_id, blog_id)
         else:
-            return werkzeug.utils.redirect("/blog/%s/%s" % (mail_group_id, blog_id))
+            return werkzeug.utils.redirect("/blog/%s/%s/" % (mail_group_id, blog_id))
 
     @http.route(['/blog/<int:mail_group_id>/new'], type='http', auth="public")
     def new_blog_post(self, mail_group_id=None, **post):
@@ -102,4 +111,37 @@ class website_mail(http.Controller):
                 subtype='mt_comment',
                 context={'mail_create_nosubsrequest.cribe': True},
             )
-        return werkzeug.utils.redirect("/blog/%s/%s" % (mail_group_id, blog_id))
+        return werkzeug.utils.redirect("/blog/%s/%s/" % (mail_group_id, blog_id))
+
+    @http.route(['/blog/<int:mail_group_id>/subscribe', '/blog/<int:mail_group_id>/<int:blog_id>/subscribe'], type='http', auth="public")
+    def subscribe(self, mail_group_id=None, blog_id=None, **post):
+        partner_obj = request.registry['res.partner']
+        group_obj = request.registry['mail.group']
+        user_obj = request.registry['res.users']
+
+        if mail_group_id and 'subscribe' in post and (post.get('email') or request.uid != request.public_uid):
+            if request.uid == request.public_uid:
+                partner_ids = partner_obj.search(request.cr, SUPERUSER_ID, [("email", "=", post.get('email'))])
+                if not partner_ids:
+                    partner_ids = [partner_obj.create(request.cr, SUPERUSER_ID, {"email": post.get('email'), "name": "Subscribe: %s" % post.get('email')})]
+            else:
+                partner_ids = [user_obj.browse(request.cr, request.uid, request.uid).partner_id.id]
+            group_obj.message_subscribe(request.cr, request.uid, [mail_group_id], partner_ids)
+
+        return self.blog(mail_group_id=mail_group_id, blog_id=blog_id, subscribe=post.get('email'))
+
+    @http.route(['/blog/<int:mail_group_id>/unsubscribe', '/blog/<int:mail_group_id>/<int:blog_id>/unsubscribe'], type='http', auth="public")
+    def unsubscribe(self, mail_group_id=None, blog_id=None, **post):
+        partner_obj = request.registry['res.partner']
+        group_obj = request.registry['mail.group']
+        user_obj = request.registry['res.users']
+
+        if mail_group_id and 'unsubscribe' in post and (post.get('email') or request.uid != request.public_uid):
+            if request.uid == request.public_uid:
+                partner_ids = partner_obj.search(request.cr, SUPERUSER_ID, [("email", "=", post.get('email'))])
+            else:
+                partner_ids = [user_obj.browse(request.cr, request.uid, request.uid).partner_id.id]
+            group_obj.message_unsubscribe(request.cr, request.uid, [mail_group_id], partner_ids)
+
+        return self.blog(mail_group_id=mail_group_id, blog_id=blog_id, subscribe=None)
+
diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml
index 687024210d2..92c0126a700 100644
--- a/addons/website_mail/views/website_mail.xml
+++ b/addons/website_mail/views/website_mail.xml
@@ -18,7 +18,7 @@
         <field name="arch" type="xml">
             <data>
                 <xpath expr="//li[last()]" position="after">
-                    <li class="pull-right"><a href="/blog/%(website_mail.website_mail_blog)d">News</a></li>
+                    <li class="pull-right"><a href="/blog/%(website_mail.website_mail_blog)d/">News</a></li>
                 </xpath>
            </data>
         </field>
@@ -29,7 +29,7 @@
         <field name="arch" type="xml">
             <data>
                 <xpath expr="//a[@href='/page/website.news']" position="replace">
-                    <a href="/blog/%(website_mail.website_mail_blog)d">News</a>
+                    <a href="/blog/%(website_mail.website_mail_blog)d/">News</a>
                 </xpath>
            </data>
         </field>
@@ -50,7 +50,7 @@
                     <div class="span4">
                         <ul class="nav nav-list">
                             <a t-if="mail_group_id and editable" t-att-href="'/blog/%%s/new' %% mail_group_id" class="btn">Add a new Blog</a>
-                            <li class="nav-header"><a t-att-href="'/blog/%%s' %% mail_group_id">BLOG ARCHIVE</a></li>
+                            <li class="nav-header"><a t-att-href="'/blog/%%s/' %% mail_group_id">BLOG ARCHIVE</a></li>
                             <!-- TODO: check qweb iteration -->
                             <li t-foreach="nav_list" t-as="year" class="js_nav_year">
                                 <t t-set="year" t-value="nav_list[year]"/>
@@ -63,6 +63,14 @@
                                     </t>
                                 </ul>
                             </li>
+                            <form action="./subscribe" method="POST" class="form-inline" t-if="not subscribe">
+                                <input placeholder="Email Address" type="email" name="email" class="input-medium" t-if="request.uid == request.public_uid"/>
+                                <button type="submit" class="btn btn-primary" name="subscribe">Subscribe</button>
+                            </form>
+                            <form action="./unsubscribe" method="POST" class="form-inline" t-if="subscribe">
+                                <input type="hidden" name="email" t-att-value="subscribe"/>
+                                <button type="submit" class="btn" name="unsubscribe">Unsubscribe</button>
+                            </form>
                         </ul>
                     </div>
                     <div class="span8" t-if="blog_id">
@@ -79,7 +87,7 @@
                                     <div t-field="blog_id.date"/>
                                 </small>
                             </div>
-                            <ul class="media-list">
+                            <ul class="media-list" id="comment">
                                 <li t-foreach="blog_id.child_ids" t-as="comment" class="media">
                                     <div class="media-body">
                                         <a href="#" t-att-data-id="blog_id.id" class="pull-right" t-if="editable">
@@ -108,12 +116,12 @@
                                         <span t-att-class="'label label-success js_unpublish %%s' %% (not blog.website_published and 'hidden' or '')">Click to Unpublish</span>
                                         <span t-att-class="'label label-important js_publish %%s' %% (blog.website_published and 'hidden' or '')">Click to Publish</span>
                                     </a>
-                                    <h4 class="media-heading" ><a t-att-href="'/blog/%%s/%%s' %% (blog.res_id, blog.id)" t-field="blog.subject"></a></h4>
+                                    <h4 class="media-heading" ><a t-att-href="'/blog/%%s/%%s#comment' %% (blog.res_id, blog.id)" t-field="blog.subject"></a></h4>
                                     <div class="media">
                                         <div t-field="blog.body"/>
                                         <small class="pull-left muted text-right" t-if="len(blog.child_ids)">
-                                            <a t-if="len(blog.child_ids) &lt;= 1" t-att-href="'/blog/%%s/%%s' %% (blog.res_id, blog.id)"><t t-esc="len(blog.child_ids)"/> Message</a>
-                                            <a t-if="len(blog.child_ids) > 1" t-att-href="'/blog/%%s/%%s' %% (blog.res_id, blog.id)"><t t-esc="len(blog.child_ids)"/> Messages</a>
+                                            <a t-if="len(blog.child_ids) &lt;= 1" t-att-href="'/blog/%%s/%%s#comment' %% (blog.res_id, blog.id)"><t t-esc="len(blog.child_ids)"/> Message</a>
+                                            <a t-if="len(blog.child_ids) > 1" t-att-href="'/blog/%%s/%%s#comment' %% (blog.res_id, blog.id)"><t t-esc="len(blog.child_ids)"/> Messages</a>
                                         </small>
                                         <small class="pull-right muted text-right">
                                             <div t-field="blog.author_id"/>

From f55561d154de93593ad906863b76faca15ccb28f Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 6 Aug 2013 11:08:45 +0200
Subject: [PATCH 04/27] [FIX] website_mail: access right and xml

bzr revid: chm@openerp.com-20130806090845-xi47tuk6mfekaedr
---
 addons/website_mail/controllers/main.py    | 2 +-
 addons/website_mail/views/website_mail.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_mail/controllers/main.py b/addons/website_mail/controllers/main.py
index 37178f05c7c..971934a5d13 100644
--- a/addons/website_mail/controllers/main.py
+++ b/addons/website_mail/controllers/main.py
@@ -32,7 +32,7 @@ class website_mail(http.Controller):
 
         if request.uid != request.public_uid and mail_group_id:
             message_follower_ids = group_obj.read(request.cr, request.uid, [mail_group_id], ['message_follower_ids'])[0]['message_follower_ids']
-            parent_id = user_obj.browse(request.cr, request.uid, request.uid).partner_id.id
+            parent_id = user_obj.browse(request.cr, SUPERUSER_ID, request.uid).partner_id.id
             values['subscribe'] = parent_id in message_follower_ids
 
         domain = mail_group_id and [("res_id", "=", mail_group_id)] or []
diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml
index 92c0126a700..3c7a577fe9e 100644
--- a/addons/website_mail/views/website_mail.xml
+++ b/addons/website_mail/views/website_mail.xml
@@ -125,7 +125,7 @@
                                         </small>
                                         <small class="pull-right muted text-right">
                                             <div t-field="blog.author_id"/>
-                                            <div t-field="blog.author_id"/>
+                                            <div t-field="blog.date"/>
                                         </small>
                                     </div>
                                 </div>

From c51b8953b489382ff98ce35ff24cf7acbb608dc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Tue, 6 Aug 2013 11:23:44 +0200
Subject: [PATCH 05/27] [WIP] ecommerce pagination

bzr revid: fva@openerp.com-20130806092344-noe43pgifa3rqr04
---
 addons/website/static/src/css/website.css     |   4 +
 addons/website/static/src/css/website.sass    |   3 +
 addons/website_sale/controllers/main.py       |  46 ++++--
 .../static/src/css/ecommerce.sass             | 156 ------------------
 addons/website_sale/views/ecommerce.xml       |  82 +++++----
 5 files changed, 89 insertions(+), 202 deletions(-)
 delete mode 100644 addons/website_sale/static/src/css/ecommerce.sass

diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css
index 5959e1c9dda..f47daad8c83 100644
--- a/addons/website/static/src/css/website.css
+++ b/addons/website/static/src/css/website.css
@@ -175,6 +175,10 @@ h5 {
   float: right !important;
 }
 
+.thumbnail {
+  background: white;
+}
+
 /* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */
 .navbar .nav > li > p {
   margin-bottom: 0px;
diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 7c5f8cb6ce5..c5e45aa288f 100644
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -131,6 +131,9 @@ h5
 .nav > .pull-right
     float: right !important //bugfix for flatly theme
 
+.thumbnail
+    background: white
+
 /* ---- HACK FOR COVERING UP CK EDITOR BOGUS P INSERTION --- */
 
 .navbar .nav > li > p
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index bae6b8b0758..6ffc5036c82 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+import math
 import openerp
 import simplejson
 from openerp.addons.web import http
@@ -12,7 +13,9 @@ class Ecommerce(http.Controller):
     def get_categories(self):
         category_obj = request.registry.get('pos.category')
         category_ids = category_obj.search(request.cr, openerp.SUPERUSER_ID, [('parent_id', '=', False)])
-        return category_obj.browse(request.cr, openerp.SUPERUSER_ID, category_ids)
+        categories = category_obj.browse(request.cr, openerp.SUPERUSER_ID, category_ids)
+        print categories
+        return categories
 
     def get_current_order(self):
         order = self.get_order(request.httprequest.session.get('ecommerce_order_id'))
@@ -68,23 +71,46 @@ class Ecommerce(http.Controller):
             product_ids.append(p[0])
         return request.registry.get('product.product').browse(request.cr, request.uid, product_ids)
 
-    @http.route(['/shop', '/shop/category/<cat_id>'], type='http', auth="public")
-    def category(self, cat_id=0, offset=0, **post):
-
-        domain = [("sale_ok", "=", True)]
-        if post.get("search"):
-            domain += ['|', '|', ('name', 'ilike', "%%%s%%" % post.get("search")), ('desrequest.cription', 'ilike', "%%%s%%" % post.get("search")), ('pos_categ_id.name', 'ilike', "%%%s%%" % post.get("search"))]
-        if cat_id:
-            cat_id = cat_id and int(cat_id) or 0
-            domain = [('pos_categ_id.id', 'child_of', cat_id)] + domain
+    @http.route(['/shop', '/shop/category/<cat_id>', '/shop/category/<cat_id>/page/<page>', '/shop/page/<page>'], type='http', auth="public")
+    def category(self, cat_id=0, page=0, **post):
 
         product_obj = request.registry.get('product.product')
+
+        domain = [("sale_ok", "=", True)]
+        if cat_id:
+            cat_id = int(cat_id)
+            domain = [('pos_categ_id.id', 'child_of', cat_id)] + domain
+
+        product_count = len(product_obj.search(request.cr, request.uid, domain))
+        page_count = int(math.ceil(product_count / 20.0))
+
+        #if post.get("search"):
+         #   domain += ['|', '|', ('name', 'ilike', "%%%s%%" % post.get("search")), ('description', 'ilike', "%%%s%%" % post.get("search")), ('pos_categ_id.name', 'ilike', "%%%s%%" % post.get("search"))]
+
+        page = max(1,min(int(page),page_count))
+        offset = (page-1) * 20
+
+        if page_count <= 5 or page <= 3:
+            pmin = 1
+            pmax = min(page_count,5)
+        elif page >= page_count - 2:
+            pmin = page_count - 4
+            pmax = page_count
+        else:
+            pmin = page - 2
+            pmax = page + 2
+
+        pages = range(pmin, pmax+1)
+
         product_ids = product_obj.search(request.cr, request.uid, domain, limit=20, offset=offset)
 
         values = {
             'current_category': cat_id,
             'products': product_obj.browse(request.cr, request.uid, product_ids),
             'search': post.get("search"),
+            'page_count': page_count,
+            'pages': pages,
+            'page': page,
         }
         html = self.render("website_sale.products", values)
         return html
diff --git a/addons/website_sale/static/src/css/ecommerce.sass b/addons/website_sale/static/src/css/ecommerce.sass
deleted file mode 100644
index 510f38816e2..00000000000
--- a/addons/website_sale/static/src/css/ecommerce.sass
+++ /dev/null
@@ -1,156 +0,0 @@
-@import "compass/css3"
-
-//.oe_ecommerce
-  .oe_total
-    font-size: 13px
-    margin-top: 10px
-    td
-      padding: 5px 10px
-    table
-      width: auto
-    td:last-child
-      text-align: right
-    th:last-child
-      text-align: center
-  .oe_products
-    .oe_product
-      .oe_hidden
-        visibility: hidden
-      .pull-left
-        margin: 0
-        float: none
-      .oe_ecommerce_description
-        display: none
-      h4
-        text-align: center
-        +text-shadow(0px 1px 1px rgba(200, 200, 200,.2))
-        margin-bottom: 16px
-      img
-        max-height: 110px
-        max-width: 130px
-        margin: 0 auto 
-        padding-bottom: 14px
-      text-align: center 
-      display: inline-block
-      padding: 4px
-      width: 180px
-      height: 220px
-      margin-right: 15px
-      margin-left: 3px
-      padding-top: 8px
-      &:nth-child(3n)
-        margin-right: 0
-      .oe_ecommerce_price
-        width: 100%
-        position: absolute
-        bottom: 44px
-        +text-shadow(0px 1px 3px rgba(255, 255, 255, 0.7))
-        text-align: center
-        font-size: 25px
-        span
-          font-weight: bold
-      .oe_button_cart
-        bottom: 5px
-        left: 0
-        .btn-inverse
-          display: none
-  .oe_mycart
-    .oe_product
-      display: inline-block
-      width: 250px
-      margin-left: 0px
-      float: none
-      margin-right: 16px
-      padding: 8px 5px 6px 10px
-      > .pull-left
-        width: 84px
-        height: 64px
-        img
-          max-width: 64px
-          max-height: 64px
-          margin: auto
-      .oe_button_cart
-        position: static
-        right: 6px
-        top: 6px
-    form
-      input
-        margin-bottom: 0
-  .oe_product
-    vertical-align: top 
-    position: relative
-    margin-top: 0
-    margin-bottom: 15px
-    +border-radius(5px)
-    border: 1px solid rgba(0,0,0,.1)
-    +box-shadow(0px 1px 3px rgba(0,0,0,.1))
-  .oe_button_cart
-    width: 100%
-    font-size: 11px
-    position: absolute
-    button
-      +text-shadow(0px 1px 1px rgba(0, 0, 0, 0.44))
-      overflow: hidden
-      text-align: center
-      font-size: 12px
-      margin: 0 auto
-      margin-bottom: 5px
-      padding: 2px
-      height: 22px
-      position: relative
-      &.btn-inverse
-        @include background(linear-gradient(#aaaaaa,#999999))
-      &.btn-primary
-        @include background(linear-gradient(#0088cc,#0076b1))
-      &.btn-success
-        @include background(linear-gradient(#51a351, #418541))
-  .oe_search
-    form
-      width: 100%
-      margin: 24px
-      text-align: center
-  .oe_product_detail
-    .oe_button_cart
-      position: relative
-      text-align: right
-  .oe_recommended
-    a
-      margin: 0 3px
-    img
-      max-width: 64px
-      max-height: 64px
-  .oe_checkout
-    .css_required
-      input, select
-        //background-color: #d2d2ff !important
-    h4
-      border-bottom: 1px solid #ddd
-      margin-right: 30px
-    input:not([type="radio"]):not([type="checkbox"]):not([type="image"])
-      height: 20px
-    input[type="image"]
-      height: 30px
-    label
-      > input:not([type="radio"]):not([type="checkbox"]), > div, > select
-        display: block
-        margin-top: 3px
-      select
-        margin-top: 3px
-      > div > input
-        margin-bottom: 0
-    .css_payments
-      clear: both
-      .css_payment
-        position: relative
-        width: 80px
-        overflow: hidden
-        height: 30px
-        text-align: center
-        padding: 10px 10px 0 0
-      .css_error_payment
-        width: 100%
-        height: 100%
-        position: absolute
-        top: +O
-        left: +0
-        cursor: pointer
diff --git a/addons/website_sale/views/ecommerce.xml b/addons/website_sale/views/ecommerce.xml
index dbc2281c39f..03d4062b806 100644
--- a/addons/website_sale/views/ecommerce.xml
+++ b/addons/website_sale/views/ecommerce.xml
@@ -54,14 +54,8 @@
             <t t-set="title">Shop - <t t-raw="title">Categories</t></t>
             <div class="container mt48 oe_ecommerce">
                 <div class="row">
-                    <div class="span4 css_noprint">
-                        <ul class="nav nav-list">
-                        <t t-foreach="categories" t-as="category">
-                            <t t-call="website_sale.categories_recursive"/>
-                        </t>
-                        </ul>
-                    </div>
-                    <t t-raw="shop_content"></t>
+                    <t t-call='website_sale.categories' />
+                    <t t-raw="shop_content" />
                 </div>
             </div>
         </t>
@@ -69,9 +63,20 @@
 
     <!-- List of categories --> 
 
+    <template id="categories">
+        <div class="span4">
+            <ul class="nav nav-list">
+                <li t-att-class=" '' if current_category else 'active' " class='active'><a href='/shop/'>All Products</a></li>
+            <t t-foreach="categories" t-as="category">
+                <t t-call="website_sale.categories_recursive"/>
+            </t>
+            </ul>
+        </div>
+    </template>
+
     <template id="categories_recursive">
         <li t-att-class="category.id == current_category and 'active' or ''">
-            <a t-att-href="'/shop/category/%%s' %% category.id"><span t-field="category.name"><t t-esc="category.name"/></span></a>
+            <a t-att-href="'/shop/category/%%s' %% category.id" t-field="category.name"></a>
             <ul t-if="category.child_id" class="nav nav-list">
                 <t t-foreach="category.child_id" t-as="category">
                     <t t-call="website_sale.categories_recursive"/>
@@ -82,23 +87,27 @@
 
     <!-- Product list --> 
 
+    <template id="product_pager">
+        <div t-if="page_count != 1" t-att-class=" (classname if classname else '') + ' pagination'">
+            <ul>
+                <li t-att-class=" 'disabled' if page == 1 else '' " ><a t-att-href=" '#' if page == 1 else ('/shop/category/%%s/page/%%s' %% (current_category, max(0,page-1))) ">Prev</a></li>
+                <t t-foreach="pages" t-as="p">
+                    <li t-att-class=" 'active' if p == page else '' " ><a t-att-href=" '/shop/category/%%s/page/%%s' %% (current_category, p)" t-raw='p'></a></li>
+                </t>
+                <li t-att-class=" 'disabled' if page == page_count else '' "><a t-att-href=" '#' if page == page_count else ('/shop/category/%%s/page/%%s' %% (current_category, min(page_count,page+1))) ">Next</a></li>
+            </ul>
+        </div>
+    </template>
+
     <template id="products">
         <t t-call="website_sale.page">
             <t t-set="title">Product</t>
             <t t-set="shop_content">
                 <div class='span8 navbar navbar-inverse'>
                     <div class='navbar-inner'>
-                        <div class='pagination pull-left'>
-                            <ul>
-                                <li><a href='#'>Prev</a></li>
-                                <li class='active'><a href='#'>1</a></li>
-                                <li><a href='#'>2</a></li>
-                                <li><a href='#'>3</a></li>
-                                <li><a href='#'>4</a></li>
-                                <li><a href='#'>5</a></li>
-                                <li><a href='#'>Next</a></li>
-                            </ul>
-                        </div>
+                        <t t-call="website_sale.product_pager" >
+                            <t t-set="classname">pull-left</t>
+                        </t>
                         <form action="/shop" method="get" class="navbar-search pull-right">
                             <input type="text" name="search" class="search-query span2" placeholder="Search" t-att-value="search or '' or ''"/>
                         </form>
@@ -113,17 +122,9 @@
                     </div>
                 </div>
                 <div class="span8 offset4 text-center">
-                    <div class='pagination'>
-                        <ul>
-                            <li><a href='#'>Prev</a></li>
-                            <li class='active'><a href='#'>1</a></li>
-                            <li><a href='#'>2</a></li>
-                            <li><a href='#'>3</a></li>
-                            <li><a href='#'>4</a></li>
-                            <li><a href='#'>5</a></li>
-                            <li><a href='#'>Next</a></li>
-                        </ul>
-                    </div>
+                    <t t-call="website_sale.product_pager" >
+                        <t t-set="classname"></t>
+                    </t>
                 </div>
             </t>
         </t>
@@ -138,7 +139,7 @@
                 <img class="img-rounded" t-att-src="'data:image/png;base64,' + product.image"/>
             </a>
             <div>
-                <div t-field="product.description_sale">FIXME</div>
+                <div t-field="product.description_sale"></div>
                 <div><span t-field="product.list_price"></span>€</div>
                 <div class="mb8 mt8">
                     <button t-att-class="'btn mb8 btn-small btn-inverse %%s' %% (not quantity and 'hidden' or '')" t-att-data-id="product.id">Remove one</button>
@@ -151,11 +152,20 @@
     </template>
 
     <template id="product_recommended">
-        <div class="oe_recommended media well well-small" t-if="recommended_products">
-            <h6>Other customers have also take this products:</h6>
+        <div class="well mt32" t-if="recommended_products">
+            <h4>Customers who have bought this item also bought</h4>
+            <div class='row mt16'>
             <t t-foreach="recommended_products or []" t-as="product">
-                <a t-att-href="'/shop/product/%%s' %% product.id"><img t-att-src="'data:image/png;base64,' + product.image"/></a>
+                <div class='span2 thumbnail'>
+                    <a t-att-href="'/shop/product/%%s' %% product.id">
+                        <div class='mt16 text-center'>
+                            <img t-att-src="'data:image/png;base64,' + product.image"/>
+                            <h5 t-field='product.name'></h5>
+                        </div>
+                    </a>
+                </div>
             </t>
+            </div>
         </div>
     </template>
 
@@ -180,7 +190,7 @@
                     </div>
                     <img class="media-object" t-att-src="'data:image/png;base64,' + product.image"/>
                     <div t-field="product.description_sale"></div>
-                    <div class="oe_ecommerce_price" t-field="product.list_price"><t t-esc="product.list_price"/> €</div>
+                    <div class="oe_ecommerce_price"><t t-field="product.list_price" />€</div>
                     <t t-call="website_sale.product_recommended"/>
                 </div>
             </t>

From 472b547c301b4f7100e0cc4f024638fcfc31bbc3 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 6 Aug 2013 11:31:15 +0200
Subject: [PATCH 06/27] [FIX] website_event: access right for public user

bzr revid: chm@openerp.com-20130806093115-1bhh873xhycdag84
---
 addons/website_event/controllers/main.py     |  4 ++++
 addons/website_event/views/website_event.xml | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index cca132dca36..3c7c10f0a13 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+from openerp import SUPERUSER_ID
 from openerp.addons.web import http
 from openerp.addons.web.http import request
 from openerp.tools.translate import _
@@ -97,8 +98,11 @@ class website_event(http.Controller):
     def event(self, event_id=None, **post):
         website = request.registry['website']
         event = request.registry['event.event'].browse(request.cr, request.uid, event_id)
+        organizer = event.user_id and request.registry['res.users'].browse(request.cr, SUPERUSER_ID, event.user_id.id) or None
+
         values = website.get_rendering_context({
             'event_id': event,
+            'organizer': organizer,
             'google_map_url': "http://maps.googleapis.com/maps/api/staticmap?center=%s&sensor=false&zoom=12&size=298x298" % urllib.quote_plus('%s, %s %s, %s' % (event.street, event.city, event.zip, event.country_id and event.country_id.name_get()[0][1] or ''))
         })
         return website.render("website_event.detail", values)
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 82811cdd76d..a1797e1ebcb 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -101,7 +101,7 @@
                                             available.
                                         </span>
                                     </t>
-                                    <h4 class="media-heading"><a t-att-href="'/event/%%s' %% event_id.id"><span t-field="event_id.name"> </span></a></h4>
+                                    <h4 class="media-heading"><a t-att-href="'/event/%%s/' %% event_id.id"><span t-field="event_id.name"> </span></a></h4>
                                     <a t-if="editable" href="#" t-att-data-id="event_id.id" class="pull-right">
                                         <span t-att-class="'label label-success js_unpublish %%s' %% (not event_id.website_published and 'hidden' or '')">Click to Unpublish</span>
                                         <span t-att-class="'label label-important js_publish %%s' %% (event_id.website_published and 'hidden' or '')">Click to Publish</span>
@@ -149,8 +149,8 @@
                             <br/>
                             <t t-if="event_id.user_id">
                                 Organized by: <span t-field="event_id.user_id"/><br/>
-                                <span>&amp;#x2706; <span t-field="event_id.user_id.phone"></span></span><br/>
-                                <i class="icon-envelope"></i> <span t-field="event_id.user_id.email"></span>
+                                <span>&amp;#x2706; <span t-field="organizer.phone"></span></span><br/>
+                                <i class="icon-envelope"></i> <span t-field="organizer.email"></span>
                             </t>
                         </address>
                     </div>
@@ -166,13 +166,13 @@
                                     available.
                                 </span>
                             </t>
-                            <h4 class="media-heading"><a t-att-href="'/event/%%s' %% event_id.id"><span t-field="event_id.name"> </span></a></h4>
+                            <h4 class="media-heading"><a t-att-href="'/event/%%s/' %% event_id.id"><span t-field="event_id.name"> </span></a></h4>
                             <a t-if="editable" href="#" t-att-data-id="event_id.id" class="pull-right">
                                 <span t-att-class="'label label-success js_unpublish %%s' %% (not event_id.website_published and 'hidden' or '')">Click to Unpublish</span>
                                 <span t-att-class="'label label-important js_publish %%s' %% (event_id.website_published and 'hidden' or '')">Click to Publish</span>
                             </a>
-                            <h4>Ticket Information</h4>
-                            <form t-att-action="'/event/%%s/add_cart' %% event_id.id" method="post">
+                            <h4 t-if="event_id.product_ids">Ticket Information</h4>
+                            <form t-att-action="'/event/%%s/add_cart' %% event_id.id" method="post" t-if="event_id.product_ids">
                                 <div t-foreach="event_id.product_ids" t-as="prod">
                                     <span t-field="prod.product_id"/>
                                     <span t-field="prod.price"/>

From 2abda5e55428232aecc9c9cfcc4006971d2b558c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Tue, 6 Aug 2013 14:19:31 +0200
Subject: [PATCH 07/27] [WIP] ecommerce pagination: fun with qweb

bzr revid: fva@openerp.com-20130806121931-9eso1k9pf7imaf8d
---
 addons/website_sale/views/ecommerce.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/website_sale/views/ecommerce.xml b/addons/website_sale/views/ecommerce.xml
index 03d4062b806..b689e7f128a 100644
--- a/addons/website_sale/views/ecommerce.xml
+++ b/addons/website_sale/views/ecommerce.xml
@@ -88,7 +88,8 @@
     <!-- Product list --> 
 
     <template id="product_pager">
-        <div t-if="page_count != 1" t-att-class=" (classname if classname else '') + ' pagination'">
+        <t t-set="classname" t-value="classname or ''" />
+        <div t-if="page_count != 1" t-att-class="classname + ' pagination'">
             <ul>
                 <li t-att-class=" 'disabled' if page == 1 else '' " ><a t-att-href=" '#' if page == 1 else ('/shop/category/%%s/page/%%s' %% (current_category, max(0,page-1))) ">Prev</a></li>
                 <t t-foreach="pages" t-as="p">
@@ -122,9 +123,7 @@
                     </div>
                 </div>
                 <div class="span8 offset4 text-center">
-                    <t t-call="website_sale.product_pager" >
-                        <t t-set="classname"></t>
-                    </t>
+                    <t t-call="website_sale.product_pager" />
                 </div>
             </t>
         </t>

From ca54d94534089f3bf9f4b958d8564609c1ee9f49 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 6 Aug 2013 15:00:53 +0200
Subject: [PATCH 08/27] [IMP] website_event, event

bzr revid: chm@openerp.com-20130806130053-wt1l25ri50c1z0e6
---
 addons/event/event.py                        |  2 +-
 addons/event/event_view.xml                  | 13 +-----
 addons/website_event/__openerp__.py          |  2 +-
 addons/website_event/controllers/main.py     |  6 +--
 addons/website_event/event.py                |  6 ++-
 addons/website_event/views/website_event.xml | 43 +++++++++++---------
 6 files changed, 32 insertions(+), 40 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 1d5bb35a83f..52cca514f7b 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -203,7 +203,7 @@ class event_event(osv.osv):
         'email_confirmation_id' : fields.many2one('email.template','Event Confirmation Email', help="If you set an email template, each participant will receive this email announcing the confirmation of the event."),
         'reply_to': fields.char('Reply-To Email', size=64, readonly=False, states={'done': [('readonly', True)]}, help="The email address of the organizer is likely to be put here, with the effect to be in the 'Reply-To' of the mails sent automatically at event or registrations confirmation. You can also put the email address of your mail gateway if you use one."),
         'main_speaker_id': fields.many2one('res.partner','Main Speaker', readonly=False, states={'done': [('readonly', True)]}, help="Speaker who will be giving speech at the event."),
-        'address_id': fields.many2one('res.partner','Location Address', readonly=False, states={'done': [('readonly', True)]}),
+        'address_id': fields.many2one('res.partner','Location', readonly=False, states={'done': [('readonly', True)]}),
         'street': fields.related('address_id','street',type='char',string='Street'),
         'street2': fields.related('address_id','street2',type='char',string='Street2'),
         'state_id': fields.related('address_id','state_id',type='many2one', relation="res.country.state", string='State'),
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index a9831720abf..82992388498 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -80,18 +80,7 @@
                         </div>
                         <group>
                             <group>
-                                <label for="address_id" string="Location"/>
-                                   <div>
-                                       <field name="address_id" on_change="on_change_address_id(address_id)" />
-                                       <field name="street" placeholder="Street..."/>
-                                       <field name="street2"/>
-                                       <div class="address_format">
-                                           <field name="city" placeholder="City" style="width: 40%%"/>
-                                           <field name="state_id" class="oe_no_button" placeholder="State" style="width: 37%%" options='{"no_open": true}'/>
-                                           <field name="zip" placeholder="ZIP" style="width: 20%%"/>
-                                       </div>    
-                                       <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": true}'/>
-                                   </div>
+                                <field name="address_id" on_change="on_change_address_id(address_id)" context="{'show_address': 1}" options='{"always_reload": True}'/>
                             </group>
                             <group>
                                 <field name="user_id"/>
diff --git a/addons/website_event/__openerp__.py b/addons/website_event/__openerp__.py
index ad615c092d8..100175e6eee 100644
--- a/addons/website_event/__openerp__.py
+++ b/addons/website_event/__openerp__.py
@@ -8,7 +8,7 @@ OpenERP Blog
 
         """,
     'author': 'OpenERP SA',
-    'depends': ['website', 'event', 'website_sale'],
+    'depends': ['website', 'event_sale', 'website_sale'],
     'data': [
         'views/website_event.xml',
         'security/ir.model.access.csv',
diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index 3c7c10f0a13..33fbe3730bc 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -66,7 +66,6 @@ class website_event(http.Controller):
             for key, search in domain_search.items():
                 if key != without:
                     domain += search
-            print domain
             return domain
 
         # count by domains without self search
@@ -97,12 +96,9 @@ class website_event(http.Controller):
     @http.route(['/event/<int:event_id>'], type='http', auth="public")
     def event(self, event_id=None, **post):
         website = request.registry['website']
-        event = request.registry['event.event'].browse(request.cr, request.uid, event_id)
-        organizer = event.user_id and request.registry['res.users'].browse(request.cr, SUPERUSER_ID, event.user_id.id) or None
-
+        event = request.registry['event.event'].browse(request.cr, request.uid, event_id, {'show_address': 1})
         values = website.get_rendering_context({
             'event_id': event,
-            'organizer': organizer,
             'google_map_url': "http://maps.googleapis.com/maps/api/staticmap?center=%s&sensor=false&zoom=12&size=298x298" % urllib.quote_plus('%s, %s %s, %s' % (event.street, event.city, event.zip, event.country_id and event.country_id.name_get()[0][1] or ''))
         })
         return website.render("website_event.detail", values)
diff --git a/addons/website_event/event.py b/addons/website_event/event.py
index 72ad35a4210..047e492153f 100644
--- a/addons/website_event/event.py
+++ b/addons/website_event/event.py
@@ -9,14 +9,18 @@ class event(osv.osv):
         'website_published': fields.boolean('Available in the website'),
         'description_website': fields.html('Description for the website'),
         'product_ids': fields.one2many('event.event.product', "event_id", "Event"),
+        'organizer_id': fields.many2one('res.partner', "Orgonizer"),
+        'phone': fields.related('orgonizer_id', 'phone', type='char', string='Phone'),
+        'email': fields.related('orgonizer_id', 'email', type='char', string='Email'),
     }
 
 
 class event_product(osv.osv):
     _name = 'event.event.product'
     _columns = {
+        'deadline': fields.date("Sales End"),
         'event_id': fields.many2one('event.event', "Event"),
-        'product_id': fields.many2one('product.product', 'Product'),
+        'product_id': fields.many2one('product.product', 'Product', domain=[("event_type_id", "!=", False)]),
         'price': fields.float('Price'),
         'qty': fields.integer('Current Registrations', readonly=True),
         'max_qty': fields.integer('Maximum Registrations'),
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index a1797e1ebcb..6115491429c 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -10,17 +10,19 @@
             <data>
                 <xpath expr="//notebook" position="inside">
                     <page string="Tarifs">
-                        <group colspan="4">
-                            <field name="product_ids">
-                                <tree string="Payments" editable="top">
-                                    <field name="product_id"/>
-                                    <field name="price"/>
-                                    <field name="max_qty"/>
-                                </tree>
-                            </field>
-                        </group>
+                        <field name="product_ids">
+                            <tree string="Payments" editable="bottom">
+                                <field name="product_id"/>
+                                <field name="deadline"/>
+                                <field name="price"/>
+                                <field name="max_qty"/>
+                            </tree>
+                        </field>
                     </page>
                 </xpath>
+                <field name="address_id" position="after">
+                    <field name="organizer_id"/>
+                </field>
            </data>
         </field>
     </record>
@@ -73,7 +75,7 @@
                         <ul class="nav nav-list">
                             <li class="nav-header">Category</li>
                             <t t-foreach="types">
-                                <li t-if="type" t-att-class="searches.get('type') == str(type[0]) and 'active' or ''">
+                                <li t-if="type" t-att-class="searches.get('type') == str(type and type[0]) and 'active' or ''">
                                     <a t-att-href="'/event/%%s&amp;type=%%s' %% (search_path, type[0])"><t t-esc="type[1]"/> <small>(<t t-esc="type_count"/>)</small></a>
                                 </li>
                             </t>
@@ -81,7 +83,7 @@
                         <ul class="nav nav-list">
                             <li class="nav-header">Location</li>
                             <t t-foreach="countries">
-                                <li t-if="country_id" t-att-class="searches.get('country') == str(country_id[0]) and 'active' or ''">
+                                <li t-if="country_id" t-att-class="searches.get('country') == str(country_id and country_id[0]) and 'active' or ''">
                                     <a t-att-href="'/event/%%s&amp;country=%%s' %% (search_path, country_id[0])"><t t-esc="country_id[1]"/><small>(<t t-esc="country_id_count"/>)</small></a>
                                 </li>
                             </t>
@@ -140,17 +142,12 @@
                         <h4>When &amp; Where</h4>
                         <img t-att-src="google_map_url"/>
                         <address>
-                            <h4 t-field="event_id.address_id">Name</h4><br/>
-                            <span t-field="event_id.street"/><br/>
-                            <span t-field="event_id.city"/>, <span t-field="event_id.zip"/><br/>
-                            <span t-field="event_id.country_id"> </span><br/>
+                            <pre t-field="event_id.address_id"/>
                             <i class="icon-time"></i> <span t-field="event_id.date_begin"> </span><br/>
-                            <i class="icon-time"></i> <span t-field="event_id.date_end"> </span><br/>
-                            <br/>
+                            <i class="icon-time"></i> <span t-field="event_id.date_end"> </span>
                             <t t-if="event_id.user_id">
-                                Organized by: <span t-field="event_id.user_id"/><br/>
-                                <span>&amp;#x2706; <span t-field="organizer.phone"></span></span><br/>
-                                <i class="icon-envelope"></i> <span t-field="organizer.email"></span>
+                                <h6>Organized by:</h6>
+                                <pre><t t-field="event_id.organizer_id"/><br/><span>&amp;#x2706;</span> <span t-field="event_id.phone"></span><br/><i class="icon-envelope"></i> <span t-field="event_id.email"></span></pre>
                             </t>
                         </address>
                     </div>
@@ -167,6 +164,11 @@
                                 </span>
                             </t>
                             <h4 class="media-heading"><a t-att-href="'/event/%%s/' %% event_id.id"><span t-field="event_id.name"> </span></a></h4>
+                            <h5 class="media-heading">
+                                <span t-field="event_id.address_id"/><br/>
+                                <i class="icon-time"></i> <span t-field="event_id.date_begin"/><br/>
+                                <i class="icon-time"></i> <span t-field="event_id.date_end"/>
+                            </h5>
                             <a t-if="editable" href="#" t-att-data-id="event_id.id" class="pull-right">
                                 <span t-att-class="'label label-success js_unpublish %%s' %% (not event_id.website_published and 'hidden' or '')">Click to Unpublish</span>
                                 <span t-att-class="'label label-important js_publish %%s' %% (event_id.website_published and 'hidden' or '')">Click to Publish</span>
@@ -175,6 +177,7 @@
                             <form t-att-action="'/event/%%s/add_cart' %% event_id.id" method="post" t-if="event_id.product_ids">
                                 <div t-foreach="event_id.product_ids" t-as="prod">
                                     <span t-field="prod.product_id"/>
+                                    <span t-field="prod.deadline"/>
                                     <span t-field="prod.price"/>
                                     <span t-field="prod.qty"/>
                                     <span t-field="prod.max_qty"/>

From 972d35b277102aaabce3d8259c31867a52198656 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 6 Aug 2013 15:20:41 +0200
Subject: [PATCH 09/27] [IMP] website_event: access right for event and product

bzr revid: chm@openerp.com-20130806132041-84ubxx4hxgyqtwqk
---
 addons/website_event/event.py                 |  6 ++++++
 .../security/ir.model.access.csv              |  4 +++-
 .../website_event/security/website_event.xml  | 20 +++++++++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/addons/website_event/event.py b/addons/website_event/event.py
index 047e492153f..c78ea6e3edd 100644
--- a/addons/website_event/event.py
+++ b/addons/website_event/event.py
@@ -25,3 +25,9 @@ class event_product(osv.osv):
         'qty': fields.integer('Current Registrations', readonly=True),
         'max_qty': fields.integer('Maximum Registrations'),
     }
+
+class product(osv.osv):
+    _inherit = 'product.product'
+    _columns = {
+        'event_product_ids': fields.one2many('event.event.product', 'product_id', 'Linked event product'),
+    }
diff --git a/addons/website_event/security/ir.model.access.csv b/addons/website_event/security/ir.model.access.csv
index 6bc81d1794d..430fced34b5 100644
--- a/addons/website_event/security/ir.model.access.csv
+++ b/addons/website_event/security/ir.model.access.csv
@@ -1,2 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_event_event_public,event.event.public,event.model_event_event,base.group_public,1,0,0,0
\ No newline at end of file
+access_event_event_public,event.event.public,event.model_event_event,base.group_public,1,0,0,0
+access_event_event_product_public,event.event.product.public,website_event.model_event_event_product,base.group_public,1,0,0,0
+access_event_product_product_public,event.product.product.public,product.model_product_product,base.group_public,1,0,0,0
\ No newline at end of file
diff --git a/addons/website_event/security/website_event.xml b/addons/website_event/security/website_event.xml
index 05014176217..6c571eb4875 100644
--- a/addons/website_event/security/website_event.xml
+++ b/addons/website_event/security/website_event.xml
@@ -11,5 +11,25 @@
         <field name="perm_create" eval="False"/>
         <field name="perm_unlink" eval="False"/>
     </record>
+    <record id="event_event_product_public" model="ir.rule">
+        <field name="name">event product: Public</field>
+        <field name="model_id" ref="website_event.model_event_event_product"/>
+        <field name="domain_force">[('event_id.website_published', '=', True)]</field>
+        <field name="groups" eval="[(4, ref('base.group_public'))]"/>
+        <field name="perm_read" eval="True"/>
+        <field name="perm_write" eval="False"/>
+        <field name="perm_create" eval="False"/>
+        <field name="perm_unlink" eval="False"/>
+    </record>
+    <record id="event_product_product_public" model="ir.rule">
+        <field name="name">Product linked to event: Public</field>
+        <field name="model_id" ref="product.model_product_product"/>
+        <field name="domain_force">[("event_type_id", "!=", False), ('event_product_ids.event_id.website_published', '=', True)]</field>
+        <field name="groups" eval="[(4, ref('base.group_public'))]"/>
+        <field name="perm_read" eval="True"/>
+        <field name="perm_write" eval="False"/>
+        <field name="perm_create" eval="False"/>
+        <field name="perm_unlink" eval="False"/>
+    </record>
 </data>
 </openerp>

From 67e1d2819b9b3549e81db5fd57bc644ff7492a9c Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 6 Aug 2013 16:06:36 +0200
Subject: [PATCH 10/27] [REM] Remove public_uid from request

bzr revid: fme@openerp.com-20130806140636-qreh32s86q1synmk
---
 addons/website/website.py               | 22 ++++++++++++----------
 addons/website_mail/controllers/main.py |  3 ++-
 addons/website_sale/controllers/main.py |  9 +++++----
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/addons/website/website.py b/addons/website/website.py
index ebb66ab6e4c..9c503a273a3 100644
--- a/addons/website/website.py
+++ b/addons/website/website.py
@@ -9,13 +9,10 @@ from openerp.addons.web.http import request
 
 def auth_method_public():
     registry = openerp.modules.registry.RegistryManager.get(request.db)
-    request.public_uid = None
-    with registry.cursor() as cr:
-        request.public_uid = request.registry['ir.model.data'].get_object_reference(cr, openerp.SUPERUSER_ID, 'website', 'public_user')[1]
-        if not request.session.uid:
-            request.uid = request.public_uid
-        else:
-            request.uid = request.session.uid
+    if not request.session.uid:
+        request.uid = registry['website'].get_public_uid()
+    else:
+        request.uid = request.session.uid
 http.auth_methods['public'] = auth_method_public
 
 
@@ -23,11 +20,16 @@ class website(osv.osv):
     _name = "website" # Avoid website.website convention for conciseness (for new api). Got a special authorization from xmo and rco
     _description = "Website"
 
+    public_uid = None
+
+    def get_public_uid(self):
+        if not self.public_uid:
+            self.public_uid = request.registry['ir.model.data'].get_object_reference(request.cr, openerp.SUPERUSER_ID, 'website', 'public_user')[1]
+        return self.public_uid
+
     def get_rendering_context(self, additional_values=None):
         debug = 'debug' in request.params
-        editable = False
-        if request.uid or (request.public_uid and request.uid != request.public_uid):
-            editable = True
+        editable = request.uid != self.get_public_uid()
         values = {
             'debug': debug,
             'editable': editable,
diff --git a/addons/website_mail/controllers/main.py b/addons/website_mail/controllers/main.py
index 971934a5d13..8d738c020a2 100644
--- a/addons/website_mail/controllers/main.py
+++ b/addons/website_mail/controllers/main.py
@@ -79,10 +79,11 @@ class website_mail(http.Controller):
 
     @http.route(['/blog/<int:mail_group_id>/<int:blog_id>/post'], type='http', auth="public")
     def blog_post(self, mail_group_id=None, blog_id=None, **post):
+        website = request.registry['website']
         url = request.httprequest.host_url
         if post.get('body'):
             request.session.body = post.get('body')
-            if not request.uid != request.public_uid:
+            if request.uid == website.get_public_uid()
                 return '%s/admin#action=redirect&url=%s/blog/%s/%s/post' % (url, url, mail_group_id, blog_id)
 
         if 'body' in request.session and request.session.body:
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 52f1ac9c6ba..18959fab52a 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -8,6 +8,7 @@ from openerp.addons.web import http
 from openerp.addons.web.http import request
 
 def get_order(order_id=None):
+    website = request.registry['website']
     order_obj = request.registry.get('sale.order')
     # check if order allready exists
     if order_id:
@@ -18,7 +19,7 @@ def get_order(order_id=None):
     if not order_id:
         fields = [k for k, v in order_obj._columns.items()]
         order_value = order_obj.default_get(request.cr, openerp.SUPERUSER_ID, fields)
-        order_value['partner_id'] = openerp.SUPERUSER_ID != request.public_uid and \
+        order_value['partner_id'] = openerp.SUPERUSER_ID != website.get_public_uid() and \
             request.registry.get('res.users').browse(request.cr, openerp.SUPERUSER_ID, request.uid).partner_id.id or \
             None
         order_value.update(order_obj.onchange_partner_id(request.cr, openerp.SUPERUSER_ID, [], request.uid, context={})['value'])
@@ -259,8 +260,7 @@ class Ecommerce(http.Controller):
         country_state_obj = request.registry.get('res.country.state')
         payment_obj = request.registry.get('portal.payment.acquirer')
 
-
-        if request.uid != request.public_uid:
+        if request.uid != website.get_public_uid():
             values['partner'] = user_obj.browse(request.cr, request.uid, request.uid).partner_id
             shipping_ids = partner_obj.search(request.cr, request.uid, [("parent_id", "=", values['partner'].id), ('type', "=", 'delivery')])
             values['shipping'] = None
@@ -280,6 +280,7 @@ class Ecommerce(http.Controller):
 
     @http.route(['/shop/confirm_order'], type='http', auth="public")
     def confirm_order(self, **post):
+        website = request.registry['website']
         order = get_current_order()
 
         json = {'error': [], 'validation': False}
@@ -323,7 +324,7 @@ class Ecommerce(http.Controller):
             'country_id': post['country_id'],
             'state_id': post['state_id'],
         }
-        if request.uid != request.public_uid:
+        if request.uid != website.get_public_uid():
             partner_id = user_obj.browse(request.cr, request.uid, request.uid).partner_id.id
             partner_obj.write(request.cr, request.uid, [partner_id], partner_value)
         else:

From 1a93e8bbcaae753db7bd4a2810b22e248bcb92de Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 6 Aug 2013 16:18:48 +0200
Subject: [PATCH 11/27] [IMP] website_sale: some access right

bzr revid: chm@openerp.com-20130806141848-0m2c742tg18p2f04
---
 addons/website_event/controllers/main.py |  2 +-
 addons/website_mail/controllers/main.py  |  2 +-
 addons/website_sale/controllers/main.py  | 18 ++++++++++--------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index 33fbe3730bc..adc4342b7d5 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -62,7 +62,7 @@ class website_event(http.Controller):
             domain_search["country"] = [("country_id", "=", int(searches.get("country")))]
 
         def dom_without(without):
-            domain = [(1, "=", 1)]
+            domain = SUPERUSER_ID != request.uid and [('website_published', '=', True)] or [(1, "=", 1)]
             for key, search in domain_search.items():
                 if key != without:
                     domain += search
diff --git a/addons/website_mail/controllers/main.py b/addons/website_mail/controllers/main.py
index 8d738c020a2..f1020933023 100644
--- a/addons/website_mail/controllers/main.py
+++ b/addons/website_mail/controllers/main.py
@@ -83,7 +83,7 @@ class website_mail(http.Controller):
         url = request.httprequest.host_url
         if post.get('body'):
             request.session.body = post.get('body')
-            if request.uid == website.get_public_uid()
+            if request.uid == website.get_public_uid():
                 return '%s/admin#action=redirect&url=%s/blog/%s/%s/post' % (url, url, mail_group_id, blog_id)
 
         if 'body' in request.session and request.session.body:
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 18959fab52a..7413100cd5d 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -8,7 +8,6 @@ from openerp.addons.web import http
 from openerp.addons.web.http import request
 
 def get_order(order_id=None):
-    website = request.registry['website']
     order_obj = request.registry.get('sale.order')
     # check if order allready exists
     if order_id:
@@ -19,9 +18,7 @@ def get_order(order_id=None):
     if not order_id:
         fields = [k for k, v in order_obj._columns.items()]
         order_value = order_obj.default_get(request.cr, openerp.SUPERUSER_ID, fields)
-        order_value['partner_id'] = openerp.SUPERUSER_ID != website.get_public_uid() and \
-            request.registry.get('res.users').browse(request.cr, openerp.SUPERUSER_ID, request.uid).partner_id.id or \
-            None
+        order_value['partner_id'] = request.registry.get('res.users').browse(request.cr, openerp.SUPERUSER_ID, request.uid).partner_id.id
         order_value.update(order_obj.onchange_partner_id(request.cr, openerp.SUPERUSER_ID, [], request.uid, context={})['value'])
         order_id = order_obj.create(request.cr, openerp.SUPERUSER_ID, order_value)
     return order_obj.browse(request.cr, openerp.SUPERUSER_ID, order_id)
@@ -75,9 +72,7 @@ class Ecommerce(http.Controller):
         if not order_id:
             fields = [k for k, v in order_obj._columns.items()]
             order_value = order_obj.default_get(request.cr, openerp.SUPERUSER_ID, fields)
-            order_value['partner_id'] = openerp.SUPERUSER_ID != request.public_uid and \
-                request.registry.get('res.users').browse(request.cr, openerp.SUPERUSER_ID, request.uid).partner_id.id or \
-                None
+            order_value['partner_id'] = request.registry.get('res.users').browse(request.cr, openerp.SUPERUSER_ID, request.uid).partner_id.id
             order_value.update(order_obj.onchange_partner_id(request.cr, openerp.SUPERUSER_ID, [], request.uid, context={})['value'])
             order_id = order_obj.create(request.cr, openerp.SUPERUSER_ID, order_value)
         return order_obj.browse(request.cr, openerp.SUPERUSER_ID, order_id)
@@ -93,6 +88,7 @@ class Ecommerce(http.Controller):
     def recommended_product(self, my_pids):
         if not my_pids:
             return []
+        product_obj = request.registry.get('product.product')
 
         my_pids = str(my_pids)[1:-1]
         product_ids = []
@@ -110,7 +106,10 @@ class Ecommerce(http.Controller):
         request.cr.execute(query)
         for p in request.cr.fetchall():
             product_ids.append(p[0])
-        return request.registry.get('product.product').browse(request.cr, request.uid, product_ids)
+
+        # search to apply access rules
+        product_ids = product_obj.search(request.cr, request.uid, [("id", "in", product_ids)])
+        return product_obj.browse(request.cr, request.uid, product_ids)
 
     @http.route(['/shop', '/shop/category/<cat_id>', '/shop/category/<cat_id>/page/<page>', '/shop/page/<page>'], type='http', auth="public")
     def category(self, cat_id=0, page=0, **post):
@@ -119,6 +118,9 @@ class Ecommerce(http.Controller):
         product_obj = request.registry.get('product.product')
 
         domain = [("sale_ok", "=", True)]
+        if openerp.SUPERUSER_ID != request.uid:
+            domain += [('website_published', '=', True)]
+
         if cat_id:
             cat_id = int(cat_id)
             domain = [('pos_categ_id.id', 'child_of', cat_id)] + domain

From dc0148b73efe0958c6d4d8c8e452993a37e64622 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 6 Aug 2013 16:28:35 +0200
Subject: [PATCH 12/27] [IMP] website_mail: public_uid

bzr revid: chm@openerp.com-20130806142835-tfk8gvdidxi0m371
---
 addons/website_mail/controllers/main.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/website_mail/controllers/main.py b/addons/website_mail/controllers/main.py
index f1020933023..908e1c8f7f7 100644
--- a/addons/website_mail/controllers/main.py
+++ b/addons/website_mail/controllers/main.py
@@ -30,7 +30,7 @@ class website_mail(http.Controller):
             'subscribe': post.get('subscribe'),
         })
 
-        if request.uid != request.public_uid and mail_group_id:
+        if request.uid != website.get_public_uid() and mail_group_id:
             message_follower_ids = group_obj.read(request.cr, request.uid, [mail_group_id], ['message_follower_ids'])[0]['message_follower_ids']
             parent_id = user_obj.browse(request.cr, SUPERUSER_ID, request.uid).partner_id.id
             values['subscribe'] = parent_id in message_follower_ids
@@ -116,12 +116,13 @@ class website_mail(http.Controller):
 
     @http.route(['/blog/<int:mail_group_id>/subscribe', '/blog/<int:mail_group_id>/<int:blog_id>/subscribe'], type='http', auth="public")
     def subscribe(self, mail_group_id=None, blog_id=None, **post):
+        website = request.registry['website']
         partner_obj = request.registry['res.partner']
         group_obj = request.registry['mail.group']
         user_obj = request.registry['res.users']
 
-        if mail_group_id and 'subscribe' in post and (post.get('email') or request.uid != request.public_uid):
-            if request.uid == request.public_uid:
+        if mail_group_id and 'subscribe' in post and (post.get('email') or request.uid != website.get_public_uid()):
+            if request.uid == website.get_public_uid():
                 partner_ids = partner_obj.search(request.cr, SUPERUSER_ID, [("email", "=", post.get('email'))])
                 if not partner_ids:
                     partner_ids = [partner_obj.create(request.cr, SUPERUSER_ID, {"email": post.get('email'), "name": "Subscribe: %s" % post.get('email')})]
@@ -133,12 +134,13 @@ class website_mail(http.Controller):
 
     @http.route(['/blog/<int:mail_group_id>/unsubscribe', '/blog/<int:mail_group_id>/<int:blog_id>/unsubscribe'], type='http', auth="public")
     def unsubscribe(self, mail_group_id=None, blog_id=None, **post):
+        website = request.registry['website']
         partner_obj = request.registry['res.partner']
         group_obj = request.registry['mail.group']
         user_obj = request.registry['res.users']
 
-        if mail_group_id and 'unsubscribe' in post and (post.get('email') or request.uid != request.public_uid):
-            if request.uid == request.public_uid:
+        if mail_group_id and 'unsubscribe' in post and (post.get('email') or request.uid != website.get_public_uid()):
+            if request.uid == website.get_public_uid():
                 partner_ids = partner_obj.search(request.cr, SUPERUSER_ID, [("email", "=", post.get('email'))])
             else:
                 partner_ids = [user_obj.browse(request.cr, request.uid, request.uid).partner_id.id]

From cf82d597f260ad1e60fd16821283d2f948e02c73 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 6 Aug 2013 16:45:36 +0200
Subject: [PATCH 13/27] [IMP] website_event: on_change product

bzr revid: chm@openerp.com-20130806144536-6l2g1glui1cout2q
---
 addons/website_event/event.py                | 3 +++
 addons/website_event/views/website_event.xml | 2 +-
 addons/website_sale/controllers/main.py      | 1 -
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/website_event/event.py b/addons/website_event/event.py
index c78ea6e3edd..2522039ebca 100644
--- a/addons/website_event/event.py
+++ b/addons/website_event/event.py
@@ -25,6 +25,9 @@ class event_product(osv.osv):
         'qty': fields.integer('Current Registrations', readonly=True),
         'max_qty': fields.integer('Maximum Registrations'),
     }
+    def onchange_product_id(self, cr, uid, ids, product_id=False, context=None):
+        return {'value': {'price': self.pool.get("product.product").browse(cr, uid, product_id).list_price or 0}}
+
 
 class product(osv.osv):
     _inherit = 'product.product'
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 6115491429c..7e74251659b 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -12,7 +12,7 @@
                     <page string="Tarifs">
                         <field name="product_ids">
                             <tree string="Payments" editable="bottom">
-                                <field name="product_id"/>
+                                <field name="product_id" on_change='onchange_product_id(product_id)'/>
                                 <field name="deadline"/>
                                 <field name="price"/>
                                 <field name="max_qty"/>
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 7413100cd5d..96d0f079f52 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -200,7 +200,6 @@ class Ecommerce(http.Controller):
         values = website.get_rendering_context()
         context = {}
 
-        order_obj = request.registry.get('sale.order')
         order_line_obj = request.registry.get('sale.order.line')
         user_obj = request.registry.get('res.users')
 

From 966da9b37bf63f9c222f666138500e2ff5771847 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 6 Aug 2013 17:21:58 +0200
Subject: [PATCH 14/27] [IMP] website

bzr revid: chm@openerp.com-20130806152158-0waq0cqo2702isyo
---
 addons/website_event/event.py                |  2 +-
 addons/website_event/views/website_event.xml | 36 ++++++++++++--------
 addons/website_mail/views/website_mail.xml   |  2 +-
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/addons/website_event/event.py b/addons/website_event/event.py
index 2522039ebca..65a8034951f 100644
--- a/addons/website_event/event.py
+++ b/addons/website_event/event.py
@@ -8,7 +8,7 @@ class event(osv.osv):
     _columns = {
         'website_published': fields.boolean('Available in the website'),
         'description_website': fields.html('Description for the website'),
-        'product_ids': fields.one2many('event.event.product', "event_id", "Event"),
+        'event_product_ids': fields.one2many('event.event.product', "event_id", "Event"),
         'organizer_id': fields.many2one('res.partner', "Orgonizer"),
         'phone': fields.related('orgonizer_id', 'phone', type='char', string='Phone'),
         'email': fields.related('orgonizer_id', 'email', type='char', string='Email'),
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 7e74251659b..65ff07fa9dd 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -173,20 +173,28 @@
                                 <span t-att-class="'label label-success js_unpublish %%s' %% (not event_id.website_published and 'hidden' or '')">Click to Unpublish</span>
                                 <span t-att-class="'label label-important js_publish %%s' %% (event_id.website_published and 'hidden' or '')">Click to Publish</span>
                             </a>
-                            <h4 t-if="event_id.product_ids">Ticket Information</h4>
-                            <form t-att-action="'/event/%%s/add_cart' %% event_id.id" method="post" t-if="event_id.product_ids">
-                                <div t-foreach="event_id.product_ids" t-as="prod">
-                                    <span t-field="prod.product_id"/>
-                                    <span t-field="prod.deadline"/>
-                                    <span t-field="prod.price"/>
-                                    <span t-field="prod.qty"/>
-                                    <span t-field="prod.max_qty"/>
-                                    <select t-att-name="'product[%%s]' %% prod.id">
-                                        <t t-foreach="range(0,10)" t-as="nb">
-                                            <option t-esc="nb"/>
-                                        </t>
-                                    </select>
-                                </div>
+                            <h4 t-if="event_id.event_product_ids">Ticket Information</h4>
+                            <form t-att-action="'/event/%%s/add_cart' %% event_id.id" method="post" t-if="event_id.event_product_ids">
+                                <table class="table">
+                                    <tr>
+                                        <th>Ticket type</th>
+                                        <th>Sales End</th>
+                                        <th>Price</th>
+                                        <th>Seats</th>
+                                        <th>Quantity</th>
+                                    </tr>
+                                    <tr t-foreach="event_id.event_product_ids" t-as="prod">
+                                        <td t-field="prod.product_id"/>
+                                        <td t-field="prod.deadline"/>
+                                        <td t-field="prod.price"/>
+                                        <td><span t-if="prod.max_qty"><t t-esc="prod.qty"/>/<t t-field="prod.max_qty"/></span></td>
+                                        <td>
+                                            <select t-att-name="'product[%%s]' %% prod.id">
+                                                <t t-foreach="range(0,10)" t-as="nb"><option t-esc="nb"/></t>
+                                            </select>
+                                        </td>
+                                    </tr>
+                                </table>
                                 <button type="submit" class="btn btn-primary">Order Now</button>
                             </form>
                             <h4>Event Details</h4>
diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml
index 3c7a577fe9e..e59d4a06ec1 100644
--- a/addons/website_mail/views/website_mail.xml
+++ b/addons/website_mail/views/website_mail.xml
@@ -64,7 +64,7 @@
                                 </ul>
                             </li>
                             <form action="./subscribe" method="POST" class="form-inline" t-if="not subscribe">
-                                <input placeholder="Email Address" type="email" name="email" class="input-medium" t-if="request.uid == request.public_uid"/>
+                                <input placeholder="Email Address" type="email" name="email" class="input-medium" t-if="request.uid == website.get_public_uid()"/>
                                 <button type="submit" class="btn btn-primary" name="subscribe">Subscribe</button>
                             </form>
                             <form action="./unsubscribe" method="POST" class="form-inline" t-if="subscribe">

From 892e38decf475b3f6876c3b07eb7b404c0dc6584 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 6 Aug 2013 17:25:51 +0200
Subject: [PATCH 15/27] [IMP] website: website in context value

bzr revid: chm@openerp.com-20130806152551-al681prbs3l1150q
---
 addons/website_mail/controllers/main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/website_mail/controllers/main.py b/addons/website_mail/controllers/main.py
index 908e1c8f7f7..bb2191c3c98 100644
--- a/addons/website_mail/controllers/main.py
+++ b/addons/website_mail/controllers/main.py
@@ -28,6 +28,7 @@ class website_mail(http.Controller):
             'next_date': None,
             'mail_group_id': mail_group_id,
             'subscribe': post.get('subscribe'),
+            'website': website,
         })
 
         if request.uid != website.get_public_uid() and mail_group_id:

From bbe972173238afa3eaf77d1321b999e14ce0ffbd Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 6 Aug 2013 17:29:51 +0200
Subject: [PATCH 16/27] [IMP] website_mail: check_access_rule to follow

bzr revid: chm@openerp.com-20130806152951-0ur49vxwnxfexzq7
---
 addons/website_mail/controllers/main.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/website_mail/controllers/main.py b/addons/website_mail/controllers/main.py
index bb2191c3c98..f3f99bb9aed 100644
--- a/addons/website_mail/controllers/main.py
+++ b/addons/website_mail/controllers/main.py
@@ -129,7 +129,8 @@ class website_mail(http.Controller):
                     partner_ids = [partner_obj.create(request.cr, SUPERUSER_ID, {"email": post.get('email'), "name": "Subscribe: %s" % post.get('email')})]
             else:
                 partner_ids = [user_obj.browse(request.cr, request.uid, request.uid).partner_id.id]
-            group_obj.message_subscribe(request.cr, request.uid, [mail_group_id], partner_ids)
+            group_obj.check_access_rule(request.cr, request.uid, [mail_group_id], 'read')
+            group_obj.message_subscribe(request.cr, SUPERUSER_ID, [mail_group_id], partner_ids)
 
         return self.blog(mail_group_id=mail_group_id, blog_id=blog_id, subscribe=post.get('email'))
 
@@ -145,7 +146,8 @@ class website_mail(http.Controller):
                 partner_ids = partner_obj.search(request.cr, SUPERUSER_ID, [("email", "=", post.get('email'))])
             else:
                 partner_ids = [user_obj.browse(request.cr, request.uid, request.uid).partner_id.id]
-            group_obj.message_unsubscribe(request.cr, request.uid, [mail_group_id], partner_ids)
+            group_obj.check_access_rule(request.cr, request.uid, [mail_group_id], 'read')
+            group_obj.message_unsubscribe(request.cr, SUPERUSER_ID, [mail_group_id], partner_ids)
 
         return self.blog(mail_group_id=mail_group_id, blog_id=blog_id, subscribe=None)
 

From 24a790e95f3f2aec5201f62d77d5fa9a71e1e767 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 6 Aug 2013 17:33:23 +0200
Subject: [PATCH 17/27] [FIX] website_hr

bzr revid: chm@openerp.com-20130806153323-ctvf6y0yskaiwv8y
---
 addons/website_hr/hr.py                |  1 -
 addons/website_hr/static/src/js/hr.js  | 16 ----------------
 addons/website_hr/views/website_hr.xml | 17 +++++++----------
 3 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/addons/website_hr/hr.py b/addons/website_hr/hr.py
index 542e03e2a1c..91ae7a89ada 100644
--- a/addons/website_hr/hr.py
+++ b/addons/website_hr/hr.py
@@ -7,6 +7,5 @@ class hr(osv.osv):
     _inherit = 'hr.employee'
     _columns = {
         'website_published': fields.boolean('Available in the website'),
-        'website_published_on_contact_form': fields.boolean('Publish', help="Publish also on contact form"),
     }
 
diff --git a/addons/website_hr/static/src/js/hr.js b/addons/website_hr/static/src/js/hr.js
index 1d8e8deac03..e0e69fb5161 100644
--- a/addons/website_hr/static/src/js/hr.js
+++ b/addons/website_hr/static/src/js/hr.js
@@ -15,20 +15,4 @@ $(document).ready(function () {
             }
         });
     });
-    $(document).on('click', '.js_publish_contact, .js_unpublish_contact', function (e) {
-        e.preventDefault();
-        var $link = $(this).parent();
-        $link.find('.js_publish_contact, .js_unpublish_contact').addClass("hidden");
-        var $unp = $link.find(".js_unpublish_contact");
-        var $p = $link.find(".js_publish_contact");
-        $.post('/hr/publish_contact', {'id': $link.data('id')}, function (result) {
-            if (+result) {
-                $p.addClass("hidden");
-                $unp.removeClass("hidden");
-            } else {
-                $p.removeClass("hidden");
-                $unp.addClass("hidden");
-            }
-        });
-    });
 });
\ No newline at end of file
diff --git a/addons/website_hr/views/website_hr.xml b/addons/website_hr/views/website_hr.xml
index 59bfb9feb46..76190f7977c 100644
--- a/addons/website_hr/views/website_hr.xml
+++ b/addons/website_hr/views/website_hr.xml
@@ -37,18 +37,15 @@
                                     <a href="#" t-att-data-id="employee_id.id">
                                         <span t-att-class="'label label-success js_unpublish %%s' %% (not employee_id.website_published and 'hidden' or '')">Click to Unpublish</span>
                                         <span t-att-class="'label label-important js_publish %%s' %% (employee_id.website_published and 'hidden' or '')">Click to Publish</span>
-                                    </a><br/>
-                                    <a href="#" t-att-data-id="employee_id.id">
-                                        <span t-att-class="'label label-success js_unpublish_contact %%s' %% (not employee_id.website_published and 'hidden' or '')">hidden on Contacts</span>
-                                        <span t-att-class="'label label-important js_publish_contact %%s' %% (employee_id.website_published and 'hidden' or '')">display in Contacts</span>
                                     </a>
                                 </div>
-                                <h5 class="media-heading"><t t-esc="employee_id.name"/></h5>
-                                <div t-record="employee_id" t-field="department_id"> </div>
-                                <div t-record="employee_id" t-field="job_id"> </div>
-                                <div t-record="employee_id" t-field="work_location"> </div>
-                                <div t-record="employee_id" t-field="work_phone"> </div>
-                                <div t-record="employee_id" t-field="work_email"> </div>
+                                <h5 class="media-heading" t-field="employee_id.name"/>
+                                <div t-field="employee_id.department_id"/>
+                                <div t-field="employee_id.job_id"/>
+                                <div t-field="employee_id.work_location"/>
+                                <div t-field="employee_id.work_phone"/>
+                                <div t-field="employee_id.work_email"/>
+                                <div t-field="employee_id.public_info"/>
                             </div>
                         </div>
                     </div>

From 49ce8ee1b69a2b887c45fda4329e163ded1c1be2 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 6 Aug 2013 17:39:50 +0200
Subject: [PATCH 18/27] [IMP] website_mail

bzr revid: chm@openerp.com-20130806153950-to0nk5mqlxy4x8ug
---
 addons/website_mail/views/website_mail.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml
index e59d4a06ec1..2d2fd2d7e71 100644
--- a/addons/website_mail/views/website_mail.xml
+++ b/addons/website_mail/views/website_mail.xml
@@ -96,14 +96,14 @@
                                         </a>
                                         <t t-raw="comment.body"/>
                                         <small class="pull-right muted text-right">
-                                            <div t-esc="comment.author_id"/>
-                                            <div t-esc="comment.date"/>
+                                            <div t-field="comment.author_id"/>
+                                            <div t-field="comment.date"/>
                                         </small>
                                     </div>
                                 </li>
                                 <form id="post" t-att-action="'/blog/%%s/%%s/post#post' %% (blog_id.res_id, blog_id.id)" method="POST" class="form-horizontal text-center" groups="group_website_mail_reply">
-                                    <textarea rows="4" placeholder="Your message" class="span7"> </textarea>
-                                    <button type="submit" class="btn">Post your message</button>
+                                    <textarea rows="4" placeholder="Your comment" class="span7"> </textarea>
+                                    <button type="submit" class="btn">Post your comment</button>
                                 </form>
                             </ul>
                         </div>
@@ -120,8 +120,8 @@
                                     <div class="media">
                                         <div t-field="blog.body"/>
                                         <small class="pull-left muted text-right" t-if="len(blog.child_ids)">
-                                            <a t-if="len(blog.child_ids) &lt;= 1" t-att-href="'/blog/%%s/%%s#comment' %% (blog.res_id, blog.id)"><t t-esc="len(blog.child_ids)"/> Message</a>
-                                            <a t-if="len(blog.child_ids) > 1" t-att-href="'/blog/%%s/%%s#comment' %% (blog.res_id, blog.id)"><t t-esc="len(blog.child_ids)"/> Messages</a>
+                                            <a t-if="len(blog.child_ids) &lt;= 1" t-att-href="'/blog/%%s/%%s#comment' %% (blog.res_id, blog.id)"><t t-esc="len(blog.child_ids)"/> Comment</a>
+                                            <a t-if="len(blog.child_ids) > 1" t-att-href="'/blog/%%s/%%s#comment' %% (blog.res_id, blog.id)"><t t-esc="len(blog.child_ids)"/> Comments</a>
                                         </small>
                                         <small class="pull-right muted text-right">
                                             <div t-field="blog.author_id"/>

From 480630aecffc741a7267bfc8db4e81dd6a26e122 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 7 Aug 2013 09:53:43 +0200
Subject: [PATCH 19/27] [IMP] remove big blue border around RTE sections

bzr revid: xmo@openerp.com-20130807075343-22er1l4ob6jbxczc
---
 addons/website/static/src/css/editor.css  | 3 ++-
 addons/website/static/src/css/editor.sass | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 31601a63230..246d62b62be 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -1,3 +1,4 @@
+@charset "utf-8";
 .oe_website_editorbar {
   position: fixed;
   top: 0;
@@ -43,7 +44,7 @@
 }
 
 .oe_editable:focus {
-  outline: #80b5f2 solid 5px !important;
+  outline: none !important;
 }
 
 .oe_carousel_options {
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index f7e46cd19d1..24a549f1d05 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -39,7 +39,7 @@
                 padding-left: 6px
 
 .oe_editable:focus
-    outline: #80B5F2 solid 5px !important
+    outline: none !important
 
 .oe_carousel_options
     cursor: pointer

From 3c7c5e568d3425d4b1240068eee606e93128abbe Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 7 Aug 2013 11:33:48 +0200
Subject: [PATCH 20/27] [IMP] website manifest

bzr revid: fp@tinyerp.com-20130807093348-gvacpeu31x81c93q
---
 addons/website/static/description/index.html | 166 +++++++++++++++++++
 1 file changed, 166 insertions(+)
 create mode 100644 addons/website/static/description/index.html

diff --git a/addons/website/static/description/index.html b/addons/website/static/description/index.html
new file mode 100644
index 00000000000..b0c9a52569e
--- /dev/null
+++ b/addons/website/static/description/index.html
@@ -0,0 +1,166 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Enterprise Website Builder</h2>
+            <h3 class="oe_slogan">Get an awesome website. Customize easily.</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=website">
+                    <img src="">
+                </a>
+                <div class="oe_demo_footer oe_centeralign">Online Demo</div>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Create enterprise-grade website with our super easy builder; no backend, everything
+is editable inline. Benefit from out-of-the-box business features; shop, events, blogs,
+jobs announces, "our team" pages, etc.
+            </p>
+            <div class="oe_centeralign oe_websiteonly">
+                <a href="http://www.openerp.com/start?app=website" class="oe_button oe_big oe_tacky">Create your <span class="oe_emph">free</span> website</a>
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Edit Anything Inline</h2>
+        <h3 class="oe_slogan">What You See Is What You Get. Really!</h3>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+                Create websites with no technical knowledge.  OpenERP's unique
+                <em>'edit inline'</em> approach makes website creation
+                surprisingly easy. No more complex backend with menu managers,
+                page editors, banner manager, ...  Just click anywhere to any
+                content.
+            </p><p>
+                "Want to change the price of a product? or put it in bold? Want to
+                change a blog title?" just click and change. What you see is what
+                you get. Really.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_bg_img oe_centered">
+                <img class="oe_picture" src="">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Awsome. Astonishingly Beautiful.</h2>
+        <h3 class="oe_slogan">Professional themes and building blocks</h3>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="">
+        </div>
+        <div class="oe_span6">
+           <p class='oe_mt32'>
+                OpenERP's building block feature and inline edition approach
+                allows to design modern website that are not possible with
+                traditional WYSIWYG page editors.
+            </p><p>
+                Whether it's for products descriptions, blogs or static pages,
+                you don't need to be a professioanl designer to create modern
+                and clean web pages.
+           </p>
+        </div>
+   </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Enterprise-Ready, out-of-the-box</h2>
+        <h3 class="oe_slogan">Install professional features without effort.</h3>
+        <div class="oe_span6">
+          <p class='oe_mt32'>
+            Activate ready-to-use enterprise features in just a click;
+            ecommerce, call-to-actions, jobs announces, events, customer
+            references, "our team" page, blogs, newsletters, etc.
+          </p><p>
+            Traditional eCommerce and CMS have poor backends as it's not their
+            core focus. The OpenERP integration allows you to benefit from the
+            best management software to follow-up on your orders, your jobs
+            applicants, your leads, etc.
+          </p><p>
+            You don't need anymore to synchronize your management software and
+            your ecommerce.
+          </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="">
+        </div>
+   </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Multi-languages Without Pain</h2>
+        <h3 class="oe_slogan">Automate updates and transaltions easily</h3>
+        <div class="oe_span6">
+            <div class="oe_bg_img">
+                <img class="oe_picture" src="">
+            </div>
+        </div>
+        <div class="oe_span6">
+          <p class='oe_mt32'>
+              Get your website translated in multiple languages with no effort.
+              OpenERP proposes and propagates translations automatically
+              across pages.
+          </p>
+              Our translation "on demand" features allows you to benefit from
+              professional translators to translate all your changes
+              automatically. Just change any part of your website (a new blog
+              post, a new pages, updated products, ...) and the translated
+              versions are updated automatically in around 32 hours.
+          </p>
+        </div>
+   </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Designer-Friendly Themes</h2>
+        <h3 class="oe_slogan">Designers love working on OpenERP</h3>
+        <div class="oe_span6">
+          <p class='oe_mt32'>
+              Themes are awesome and easy to design. You don't need to develop
+              to create new pages, themes or building blocks. We use a clean
+              HTML structure, a <a href="http://getbootstrap.com/">bootstrap</a>
+              CSS and our modularity allows to distribute your themes easily.
+          </p><p>
+              The building block approach allows the website to remain clean
+              after the end-users start creating new contents.
+          </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture" src="">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Optimize your online presence efficiently</h2>
+        <h3 class="oe_slogan">SEO tools at your finger tips</h3>
+        <div class="oe_span6">
+          <p class='oe_mt32'>
+              SEO tools are ready to use, with no configuration required.
+              OpenERP suggests keywords according to Google most searched
+              terms, Google Analytics tracks your shopping cart events,
+              sitemap and structuered content are created automatically for
+              Google indexation, etc.
+          </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_bg_img">
+                <img class="oe_picture oe_screenshot" src="">
+            </div>
+        </div>
+    </div>
+</section>

From 8d4efbe2a27b606c0cb10b2cb3ecb421920f986f Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 7 Aug 2013 12:01:42 +0200
Subject: [PATCH 21/27] [FIX] Distribute branding for all website#render()
 calls if editable

bzr revid: fme@openerp.com-20130807100142-uc01ncn9oca65t10
---
 addons/website/website.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/website/website.py b/addons/website/website.py
index 9c503a273a3..ce8ccfccb86 100644
--- a/addons/website/website.py
+++ b/addons/website/website.py
@@ -50,7 +50,7 @@ class website(osv.osv):
         return values
 
     def render(self, template, values={}):
-        # context = {
-        #     'inherit_branding': values['editable'],
-        # }
-        return request.registry.get("ir.ui.view").render(request.cr, request.uid, template, values)
+        context = {
+            'inherit_branding': values.get('editable', False),
+        }
+        return request.registry.get("ir.ui.view").render(request.cr, request.uid, template, values, context=context)

From 0e88711020bf1499d84abbc68abeca545317f109 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 7 Aug 2013 13:16:14 +0200
Subject: [PATCH 22/27] [FIX] website dependency

bzr revid: xmo@openerp.com-20130807111614-m9eoal3l4zmp65ny
---
 addons/website/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/__openerp__.py b/addons/website/__openerp__.py
index d1a258d171d..3cdb3230e5d 100644
--- a/addons/website/__openerp__.py
+++ b/addons/website/__openerp__.py
@@ -8,7 +8,7 @@ OpenERP Website CMS
 
         """,
     'author': 'OpenERP SA',
-    'depends': ['base'],
+    'depends': ['web'],
     'installable': True,
     'data': [
         'views/views.xml',

From 2d8bf806c9755a8549616168f0d7d9273e8a6d8e Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 7 Aug 2013 13:39:00 +0200
Subject: [PATCH 23/27] [FIX] Forgot to change jQuery filename after upstream
 merge

bzr revid: fme@openerp.com-20130807113900-awlhqfv0g1z7v1fv
---
 addons/website/views/views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index 79cd88486b5..f6c259771ed 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -53,7 +53,7 @@
                 <html>
                     <head>
                         <title t-raw="title"><t t-esc="res_company.name"/></title>
-                        <script type="text/javascript" src="/web/static/lib/jquery/jquery-1.8.3.js"></script>
+                        <script type="text/javascript" src="/web/static/lib/jquery/jquery.js"></script>
                         <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/ckeditor/4.2/ckeditor.js"></script>
                         <script type="text/javascript">
                             CKEDITOR.disableAutoInline = true;

From 204fb89a8c99f39cef431bbf2dc0d23cd7ad0a00 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 7 Aug 2013 13:59:05 +0200
Subject: [PATCH 24/27] [IMP] switch ck to built-in toolbar again

bzr revid: xmo@openerp.com-20130807115905-4ooacsvwh7tsone5
---
 addons/website/static/src/js/website.js | 187 ++----------------------
 addons/website/views/views.xml          |   1 +
 2 files changed, 17 insertions(+), 171 deletions(-)

diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index bec4a35637a..af30b6a640a 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -159,157 +159,16 @@ instance.website.EditorBar = instance.web.Widget.extend({
     },
 });
 
-instance.website.Action = instance.web.Widget.extend({
-    tagName: 'button',
-    attributes: {
-        type: 'button',
-    },
-    events: { click: 'perform' },
-    init: function (parent, name) {
-        this._super(parent);
-        this.name = name;
-    },
-    start: function () {
-        this.$el.text(this.name);
-        return this._super();
-    },
-    /**
-     * Executes action
-     */
-    perform: null,
-    toggle: function (to) {
-        this.$el.prop('disabled', !to);
-    },
-});
-var Style = instance.website.Style = instance.website.Action.extend({
-    init: function (parent, name, style) {
-        this._super(parent, name);
-        this.style = style;
-    },
-    perform: function () {
-        this.getParent().with_editor(function (editor) {
-            editor.applyStyle(new CKEDITOR.style(this.style))
-        }.bind(this));
-    },
-});
-var Command = instance.website.Command = instance.website.Action.extend({
-    init: function (parent, name, command) {
-        this._super(parent, name);
-        this.command = command;
-    },
-    perform: function () {
-        this.getParent().with_editor(function (editor) {
-            switch (typeof this.command) {
-            case 'string': editor.execCommand(this.command); break;
-            case 'function': this.command(editor); break;
-            }
-        }.bind(this));
-    },
-});
-var Group = instance.website.ActionGroup = instance.website.Action.extend({
-    template: 'Website.ActionGroup',
-    events: { 'click > button': 'perform' },
-    instances: [],
-    init: function (parent, name, actions) {
-        this._super(parent, name);
-        this.actions = _(actions).map(this.getParent().proxy('init_command'));
-    },
-    start: function () {
-        this.instances.push(this);
-        var $ul = this.$('ul');
-        return $.when.apply(null, _(this.actions).map(function (action) {
-            var $li = $('<li>').appendTo($ul);
-            return action.appendTo($li);
-        }));
-    },
-    destroy: function () {
-        this.instances = _(this.instances).without(this);
-        return this._super();
-    },
-    perform: function () {
-        this.getParent().with_editor(function () {
-            _(this.instances).chain()
-                .without(this)
-                .pluck('$el')
-                .invoke('removeClass', 'open');
-            // JS part of bootstrap dropdown does really weird stuff which
-            // interacts quite badly with the RTE thing, so bypass it
-            this.$el.toggleClass('open');
-        }.bind(this), false);
-        return false;
-    },
-    toggle: function (to) {
-        this.$('> button').prop('disabled', !to);
-    },
-});
-
 instance.website.RTE = instance.web.Widget.extend({
     tagName: 'li',
+    id: 'oe_rte_toolbar',
     className: 'oe_right oe_rte_toolbar',
-    commands: [
-        [Command, "\uf032", 'bold'],
-        [Command, "\uf033", 'italic'],
-        [Command, "\uf0cd", 'underline'],
-        [Command, "\uf0cc", 'strike'],
-        [Command, "\uf12b", 'superscript'],
-        [Command, "\uf12c", 'subscript'],
-        [Command, "\uf0c1", 'link'],
-        [Command, "\uf127", 'unlink'],
-        [Command, "\uf10d", 'blockquote'],
-        // 'image' uses either filebrowserImageUploadUrl or
-        // filebrowserUploadUrl, and provides a `link` tab. imagebutton only
-        // uses filebrowserImageUploadUrl and does not provide a `link` tab to
-        // hotlink an image from the internets.
-        [Command, "\uf03e", 'image'],
-        // [Command, "\uf030", 'imagebutton'],
-        [Group, "\uf0ca", [
-            [Command, "\uf0ca", 'bulletedlist'],
-            [Command, "\uf0cb", 'numberedlist'],
-            [Command, "\uf03b", 'outdent'],
-            [Command, "\uf03c", 'indent']
-        ]],
-        [Group, _lt("Heading"), [
-            [Style, _lt('H1'), { element: 'h1' }],
-            [Style, _lt('H2'), { element: 'h2', }],
-            [Style, _lt('H3'), { element: 'h3', }],
-            [Style, _lt('H4'), { element: 'h4', }],
-            [Style, _lt('H5'), { element: 'h5', }],
-            [Style, _lt('H6'), { element: 'h6', }]
-        ]],
-        [Group, "\uf039", [
-            [Command, "\uf039", 'justifyblock'],
-            [Command, "\uf036", 'justifyleft'],
-            [Command, "\uf038", 'justifyright'],
-            [Command, "\uf037", 'justifycenter']
-        ]]
-    ],
     // editor.ui.items -> possible commands &al
     // editor.applyStyle(new CKEDITOR.style({element: "span",styles: {color: "#(color)"},overrides: [{element: "font",attributes: {color: null}}]}, {color: '#ff0000'}));
-    start: function () {
-        this.$el.hide();
 
-        return $.when.apply(
-            null, _(this.commands).map(this.proxy('start_command')));
-    },
-    init_command: function (command) {
-        var type = command[0], args = command.slice(1);
-        args.unshift(this);
-        var F = function (args) {
-            return type.apply(this, args);
-        };
-        F.prototype = type.prototype;
-
-        return new F(args);
-    },
-    start_command: function (command) {
-        return this.init_command(command).appendTo(this.$el);
-    },
     start_edition: function ($elements) {
         var self = this;
-        this.$el.show();
-        this.disable();
         this.snippet_carousel();
-        CKEDITOR.on('currentInstance', this.proxy('_change_focused_editor'));
         $elements
             .not('span, [data-oe-type]')
             .each(function () {
@@ -321,40 +180,11 @@ instance.website.RTE = instance.web.Widget.extend({
             });
     },
 
-    /**
-     * @param {Function} fn
-     * @param {Boolean} [snapshot=true]
-     * @returns {$.Deferred}
-     */
-    with_editor: function (fn, snapshot) {
-        var editor = this._current_editor();
-        if (snapshot !== false) { editor.fire('saveSnapshot'); }
-        return $.when(fn(editor)).then(function () {
-            if (snapshot !== false) { editor.fire('saveSnapshot'); }
-            editor.focus();
-        });
-    },
-
-
-    toggle: function (to) {
-        _(this.getChildren()).chain()
-            .filter(function (child) { return child instanceof instance.website.Action })
-            .invoke('toggle', to);
-    },
-    disable: function () {
-        this.toggle(false);
-    },
-
     _current_editor: function () {
         return CKEDITOR.currentInstance;
     },
-    _change_focused_editor: function () {
-        this.toggle(!!CKEDITOR.currentInstance);
-    },
     _config: function () {
         var removed_plugins = [
-                // remove toolbar entirely
-                'toolbar,elementspath,resize',
                 // remove custom context menu
                 'contextmenu,tabletools,liststyle',
                 // magicline captures mousein/mouseout => draggable does not work
@@ -372,6 +202,21 @@ instance.website.RTE = instance.web.Widget.extend({
             // Don't insert paragraphs around content in e.g. <li>
             autoParagraph: false,
             filebrowserImageUploadUrl: "/website/attach",
+            // Support for sharedSpaces in 4.x
+            extraPlugins: 'sharedspace',
+            // Place toolbar in controlled location
+            sharedSpaces: { top: 'oe_rte_toolbar' },
+            toolbar: [
+                {name: 'items', items: [
+                    "Bold", "Italic", "Underline", "Strike", "Subscript",
+                    "Superscript", "TextColor", "BGColor", "RemoveFormat",
+                    "Link", "Unlink", "Blockquote", "BulletedList",
+                    "NumberedList", "Image", "Indent", "Outdent",
+                    "JustifyLeft", "JustifyCenter", "JustifyRight",
+                    "JustifyBlock", "Table", "Font", "FontSize", "Format",
+                    "Styles"
+                ]}
+            ]
         };
     },
     // TODO clean
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index f6c259771ed..80802bd673f 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -55,6 +55,7 @@
                         <title t-raw="title"><t t-esc="res_company.name"/></title>
                         <script type="text/javascript" src="/web/static/lib/jquery/jquery.js"></script>
                         <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/ckeditor/4.2/ckeditor.js"></script>
+                        <script type="text/javascript" src="/website/static/lib/ckeditor.sharedspace/plugin.js"></script>
                         <script type="text/javascript">
                             CKEDITOR.disableAutoInline = true;
                             CKEDITOR.dtd.$editable.li = 1;

From 8f1acfff3b497d127a6b53c34dcc176bbb220eae Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 7 Aug 2013 14:17:46 +0200
Subject: [PATCH 25/27] [ADD] basic stylesSet conf

bzr revid: xmo@openerp.com-20130807121746-10gjzibadyr1kdml
---
 addons/website/static/src/js/website.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index af30b6a640a..ba662288aae 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -191,8 +191,6 @@ instance.website.RTE = instance.web.Widget.extend({
                 'magicline'
         ];
         return {
-            // Don't load ckeditor's style rules
-            stylesSet: [],
             removePlugins: removed_plugins.join(','),
             uiColor: '',
             // Ensure no config file is loaded
@@ -216,7 +214,17 @@ instance.website.RTE = instance.web.Widget.extend({
                     "JustifyBlock", "Table", "Font", "FontSize", "Format",
                     "Styles"
                 ]}
-            ]
+            ],
+            // styles dropdown in toolbar
+            stylesSet: [
+                // emphasis
+                {name: "Muted", element: 'span', attributes: {'class': 'text-muted'}},
+                {name: "Primary", element: 'span', attributes: {'class': 'text-primary'}},
+                {name: "Warning", element: 'span', attributes: {'class': 'text-warning'}},
+                {name: "Danger", element: 'span', attributes: {'class': 'text-danger'}},
+                {name: "Success", element: 'span', attributes: {'class': 'text-success'}},
+                {name: "Info", element: 'span', attributes: {'class': 'text-info'}}
+            ],
         };
     },
     // TODO clean

From 5082758f86e3941a6aafabf74e1ac5f38b88b032 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 7 Aug 2013 14:30:19 +0200
Subject: [PATCH 26/27] [ADD] forgot sharedspace plugin

bzr revid: xmo@openerp.com-20130807123019-7mfe70kdk4wtvjx1
---
 .../static/lib/ckeditor.sharedspace/plugin.js | 124 ++++++++++++++++++
 1 file changed, 124 insertions(+)
 create mode 100644 addons/website/static/lib/ckeditor.sharedspace/plugin.js

diff --git a/addons/website/static/lib/ckeditor.sharedspace/plugin.js b/addons/website/static/lib/ckeditor.sharedspace/plugin.js
new file mode 100644
index 00000000000..ae8ddc79eb4
--- /dev/null
+++ b/addons/website/static/lib/ckeditor.sharedspace/plugin.js
@@ -0,0 +1,124 @@
+/**
+ * @license Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md or http://ckeditor.com/license
+ */
+
+(function() {
+
+	'use strict';
+
+	var containerTpl = CKEDITOR.addTemplate( 'sharedcontainer', '<div' +
+		' id="cke_{name}"' +
+		' class="cke {id} cke_reset_all cke_chrome cke_editor_{name} cke_shared cke_detached cke_{langDir} ' + CKEDITOR.env.cssClass + '"' +
+		' dir="{langDir}"' +
+		' title="' + ( CKEDITOR.env.gecko ? ' ' : '' ) + '"' +
+		' lang="{langCode}"' +
+		' role="presentation"' +
+		'>' +
+			'<div class="cke_inner">' +
+				'<div id="{spaceId}" class="cke_{space}" role="presentation">{content}</div>' +
+			'</div>' +
+		'</div>' );
+
+	CKEDITOR.plugins.add( 'sharedspace', {
+		afterInit: function( editor ) {
+			var spaces = editor.config.sharedSpaces;
+
+			if ( spaces ) {
+				for ( var spaceName in spaces ) {
+					create( editor, spaceName, spaces[ spaceName ] );
+				}
+			}
+		}
+	});
+
+	function create( editor, spaceName, targetId ) {
+		var target = CKEDITOR.document.getById( targetId ),
+			innerHtml, space;
+
+		if ( target ) {
+			// Have other plugins filling the space.
+			innerHtml = editor.fire( 'uiSpace', { space: spaceName, html: '' } ).html;
+
+			if ( innerHtml ) {
+				// Block the uiSpace handling by others (e.g. themed-ui).
+				editor.on( 'uiSpace', function( ev ) {
+					if ( ev.data.space == spaceName )
+						ev.cancel();
+				}, null, null, 1 );  // Hi-priority
+
+				// Inject the space into the target.
+				space = target.append( CKEDITOR.dom.element.createFromHtml( containerTpl.output({
+					id: editor.id,
+					name: editor.name,
+					langDir: editor.lang.dir,
+					langCode: editor.langCode,
+					space: spaceName,
+					spaceId: editor.ui.spaceId( spaceName ),
+					content: innerHtml
+				})));
+
+				// Only the first container starts visible. Others get hidden.
+				if ( target.getCustomData( 'cke_hasshared' ) )
+					space.hide();
+				else
+					target.setCustomData( 'cke_hasshared', 1 );
+
+				// There's no need for the space to be selectable.
+				space.unselectable();
+
+				// Prevent clicking on non-buttons area of the space from blurring editor.
+				space.on( 'mousedown', function( evt ) {
+					evt = evt.data;
+					if ( !evt.getTarget().hasAscendant( 'a', 1 ) )
+						evt.preventDefault();
+				});
+
+				// Register this UI space to the focus manager.
+				editor.focusManager.add( space, 1 );
+
+				// When the editor gets focus, show the space container, hiding others.
+				editor.on( 'focus', function() {
+					for ( var i = 0, sibling, children = target.getChildren(); ( sibling = children.getItem( i ) ); i++ ) {
+						if ( sibling.type == CKEDITOR.NODE_ELEMENT &&
+							!sibling.equals( space ) &&
+							sibling.hasClass( 'cke_shared' ) ) {
+							sibling.hide();
+						}
+					}
+
+					space.show();
+				});
+
+				editor.on( 'destroy', function() {
+					space.remove();
+				});
+			}
+		}
+	}
+})();
+
+/**
+ * Makes it possible to place some of the editor UI blocks, like the toolbar
+ * and the elements path, into any element in the page.
+ *
+ * The elements used to hold the UI blocks can be shared among several editor
+ * instances. In that case, only the blocks of the active editor instance will
+ * display.
+ *
+ *		// Place the toolbar inside the element with ID "someElementId" and the
+ *		// elements path into the element with ID "anotherId".
+ *		config.sharedSpaces = {
+ *			top: 'someElementId',
+ *			bottom: 'anotherId'
+ *		};
+ *
+ *		// Place the toolbar inside the element with ID "someElementId". The
+ *		// elements path will remain attached to the editor UI.
+ *		config.sharedSpaces = {
+ *			top: 'someElementId'
+ *		};
+ *
+ * @cfg {Object} [sharedSpaces]
+ * @member CKEDITOR.config
+ */

From 6e56bac4b0f85d5af98a6cf23db5204ae26f9c02 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 7 Aug 2013 15:01:27 +0200
Subject: [PATCH 27/27] [IMP] Replaced website#get_public_uid by
 get_public_user (returns browse record)

bzr revid: fme@openerp.com-20130807130127-9yd6k1pypyhmo12n
---
 addons/website/website.py                  | 20 +++++++++++---------
 addons/website_mail/controllers/main.py    | 12 ++++++------
 addons/website_mail/views/website_mail.xml |  2 +-
 addons/website_sale/controllers/main.py    |  4 ++--
 4 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/addons/website/website.py b/addons/website/website.py
index ce8ccfccb86..3a01027669c 100644
--- a/addons/website/website.py
+++ b/addons/website/website.py
@@ -10,7 +10,7 @@ from openerp.addons.web.http import request
 def auth_method_public():
     registry = openerp.modules.registry.RegistryManager.get(request.db)
     if not request.session.uid:
-        request.uid = registry['website'].get_public_uid()
+        request.uid = registry['website'].get_public_user().id
     else:
         request.uid = request.session.uid
 http.auth_methods['public'] = auth_method_public
@@ -20,19 +20,21 @@ class website(osv.osv):
     _name = "website" # Avoid website.website convention for conciseness (for new api). Got a special authorization from xmo and rco
     _description = "Website"
 
-    public_uid = None
+    public_user = None
 
-    def get_public_uid(self):
-        if not self.public_uid:
-            self.public_uid = request.registry['ir.model.data'].get_object_reference(request.cr, openerp.SUPERUSER_ID, 'website', 'public_user')[1]
-        return self.public_uid
+    def get_public_user(self):
+        if not self.public_user:
+            ref = request.registry['ir.model.data'].get_object_reference(request.cr, openerp.SUPERUSER_ID, 'website', 'public_user')
+            self.public_user = request.registry[ref[0]].browse(request.cr, openerp.SUPERUSER_ID, ref[1])
+        return self.public_user
 
     def get_rendering_context(self, additional_values=None):
         debug = 'debug' in request.params
-        editable = request.uid != self.get_public_uid()
+        is_public_user = request.uid == self.get_public_user().id
         values = {
             'debug': debug,
-            'editable': editable,
+            'is_public_user': is_public_user,
+            'editable': not is_public_user,
             'request': request,
             'registry': request.registry,
             'cr': request.cr,
@@ -40,7 +42,7 @@ class website(osv.osv):
             'host_url': request.httprequest.host_url,
             'res_company': request.registry['res.company'].browse(request.cr, openerp.SUPERUSER_ID, 1),
         }
-        if editable:
+        if values['editable']:
             values.update({
                 'script': "\n".join(['<script type="text/javascript" src="%s"></script>' % i for i in main.manifest_list('js', db=request.db, debug=debug)]),
                 'css': "\n".join('<link rel="stylesheet" href="%s">' % i for i in main.manifest_list('css', db=request.db, debug=debug))
diff --git a/addons/website_mail/controllers/main.py b/addons/website_mail/controllers/main.py
index f3f99bb9aed..1494281fd4f 100644
--- a/addons/website_mail/controllers/main.py
+++ b/addons/website_mail/controllers/main.py
@@ -31,7 +31,7 @@ class website_mail(http.Controller):
             'website': website,
         })
 
-        if request.uid != website.get_public_uid() and mail_group_id:
+        if request.uid != website.get_public_user().id and mail_group_id:
             message_follower_ids = group_obj.read(request.cr, request.uid, [mail_group_id], ['message_follower_ids'])[0]['message_follower_ids']
             parent_id = user_obj.browse(request.cr, SUPERUSER_ID, request.uid).partner_id.id
             values['subscribe'] = parent_id in message_follower_ids
@@ -84,7 +84,7 @@ class website_mail(http.Controller):
         url = request.httprequest.host_url
         if post.get('body'):
             request.session.body = post.get('body')
-            if request.uid == website.get_public_uid():
+            if request.uid == website.get_public_user().id:
                 return '%s/admin#action=redirect&url=%s/blog/%s/%s/post' % (url, url, mail_group_id, blog_id)
 
         if 'body' in request.session and request.session.body:
@@ -122,8 +122,8 @@ class website_mail(http.Controller):
         group_obj = request.registry['mail.group']
         user_obj = request.registry['res.users']
 
-        if mail_group_id and 'subscribe' in post and (post.get('email') or request.uid != website.get_public_uid()):
-            if request.uid == website.get_public_uid():
+        if mail_group_id and 'subscribe' in post and (post.get('email') or request.uid != website.get_public_user().id):
+            if request.uid == website.get_public_user().id:
                 partner_ids = partner_obj.search(request.cr, SUPERUSER_ID, [("email", "=", post.get('email'))])
                 if not partner_ids:
                     partner_ids = [partner_obj.create(request.cr, SUPERUSER_ID, {"email": post.get('email'), "name": "Subscribe: %s" % post.get('email')})]
@@ -141,8 +141,8 @@ class website_mail(http.Controller):
         group_obj = request.registry['mail.group']
         user_obj = request.registry['res.users']
 
-        if mail_group_id and 'unsubscribe' in post and (post.get('email') or request.uid != website.get_public_uid()):
-            if request.uid == website.get_public_uid():
+        if mail_group_id and 'unsubscribe' in post and (post.get('email') or request.uid != website.get_public_user().id):
+            if request.uid == website.get_public_user().id:
                 partner_ids = partner_obj.search(request.cr, SUPERUSER_ID, [("email", "=", post.get('email'))])
             else:
                 partner_ids = [user_obj.browse(request.cr, request.uid, request.uid).partner_id.id]
diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml
index 2d2fd2d7e71..eb45ce582a7 100644
--- a/addons/website_mail/views/website_mail.xml
+++ b/addons/website_mail/views/website_mail.xml
@@ -64,7 +64,7 @@
                                 </ul>
                             </li>
                             <form action="./subscribe" method="POST" class="form-inline" t-if="not subscribe">
-                                <input placeholder="Email Address" type="email" name="email" class="input-medium" t-if="request.uid == website.get_public_uid()"/>
+                                <input placeholder="Email Address" type="email" name="email" class="input-medium" t-if="is_public_user"/>
                                 <button type="submit" class="btn btn-primary" name="subscribe">Subscribe</button>
                             </form>
                             <form action="./unsubscribe" method="POST" class="form-inline" t-if="subscribe">
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 96d0f079f52..71a36d97ba5 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -261,7 +261,7 @@ class Ecommerce(http.Controller):
         country_state_obj = request.registry.get('res.country.state')
         payment_obj = request.registry.get('portal.payment.acquirer')
 
-        if request.uid != website.get_public_uid():
+        if request.uid != website.get_public_user().id:
             values['partner'] = user_obj.browse(request.cr, request.uid, request.uid).partner_id
             shipping_ids = partner_obj.search(request.cr, request.uid, [("parent_id", "=", values['partner'].id), ('type', "=", 'delivery')])
             values['shipping'] = None
@@ -325,7 +325,7 @@ class Ecommerce(http.Controller):
             'country_id': post['country_id'],
             'state_id': post['state_id'],
         }
-        if request.uid != website.get_public_uid():
+        if request.uid != website.get_public_user().id:
             partner_id = user_obj.browse(request.cr, request.uid, request.uid).partner_id.id
             partner_obj.write(request.cr, request.uid, [partner_id], partner_value)
         else: