From 660e8798abdd73eb56f1b571654edb39707c24c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Mon, 19 Aug 2013 11:25:07 +0200
Subject: [PATCH 01/24] [WIP] website: Cleaning up the snippet editor

bzr revid: fva@openerp.com-20130819092507-s3d9wl1ph6z43thh
---
 addons/website/static/src/css/editor.css  |  28 ++++-
 addons/website/static/src/css/editor.sass |  26 +++++
 addons/website/static/src/js/website.js   |  92 +++++++++++------
 addons/website/static/src/xml/website.xml |   7 ++
 addons/website/views/views.xml            | 119 +++-------------------
 5 files changed, 135 insertions(+), 137 deletions(-)

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 246d62b62be..94552c801c2 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -1,4 +1,7 @@
-@charset "utf-8";
+.oe_hidden {
+  display: none !important;
+}
+
 .oe_website_editorbar {
   position: fixed;
   top: 0;
@@ -54,3 +57,26 @@
   z-index: 1;
   display: none;
 }
+
+.oe_snippets {
+  position: fixed;
+  left: 0px;
+  right: 0px;
+  bottom: 0px;
+  height: 120px;
+  background: black;
+}
+.oe_snippets .oe_snippet {
+  display: inline;
+}
+.oe_snippets .oe_snippet .oe_snippet_thumbnail {
+  display: inline-block;
+  background: red;
+  width: 100px;
+  height: 100px;
+  border-radius: 3px;
+  margin: 10px;
+}
+.oe_snippets .oe_snippet .oe_snippet_body {
+  display: none;
+}
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 24a549f1d05..565e7571dca 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -1,5 +1,8 @@
 @charset "utf-8"
 
+.oe_hidden
+    display: none !important
+
 .oe_website_editorbar
     position: fixed
     top: 0
@@ -47,3 +50,26 @@
     white-space: nowrap
     z-index: 1
     display: none
+
+.oe_snippets
+    position: fixed
+    left: 0px
+    right: 0px
+    bottom: 0px
+    height: 120px
+    background: black
+
+    .oe_snippet
+        display: inline
+        .oe_snippet_thumbnail
+            display: inline-block
+            background: red
+            width: 100px
+            height: 100px
+            border-radius: 3px
+            margin: 10px
+
+        .oe_snippet_body
+            display: none
+
+
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index c83cc5cc1be..8eaf0c42e0c 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -71,11 +71,12 @@ instance.website.EditorBar = instance.web.Widget.extend({
             snippet: this.$('button[data-action=snippet]'),
         };
 
-        self.snippet_start();
-
         this.rte = new instance.website.RTE(this);
         this.rte.on('change', this, this.proxy('rte_changed'));
 
+        this.snippets = new instance.website.Snippets();
+        this.snippets.appendTo($("body"));
+
         return $.when(
             this._super.apply(this, arguments),
             this.rte.insertBefore(this.$buttons.snippet.parent())
@@ -161,36 +162,8 @@ instance.website.EditorBar = instance.web.Widget.extend({
     cancel: function () {
         window.location.reload();
     },
-    setup_droppable: function () {
-        var self = this;
-        $('.oe_snippet_drop').remove();
-        var droppable = '<div class="oe_snippet_drop"></div>';
-        var $zone = $(':not(.oe_snippet) > .container');
-        $zone.after(droppable);//.after(droppable);
-
-        $(".oe_snippet_drop").droppable({
-            hoverClass: 'oe_accepting',
-            drop: function( event, ui ) {
-                console.log(event, ui, "DROP");
-
-                $(event.target).replaceWith($(ui.draggable).html());
-                $('.oe_selected').remove();
-                $('.oe_snippet_drop').remove();
-            }
-        });
-    },
-    snippet_start: function () {
-        var self = this;
-        $('.oe_snippet').draggable().click(function(ev) {
-            self.setup_droppable();
-            $(".oe_snippet_drop").show();
-            $('.oe_selected').removeClass('oe_selected');
-            $(ev.currentTarget).addClass('oe_selected');
-        });
-
-    },
     snippet: function (ev) {
-        $('.oe_snippet_editor').toggle();
+        this.snippets.toggle();
     },
 });
 
@@ -297,6 +270,63 @@ instance.website.RTE = instance.web.Widget.extend({
     }
 });
 
+instance.website.Snippets = instance.web.Widget.extend({
+    template: 'website.snippets',
+    init: function () {
+        this._super.apply(this, arguments);
+    },
+    start: function() {
+        var self = this;
+
+        $.ajax({
+            type: "GET",
+            url:  "/page/website.snippets",
+            dataType: "text",
+            success: function(text){
+                self.$el.html(text);
+            },
+        });
+
+        // load snippets
+        // /page/website.snippets
+    },
+    setup_droppable: function () {
+        var self = this;
+        $('.oe_snippet_drop').remove();
+        var droppable = '<div class="oe_snippet_drop"></div>';
+        var $zone = $(':not(.oe_snippet) > .container');
+        $zone.after(droppable);//.after(droppable);
+
+        $(".oe_snippet_drop").droppable({
+            hoverClass: 'oe_accepting',
+            drop: function( event, ui ) {
+                console.log(event, ui, "DROP");
+
+                $(event.target).replaceWith($(ui.draggable).html());
+                $('.oe_selected').remove();
+                $('.oe_snippet_drop').remove();
+            }
+        });
+    },
+    toggle: function(){
+        if(this.$el.hasClass('oe_hidden')){
+            this.$el.removeClass('oe_hidden');
+        }else{
+            this.$el.addClass('oe_hidden');
+        }
+    },
+    snippet_start: function () {
+        var self = this;
+        $('.oe_snippet').draggable().click(function(ev) {
+            self.setup_droppable();
+            $(".oe_snippet_drop").show();
+            $('.oe_selected').removeClass('oe_selected');
+            $(ev.currentTarget).addClass('oe_selected');
+        });
+
+    },
+});
+
 $(function(){
 
     function make_static(){
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index 9f11ff40bca..3e2e5db538b 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -57,4 +57,11 @@
         </div>
     </div>
 </t>
+
+    <t t-name="website.snippets">
+        <div class='oe_snippets oe_hidden'>
+            sadfasdfsadf
+        </div>
+    </t>
+
 </templates>
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index e081585b682..db0cd25eec6 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -6,12 +6,12 @@
         <!--
             Files used in the generic theme, mostly bootstrap and a few OpenERP tags
         -->
-        <template id="theme" name="Theme">
+        <template id="website.theme" name="Theme">
             <link id="bootstrap_css" rel='stylesheet' href='/website/static/lib/bootstrap/css/bootstrap.css' t-ignore="true"/>
             <link id="website_css" rel='stylesheet' href='/website/static/src/css/website.css' t-ignore="true"/>
         </template>
 
-        <template id="theme_flatly" name="Flat Theme" inherit_option_id="website.theme">
+        <template id="website.theme_flatly" name="Flat Theme" inherit_option_id="website.theme">
             <xpath expr="//link[@id='bootstrap_css']" position="replace">
                 <link rel='stylesheet' href='/website/static/lib/bootstrap/css/bootstrap-flatly.css' t-ignore="true"/>
                 <link rel='stylesheet' href='/website/static/src/css/website-flatly.css' t-ignore="true"/>
@@ -29,8 +29,7 @@
                         <script type="text/javascript">
                             CKEDITOR.disableAutoInline = true;
                             // EDIT ALL THE THINGS
-                            CKEDITOR.dtd.$editable = $.extend(
-                                {}, CKEDITOR.dtd.$block, CKEDITOR.dtd.$inline);
+                            CKEDITOR.dtd.$editable = $.extend( {}, CKEDITOR.dtd.$block, CKEDITOR.dtd.$inline);
                         </script>
 
                         <t t-if="editable">
@@ -115,107 +114,6 @@
                             </div>
                         </footer>
 
-                        <div class='oe_snippet_editor' style="display: none;">
-                            <div class='oe_snippet_list'>
-
-                            <div class='oe_snippet' name='Picture' data-selector='[class*="span"]'>
-                                <div class="span6">
-                                    <img class="img-rounded" src="/website/static/src/img/volcano.jpg"/>
-                                </div>
-                            </div>
-
-                            <div class='oe_snippet' name='Introduction' data-selector=".container">
-                                <section class="container">
-                                    <div class="row mt32 text-center">
-                                        <h2>Wildlife Analysis</h2>
-                                        <h3>In a beautiful place out in the country</h3>
-                                    </div>
-                                    <div class="row mt32">
-                                        <div class="span6">
-                                            <img class='img-rounded' src="/website/static/src/img/china.jpg"/>
-                                        </div>
-                                        <div class="span6">
-                                            <p class='mt16'>
-                                                Lorem ipsum dolor sit amet, consectetur adipisicing elit,
-                                                sed do eiusmod tempor incididunt ut labore et dolore magna 
-                                                aliqua. Ut enim ad minim veniam, quis nostrud exercitation 
-                                                ullamco laboris nisi ut aliquip ex ea commodo consequat. 
-                                            </p>
-                                            <p>
-                                                Duis aute irure dolor in reprehenderit in voluptate velit 
-                                                esse cillum dolore eu fugiat nulla pariatur. Excepteur sint 
-                                                occaecat cupidatat non proident, sunt in culpa qui officia 
-                                                deserunt mollit anim id est laborum
-                                            </p>
-                                        </div>
-                                    </div>
-                                </section>
-                            </div>
-
-                            <div class='oe_snippet' name='Three Columns' data-selector=".container">
-                                <section class="container">
-                                    <div class="row mt32">
-                                        <div class="span4">
-                                            <h4>Niagara</h4>
-                                            <p>
-                                                Lorem ipsum dolor sit amet, consectetur adipisicing elit,
-                                                sed do eiusmod tempor incididunt ut labore et dolore magna 
-                                                aliqua. Ut enim ad minim veniam, quis nostrud exercitation 
-                                                ullamco laboris nisi ut aliquip ex ea commodo consequat. 
-                                            </p>
-                                        </div>
-                                        <div class="span4">
-                                            <h4>Whitewater</h4>
-                                            <p>
-                                                Duis aute irure dolor in reprehenderit in voluptate velit 
-                                                esse cillum dolore eu fugiat nulla pariatur. Excepteur sint 
-                                                occaecat cupidatat non proident, sunt in culpa qui officia 
-                                                deserunt mollit anim id est laborum
-                                            </p>
-                                        </div>
-                                        <div class="span4">
-                                            <h4>Red Moss</h4>
-                                            <p>
-                                                Sed ut perspiciatis unde omnis iste natus error sit voluptatem
-                                                accusantium doloremque laudantium, totam rem aperiam, eaque ipsa 
-                                                quae ab illo inventore veritatis et quasi architecto beatae vitae
-                                                dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas 
-                                            </p>
-                                        </div>
-                                    </div>
-                                </section>
-                            </div>
-
-                            <div class='oe_snippet' name='Introduction' data-selector=".container">
-                                <section class="container">
-                                    <div class="row mt32">
-                                        <div class="span6">
-                                            <h2>Wildlife Analysis</h2>
-                                            <h3>In a beautiful place out in the country</h3>
-                                            <p class='mt16'>
-                                                Lorem ipsum dolor sit amet, consectetur adipisicing elit,
-                                                sed do eiusmod tempor incididunt ut labore et dolore magna 
-                                                aliqua. Ut enim ad minim veniam, quis nostrud exercitation 
-                                                ullamco laboris nisi ut aliquip ex ea commodo consequat. 
-                                            </p>
-                                            <p>
-                                                Duis aute irure dolor in reprehenderit in voluptate velit 
-                                                esse cillum dolore eu fugiat nulla pariatur. Excepteur sint 
-                                                occaecat cupidatat non proident, sunt in culpa qui officia 
-                                                deserunt mollit anim id est laborum
-                                            </p>
-                                        </div>
-                                        <div class="span6">
-                                            <img class='img-rounded' src="/website/static/src/img/greenfields.jpg"/>
-                                        </div>
-                                    </div>
-                                </section>
-                            </div>
-
-                            <div class='oe_snippet oe_new' name='New Snippet'> 
-                            </div>
-                            </div>
-                        </div>
                     </body>
                 </html>
         </template>
@@ -463,5 +361,16 @@
             </a>
         </template>
 
+        <template id="snippets">
+            <div class='oe_snippet' name='FooBar'>
+                <div class='oe_snippet_thumbnail'>
+                    foobar
+                </div>
+                <div class='oe_snippet_body' data-selector-siblings='[class*="span"]' data-selector-childs=''>
+                    FOOBAR
+                </div>
+            </div>
+        </template>
+
      </data>
 </openerp>

From 571d9044d6999929fffc152d8974cd4de226e644 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 19 Aug 2013 12:41:44 +0200
Subject: [PATCH 02/24] [IMP] website_sale: add suggested products

bzr revid: chm@openerp.com-20130819104144-81w0c3cicdqdf9ix
---
 addons/website_sale/controllers/main.py    |  15 ++-
 addons/website_sale/views/website_sale.xml | 110 +++++++++++++++++----
 addons/website_sale/website_sale.py        |   2 +
 3 files changed, 109 insertions(+), 18 deletions(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 67833560fc6..f58c23fb4da 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -4,6 +4,7 @@ from openerp import SUPERUSER_ID
 from openerp.osv import osv
 from openerp.addons.web import http
 from openerp.addons.web.http import request
+import random
 import werkzeug
 
 def get_order(order_id=None):
@@ -105,15 +106,27 @@ class Ecommerce(http.Controller):
     def mycart(self, **post):
         order = get_current_order()
         website = request.registry['website']
+        prod_obj = request.registry.get('product.product')
 
         if post.get('code'):
             pricelist_obj = request.registry.get('product.pricelist')
             pricelist_ids = pricelist_obj.search(request.cr, SUPERUSER_ID, [('code', '=', post.get('code'))])
             if pricelist_ids:
                 order.write({'pricelist_id': pricelist_ids[0]})
-        
+
+        suggested_ids = []
+        for line in order.order_line:
+            suggested_ids += [p.id for p in line.product_id.suggested_product_ids for line in order.order_line]
+        suggested_ids = prod_obj.search(request.cr, request.uid, [('id', 'in', suggested_ids)])
+        # select 3 random products
+        suggested_products = []
+        while len(suggested_products) < 3 and suggested_ids:
+            index = random.randrange(0, len(suggested_ids))
+            suggested_products.append(suggested_ids.pop(index))
+
         values = website.get_rendering_context({
             'categories': self.get_categories(),
+            'suggested_products': prod_obj.browse(request.cr, request.uid, suggested_products),
         })
         return website.render("website_sale.mycart", values)
 
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 9f310ce180e..648f6ce4d20 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -38,6 +38,7 @@
             <group name="sale" position="before">
                 <group name="pos" string="Website">
                     <field name="website_published"/>
+                    <field name="suggested_product_ids" widget="many2many_tags"/>
                 </group>
             </group>
         </field>
@@ -169,19 +170,24 @@
 
     <!-- Page Shop my cart --> 
 
-    <template id="mycart">
+    <template id="mycart" name="My cart">
         <t t-call="website_sale.layout">
             <t t-set="title">My cart</t>
             <t t-set="shop_content">
                 <div class="span8 oe_mycart">
                     <h2>My Shopping Cart</h2>
-                    <table class='table table-hover'>
+                    <table class='table table-hover' id="mycart_products">
+                        <colgroup>
+                            <col width="80"/>
+                            <col/>
+                            <col width="80"/>
+                            <col width="160"/>
+                        </colgroup>
                         <thead>
                             <tr>
-                                <th width="80">Product</th>
-                                <th></th>
-                                <th width="80">Price</th>
-                                <th width="150">Quantity</th>
+                                <th colspan="2">Product</th>
+                                <th>Price</th>
+                                <th>Quantity</th>
                             </tr>
                         </thead>
                         <tbody t-if="not order.order_line">
@@ -201,7 +207,7 @@
                                        <span t-field="line.product_id.list_price"></span>€
                                     </td>
                                     <td>
-                                        <div class="mb8 mt8">
+                                        <div class="mb8 mt8 pull-right">
                                             <input type="text" class="input-mini" t-att-data-id="line.product_id.id" t-att-value="line.product_uom_qty"/>
                                             <a t-attf-href="./remove_cart/#{ line.product_id.id }/" class="btn mb8 btn-small btn-inverse">-</a>
                                             <a t-attf-href="./add_cart/#{ line.product_id.id }/" class="btn mb8 btn-small btn-success">+</a>
@@ -210,21 +216,91 @@
                                 </tr>
                             </t>
                         </tbody>
-                        <tfoot>
-                            <tr> <td colspan="3">Subtotal </td>      <td><t t-esc="order.amount_untaxed"/> €</td></tr>
-                            <tr> <td colspan="3">Taxes </td>         <td><t t-esc="order.amount_tax"/> €</td></tr>
-                            <tr> <td colspan="3"><h4>Total</h4></td> <td><h4><t t-esc="order.amount_total"/> €</h4></td></tr>
-                        </tfoot>
                     </table>
-                    <form t-if="order.order_line" class="well form-search" action="/shop/mycart/" method="post">
-                        <input name="code" class='input' type="text" placeholder="Reduction Code..."/>
-                        <button class="btn">Apply Code</button>
-                    </form>
-                    <a t-if="order.order_line" href="/shop/checkout/"><button class="btn btn-success">Proceed To Payment</button></a>
+
+                    <table class='table table-hover table-condensed' id="mycart_total">
+                        <colgroup>
+                            <col width="80"/>
+                            <col/>
+                            <col width="80"/>
+                            <col width="160"/>
+                        </colgroup>
+                        <thead>
+                            <tr> <th colspan="3">Subtotal </th>      <th><t t-esc="order.amount_untaxed"/> €</th></tr>
+                            <tr> <th colspan="3">Taxes </th>         <th><t t-esc="order.amount_tax"/> €</th></tr>
+                            <tr> <th colspan="3"><h4>Total</h4></th> <th><h4><t t-esc="order.amount_total"/> €</h4></th></tr>
+                            <tr>
+                                <th colspan="4"><a t-if="order.order_line" href="/shop/checkout/" class="pull-right btn btn-success">Proceed To Payment</a></th>
+                            </tr>
+                        </thead>
+                    </table>
+
                 </div>
             </t>
         </t>
     </template>
+    <template id="suggested_products_list" inherit_id="website_sale.mycart" inherit_option_id="website_sale.mycart" name="Suggested Products in list view">
+        <xpath expr="//table[@id='mycart_products']" position="after">
+            <table t-if="suggested_products" class='table table-hover table-condensed'>
+                <colgroup>
+                    <col/>
+                    <col width="80"/>
+                    <col width="160"/>
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Suggested products</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <t t-foreach="suggested_products" t-as="product_id">
+                        <tr>
+                            <td>
+                                <a t-attf-href="/shop/product/#{ product_id.id }/"><span t-field="product_id.name"/></a><br/>
+                                <small t-field="product_id.description_sale"/>
+                            </td>
+                            <td>
+                               <span t-field="product_id.list_price"></span>€
+                            </td>
+                            <td>
+                                <div class="pull-right">
+                                    <a t-attf-href="./add_cart/#{ product_id.id }/" class="btn btn-small btn-success">+</a>
+                                </div>
+                            </td>
+                        </tr>
+                    </t>
+                </tbody>
+            </table>
+        </xpath>
+    </template>
+    <template id="suggested_products_cell" inherit_option_id="website_sale.mycart" name="Suggested Products in card view">
+        <xpath expr="//table[@id='mycart_products']" position="after">
+            <div class="mt16 mb32" t-if="suggested_products">
+                <h4>Suggested products</h4>
+                <div class='row mt16'>
+                <t t-foreach="suggested_products" t-as="product">
+                    <div class='span2 thumbnail'>
+                        <a t-attf-href="/shop/product/#{ product.id }/">
+                            <div class='mt16 text-center'>
+                                <img t-att-src="product.img('image_small')"/>
+                                <h5 t-field='product.name'></h5>
+                            </div>
+                        </a>
+                    </div>
+                </t>
+                </div>
+            </div>
+        </xpath>
+    </template>
+    <template id="reduction_code" inherit_option_id="website_sale.mycart" name="Reduction Code">
+        <xpath expr="//table[@id='mycart_total']" position="after">
+            <form t-if="order.order_line" class="well form-search" action="/shop/mycart/" method="post">
+                <input name="code" class='input' type="text" placeholder="Reduction Code..."/>
+                <button class="btn">Apply Code</button>
+            </form>
+        </xpath>
+    </template>
+
 
     <!-- Page confirm my cart -->
 
diff --git a/addons/website_sale/website_sale.py b/addons/website_sale/website_sale.py
index b15dc29db3e..3a39304adcc 100644
--- a/addons/website_sale/website_sale.py
+++ b/addons/website_sale/website_sale.py
@@ -33,6 +33,8 @@ class product_product(osv.osv):
     _columns = {
         'website_published': fields.boolean('Available in the website'),
         'description_website': fields.html('Description for the website'),
+        'suggested_product_id': fields.many2one('product.product', 'Suggested For Product'),
+        'suggested_product_ids': fields.one2many('product.product', 'suggested_product_id', 'Suggested Products'),
     }
 
     def recommended_products(self, cr, uid, ids, context=None):

From 55b1378e7784722b62c34d580cb5d4f512fea325 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 19 Aug 2013 15:19:29 +0200
Subject: [PATCH 03/24] [IMP] website_sale: add product variants

bzr revid: chm@openerp.com-20130819131929-x75ib5y6dcu4bcu7
---
 addons/product/product.py                  |  1 +
 addons/website_sale/controllers/main.py    | 16 +++++++++++++---
 addons/website_sale/views/website_sale.xml | 16 +++++++++++++---
 addons/website_sale/website_sale.py        |  4 ++--
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index 6e1128985aa..c0a007789fd 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -328,6 +328,7 @@ class product_template(osv.osv):
         'mes_type': fields.selection((('fixed', 'Fixed'), ('variable', 'Variable')), 'Measure Type'),
         'seller_ids': fields.one2many('product.supplierinfo', 'product_id', 'Supplier'),
         'company_id': fields.many2one('res.company', 'Company', select=1),
+        'product_ids': fields.one2many('product.product', 'product_tmpl_id', 'Product Variants'),
     }
 
     def _get_uom_id(self, cr, uid, *args):
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index f58c23fb4da..4854da64aa5 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -77,10 +77,18 @@ class Ecommerce(http.Controller):
 
         product_ids = product_obj.search(request.cr, request.uid, domain, limit=step, offset=pager['offset'])
 
+        products = product_obj.browse(request.cr, request.uid, product_ids)
+        tmpl_ids = []
+        product_tmpl_ids = []
+        for product in products:
+            if product.product_tmpl_id.id not in tmpl_ids:
+                tmpl_ids.append(product.product_tmpl_id.id)
+                product_tmpl_ids.append(product)
+
         values = website.get_rendering_context({
             'categories': self.get_categories(),
             'current_category': cat_id,
-            'products': product_obj.browse(request.cr, request.uid, product_ids),
+            'products': product_tmpl_ids,
             'search': post.get("search"),
             'pager': pager,
         })
@@ -96,9 +104,11 @@ class Ecommerce(http.Controller):
 
         line = [line for line in order.order_line if line.product_id.id == product_id]
 
+        product = product_obj.browse(request.cr, request.uid, product_id)
         values = website.get_rendering_context({
             'categories': self.get_categories(),
-            'product': product_obj.browse(request.cr, request.uid, product_id),
+            'product': product,
+            'product_variants': product.product_tmpl_id.product_ids,
         })
         return website.render("website_sale.product", values)
 
@@ -174,7 +184,7 @@ class Ecommerce(http.Controller):
 
         return quantity
 
-    @http.route(['/shop/add_cart/<product_id>/', '/shop/<path:path>/add_cart/<product_id>/'], type='http', auth="public")
+    @http.route(['/shop/<path:path>/add_cart/', '/shop/add_cart/', '/shop/add_cart/<product_id>/', '/shop/<path:path>/add_cart/<product_id>/'], type='http', auth="public")
     def add_cart(self, path=None, product_id=0, remove=None):
         self.add_product_to_cart(product_id, number=(remove and -1 or 1))
         if path:
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 648f6ce4d20..b03c425c22c 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -140,7 +140,15 @@
                 <div id="product_detail">
                     <t t-call="website.publish"><t t-set="object" t-value="product"/></t>
                     <h2 t-field="product.name"></h2>
-                    <a t-attf-href="./add_cart/#{ product.id }/" class="btn btn-small btn-success pull-right">Add to cart</a>
+                    <a t-if="not product_variants" t-attf-href="/shop/add_cart/#{ product.id }/" class="btn btn-small btn-success pull-right">Add to cart</a>
+                    <form t-if="product_variants" action="/shop/add_cart/" class="pull-right">
+                        <select name="product_id">
+                            <t t-foreach="product_variants" t-as="product">
+                            <option t-att-value="product.id"><t t-esc="product.variants"/></option>
+                            </t>
+                        </select><br/>
+                        <button class="btn btn-small btn-success">Add to cart</button>
+                    </form>
                     <img class="media-object" t-att-src="product.img('image')"/>
                     <div t-field="product.description_website"></div>
                     <div><t t-field="product.list_price" />€</div>
@@ -200,7 +208,9 @@
                                         <a t-attf-href="/shop/product/#{ line.product_id.id }/"><img class="img-rounded" t-att-src="line.product_id.img('image_small')"/></a>
                                     </td>
                                     <td>
-                                        <a t-attf-href="/shop/product/#{ line.product_id.id }/"><span t-field="line.product_id.name"/></a><br/>
+                                        <a t-attf-href="/shop/product/#{ line.product_id.id }/">
+                                            <span t-field="line.product_id.name"/> <t t-if="line.product_id.variants">(<small t-field="line.product_id.variants"/>)</t>
+                                        </a><br/>
                                         <small t-field="line.product_id.description_sale"/>
                                     </td>
                                     <td>
@@ -325,7 +335,7 @@
                             <tbody t-if="order.order_line">
                                 <t t-foreach="order.order_line" t-as="line">
                                     <tr>
-                                        <td><t t-esc="line.name"/></td>
+                                        <td><t t-esc="line.name"/> <t t-if="line.product_id.variants">(<small t-field="line.product_id.variants"/>)</t></td>
                                         <td><t t-esc="line.product_uom_qty"/></td>
                                         <td><t t-esc="line.product_id.list_price"/>€</td>
                                     </tr>
diff --git a/addons/website_sale/website_sale.py b/addons/website_sale/website_sale.py
index 3a39304adcc..e647dab38d7 100644
--- a/addons/website_sale/website_sale.py
+++ b/addons/website_sale/website_sale.py
@@ -49,14 +49,14 @@ class product_product(osv.osv):
             AND         sol.product_id not in (%s)
             GROUP BY    sol.product_id
             ORDER BY    COUNT(sol.order_id) DESC
-            LIMIT 8
+            LIMIT 10
         """
         cr.execute(query, (id, id))
         for p in cr.fetchall():
             product_ids.append(p[0])
 
         # search to apply access rules
-        product_ids = self.search(cr, uid, [("id", "in", product_ids)])
+        product_ids = self.search(cr, uid, [("id", "in", product_ids)], limit=3)
         return self.browse(cr, uid, product_ids)
 
     def img(self, cr, uid, ids, field='image_small', context=None):

From 2fc9a37b130e99969dcf1648491e763bec473a24 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 19 Aug 2013 16:28:12 +0200
Subject: [PATCH 04/24] [IMP] add new module website_project

bzr revid: chm@openerp.com-20130819142812-vvb9e5s2gzg94hwz
---
 addons/website/views/views.xml                |  2 +-
 addons/website/website.py                     |  6 ++--
 addons/website_project/__init__.py            |  1 +
 addons/website_project/__openerp__.py         | 18 +++++++++++
 .../website_project/controllers/__init__.py   |  1 +
 addons/website_project/controllers/main.py    | 16 ++++++++++
 .../website_project/views/website_project.xml | 32 +++++++++++++++++++
 7 files changed, 72 insertions(+), 4 deletions(-)
 create mode 100644 addons/website_project/__init__.py
 create mode 100644 addons/website_project/__openerp__.py
 create mode 100644 addons/website_project/controllers/__init__.py
 create mode 100644 addons/website_project/controllers/main.py
 create mode 100644 addons/website_project/views/website_project.xml

diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index 7c167f49e94..7b8d48c166b 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -348,7 +348,7 @@
 
         <template id="404">
                 <t t-call="website.layout">
-                    <div class="container" t-if="editable">
+                    <div class="container" t-if="editable and path">
                         <div class="well mt32">
                             <p>
                                 This page does not exists, but you can create
diff --git a/addons/website/website.py b/addons/website/website.py
index f6976d1fff0..aa446d7a1f8 100644
--- a/addons/website/website.py
+++ b/addons/website/website.py
@@ -78,9 +78,9 @@ class website(osv.osv):
             logger.error(err)
             values['error'] = err[1]
             return self.render('website.401', values)
-        except ValueError:
-            logger.error("Website Rendering Error.\n\n%s" % (traceback.format_exc()))
-            return self.render('website.404', values)
+        # except ValueError:
+        #     logger.error("Website Rendering Error.\n\n%s" % (traceback.format_exc()))
+        #     return self.render('website.404', values)
         except Exception:
             logger.error("Website Rendering Error.\n\n%s" % (traceback.format_exc()))
             if values['editable']:
diff --git a/addons/website_project/__init__.py b/addons/website_project/__init__.py
new file mode 100644
index 00000000000..355939a4922
--- /dev/null
+++ b/addons/website_project/__init__.py
@@ -0,0 +1 @@
+import controllers
\ No newline at end of file
diff --git a/addons/website_project/__openerp__.py b/addons/website_project/__openerp__.py
new file mode 100644
index 00000000000..62f83023b1f
--- /dev/null
+++ b/addons/website_project/__openerp__.py
@@ -0,0 +1,18 @@
+{
+'name': 'Public Project',
+    'category': 'Website',
+    'summary': 'Publish Your Public Projects',
+    'version': '1.0',
+    'description': """
+OpenERP Blog
+============
+
+        """,
+    'author': 'OpenERP SA',
+    'depends': ['website', 'project'],
+    'data': [
+        'views/website_project.xml',
+    ],
+    'qweb': ['static/src/xml/*.xml'],
+    'installable': True,
+}
diff --git a/addons/website_project/controllers/__init__.py b/addons/website_project/controllers/__init__.py
new file mode 100644
index 00000000000..8ee9bae18d9
--- /dev/null
+++ b/addons/website_project/controllers/__init__.py
@@ -0,0 +1 @@
+import main
diff --git a/addons/website_project/controllers/main.py b/addons/website_project/controllers/main.py
new file mode 100644
index 00000000000..d79bd786a3f
--- /dev/null
+++ b/addons/website_project/controllers/main.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+
+from openerp.addons.web import http
+from openerp.addons.web.http import request
+
+class website_project(http.Controller):
+
+    @http.route(['/projects/'], type='http', auth="public")
+    def blog(self, **post):
+        website = request.registry['website']
+        project_obj = request.registry['project.project']
+        project_ids = project_obj.search(request.cr, request.uid, [('privacy_visibility', "=", "public")])
+        values = website.get_rendering_context({
+            'project_ids': project_obj.browse(request.cr, request.uid, project_ids)
+        })
+        return website.render("website_project.index", values)
diff --git a/addons/website_project/views/website_project.xml b/addons/website_project/views/website_project.xml
new file mode 100644
index 00000000000..1817080b566
--- /dev/null
+++ b/addons/website_project/views/website_project.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+
+    <!-- Layout add nav and footer -->
+
+    <template id="footer_custom" inherit_id="website.layout" name="Custom Footer">
+        <xpath expr="//body/header//ul[@id='top_menu']/li[last()]" position="before">
+            <li><a href="/projects/">Projects</a></li>
+        </xpath>
+    </template>
+
+    <!-- Page --> 
+
+    <template id="index" name="Projects">
+        <t t-call="website.layout">
+            <t t-set="title">Blog</t>
+            <div class="container">
+                <div t-foreach="project_ids" t-as="project_id">
+                    <h4 t-field="project_id.name"/>
+                    <div t-foreach="project_id.tasks" t-as="task">
+                        <a t-attf-href="/admin#view_type=form&amp;model=project.task&amp;id=#{task.id}"><span t-field="task.name"/></a>
+                    </div>
+                </div>
+            </div>
+        </t>
+    </template>
+
+
+ </data>
+</openerp>

From 79851020064d0527df300a8d098f0b4e29751d44 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 19 Aug 2013 16:34:23 +0200
Subject: [PATCH 05/24] [IMP] add new module website_contract

bzr revid: chm@openerp.com-20130819143423-gjg6b11x41k3crse
---
 addons/website_contract/__init__.py           |  1 +
 addons/website_contract/__openerp__.py        | 18 +++++++++++++
 .../website_contract/controllers/__init__.py  |  1 +
 addons/website_contract/controllers/main.py   | 11 ++++++++
 .../views/website_contract.xml                | 26 +++++++++++++++++++
 .../website_project/views/website_project.xml |  2 +-
 6 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 addons/website_contract/__init__.py
 create mode 100644 addons/website_contract/__openerp__.py
 create mode 100644 addons/website_contract/controllers/__init__.py
 create mode 100644 addons/website_contract/controllers/main.py
 create mode 100644 addons/website_contract/views/website_contract.xml

diff --git a/addons/website_contract/__init__.py b/addons/website_contract/__init__.py
new file mode 100644
index 00000000000..355939a4922
--- /dev/null
+++ b/addons/website_contract/__init__.py
@@ -0,0 +1 @@
+import controllers
\ No newline at end of file
diff --git a/addons/website_contract/__openerp__.py b/addons/website_contract/__openerp__.py
new file mode 100644
index 00000000000..9a6de074518
--- /dev/null
+++ b/addons/website_contract/__openerp__.py
@@ -0,0 +1,18 @@
+{
+'name': 'Public References',
+    'category': 'Website',
+    'summary': 'Publish Your Public References',
+    'version': '1.0',
+    'description': """
+OpenERP Blog
+============
+
+        """,
+    'author': 'OpenERP SA',
+    'depends': ['website', 'project'],
+    'data': [
+        'views/website_contract.xml',
+    ],
+    'qweb': ['static/src/xml/*.xml'],
+    'installable': True,
+}
diff --git a/addons/website_contract/controllers/__init__.py b/addons/website_contract/controllers/__init__.py
new file mode 100644
index 00000000000..8ee9bae18d9
--- /dev/null
+++ b/addons/website_contract/controllers/__init__.py
@@ -0,0 +1 @@
+import main
diff --git a/addons/website_contract/controllers/main.py b/addons/website_contract/controllers/main.py
new file mode 100644
index 00000000000..cce19eecf42
--- /dev/null
+++ b/addons/website_contract/controllers/main.py
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+
+from openerp.addons.web import http
+from openerp.addons.web.http import request
+
+class website_project(http.Controller):
+
+    @http.route(['/projects/'], type='http', auth="public")
+    def blog(self, **post):
+        website = request.registry['website']
+        return website.render("website_project.index", values)
diff --git a/addons/website_contract/views/website_contract.xml b/addons/website_contract/views/website_contract.xml
new file mode 100644
index 00000000000..8b3b0f6cbfb
--- /dev/null
+++ b/addons/website_contract/views/website_contract.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+
+    <!-- Layout add nav and footer -->
+
+    <template id="footer_custom" inherit_id="website.layout" name="Custom Footer">
+        <xpath expr="//body/header//ul[@id='top_menu']/li[last()]" position="before">
+            <li><a href="/references/">References</a></li>
+        </xpath>
+    </template>
+
+    <!-- Page --> 
+
+    <template id="index" name="Projects">
+        <t t-call="website.layout">
+            <t t-set="title">References</t>
+            <div class="container">
+            </div>
+        </t>
+    </template>
+
+
+ </data>
+</openerp>
diff --git a/addons/website_project/views/website_project.xml b/addons/website_project/views/website_project.xml
index 1817080b566..36e93f56413 100644
--- a/addons/website_project/views/website_project.xml
+++ b/addons/website_project/views/website_project.xml
@@ -15,7 +15,7 @@
 
     <template id="index" name="Projects">
         <t t-call="website.layout">
-            <t t-set="title">Blog</t>
+            <t t-set="title">Projects</t>
             <div class="container">
                 <div t-foreach="project_ids" t-as="project_id">
                     <h4 t-field="project_id.name"/>

From 4e166063c8208017e5f3afb2c718aad2c109322e Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 19 Aug 2013 16:45:34 +0200
Subject: [PATCH 06/24] [IMP] website_contract: imp layout

bzr revid: chm@openerp.com-20130819144534-oh9vi9b3pznnifgu
---
 addons/website_contract/__init__.py                |  3 ++-
 addons/website_contract/controllers/main.py        | 11 ++++++++---
 addons/website_contract/views/website_contract.xml | 14 +++++++++++++-
 addons/website_contract/website_contract.py        |  9 +++++++++
 4 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 addons/website_contract/website_contract.py

diff --git a/addons/website_contract/__init__.py b/addons/website_contract/__init__.py
index 355939a4922..3749654a3b9 100644
--- a/addons/website_contract/__init__.py
+++ b/addons/website_contract/__init__.py
@@ -1 +1,2 @@
-import controllers
\ No newline at end of file
+import controllers
+import website_contract
\ No newline at end of file
diff --git a/addons/website_contract/controllers/main.py b/addons/website_contract/controllers/main.py
index cce19eecf42..275fd21b952 100644
--- a/addons/website_contract/controllers/main.py
+++ b/addons/website_contract/controllers/main.py
@@ -3,9 +3,14 @@
 from openerp.addons.web import http
 from openerp.addons.web.http import request
 
-class website_project(http.Controller):
+class website_contract(http.Controller):
 
-    @http.route(['/projects/'], type='http', auth="public")
+    @http.route(['/references/'], type='http', auth="public")
     def blog(self, **post):
         website = request.registry['website']
-        return website.render("website_project.index", values)
+        partner_obj = request.registry['res.partner']
+        project_ids = partner_obj.search(request.cr, request.uid, [(1, "=", 1)])
+        values = website.get_rendering_context({
+            'partner_ids': partner_obj.browse(request.cr, request.uid, project_ids)
+        })
+        return website.render("website_contract.index", values)
diff --git a/addons/website_contract/views/website_contract.xml b/addons/website_contract/views/website_contract.xml
index 8b3b0f6cbfb..4b84542399e 100644
--- a/addons/website_contract/views/website_contract.xml
+++ b/addons/website_contract/views/website_contract.xml
@@ -6,7 +6,7 @@
     <!-- Layout add nav and footer -->
 
     <template id="footer_custom" inherit_id="website.layout" name="Custom Footer">
-        <xpath expr="//body/header//ul[@id='top_menu']/li[last()]" position="before">
+        <xpath expr="//body/footer//a[@href='/page/website.aboutus']" position="after">
             <li><a href="/references/">References</a></li>
         </xpath>
     </template>
@@ -17,6 +17,18 @@
         <t t-call="website.layout">
             <t t-set="title">References</t>
             <div class="container">
+                <div class="thumbnails">
+                    <div t-foreach="partner_ids" t-as="partner_id" class="span4 mt16">
+                        <div class="media thumbnail">
+                            <a class="pull-left" href="#">
+                                <img class="media-object" t-att-src="partner_id.img('image_small')"/>
+                            </a>
+                            <div class="media-body">
+                                <h5 class="media-heading" t-field="partner_id.name"/>
+                            </div>
+                        </div>
+                    </div>
+                </div>
             </div>
         </t>
     </template>
diff --git a/addons/website_contract/website_contract.py b/addons/website_contract/website_contract.py
new file mode 100644
index 00000000000..d8c372ee4aa
--- /dev/null
+++ b/addons/website_contract/website_contract.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+
+from openerp.osv import osv, fields
+
+
+class hr(osv.osv):
+    _inherit = 'res.partner'
+    def img(self, cr, uid, ids, field='image_small', context=None):
+        return "/website/image?model=%s&field=%s&id=%s" % (self._name, field, ids[0])

From 84208fd7ae465766f1ebaa53a315d79ec551af4d Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 19 Aug 2013 17:10:34 +0200
Subject: [PATCH 07/24] [IMP] website_contract: published

bzr revid: chm@openerp.com-20130819151034-o079dfazpo043kw2
---
 addons/website_contract/controllers/main.py        | 8 ++++++--
 addons/website_contract/views/website_contract.xml | 6 ++++--
 addons/website_contract/website_contract.py        | 5 +++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/addons/website_contract/controllers/main.py b/addons/website_contract/controllers/main.py
index 275fd21b952..fe7bb0f1f4a 100644
--- a/addons/website_contract/controllers/main.py
+++ b/addons/website_contract/controllers/main.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+import openerp
 from openerp.addons.web import http
 from openerp.addons.web.http import request
 
@@ -9,8 +10,11 @@ class website_contract(http.Controller):
     def blog(self, **post):
         website = request.registry['website']
         partner_obj = request.registry['res.partner']
-        project_ids = partner_obj.search(request.cr, request.uid, [(1, "=", 1)])
+        project_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, [('website_testimonial', "!=", False), ('website_published', '=', True)])
+        if request.uid != website.get_public_user().id:
+            project_ids += partner_obj.search(request.cr, request.uid, [(1, "=", 1)])
+            project_ids = list(set(project_ids))
         values = website.get_rendering_context({
-            'partner_ids': partner_obj.browse(request.cr, request.uid, project_ids)
+            'partner_ids': partner_obj.browse(request.cr, openerp.SUPERUSER_ID, project_ids)
         })
         return website.render("website_contract.index", values)
diff --git a/addons/website_contract/views/website_contract.xml b/addons/website_contract/views/website_contract.xml
index 4b84542399e..3ec536d3677 100644
--- a/addons/website_contract/views/website_contract.xml
+++ b/addons/website_contract/views/website_contract.xml
@@ -17,14 +17,16 @@
         <t t-call="website.layout">
             <t t-set="title">References</t>
             <div class="container">
-                <div class="thumbnails">
-                    <div t-foreach="partner_ids" t-as="partner_id" class="span4 mt16">
+                <div class="thumbnails grid grid-align-top">
+                    <div t-foreach="partner_ids" t-as="partner_id" class="span6">
                         <div class="media thumbnail">
                             <a class="pull-left" href="#">
                                 <img class="media-object" t-att-src="partner_id.img('image_small')"/>
                             </a>
                             <div class="media-body">
+                                <t t-call="website.publish"><t t-set="object" t-value="partner_id"/></t>
                                 <h5 class="media-heading" t-field="partner_id.name"/>
+                                <pre t-field="partner_id.website_testimonial"/>
                             </div>
                         </div>
                     </div>
diff --git a/addons/website_contract/website_contract.py b/addons/website_contract/website_contract.py
index d8c372ee4aa..10da628e747 100644
--- a/addons/website_contract/website_contract.py
+++ b/addons/website_contract/website_contract.py
@@ -5,5 +5,10 @@ from openerp.osv import osv, fields
 
 class hr(osv.osv):
     _inherit = 'res.partner'
+    _columns = {
+        'website_published': fields.boolean('Available in the website'),
+        'website_testimonial': fields.text('Recommandation'),
+    }
+
     def img(self, cr, uid, ids, field='image_small', context=None):
         return "/website/image?model=%s&field=%s&id=%s" % (self._name, field, ids[0])

From a8ea1f8cb4688a88e55f9171699edf55666358ec Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 19 Aug 2013 17:24:36 +0200
Subject: [PATCH 08/24] [IMP] website_contract: published

bzr revid: chm@openerp.com-20130819152436-y0tlyxsbinskd61m
---
 addons/website/website.py                   | 12 +++++++-----
 addons/website_contract/__openerp__.py      |  2 +-
 addons/website_contract/controllers/main.py |  9 ++++++++-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/addons/website/website.py b/addons/website/website.py
index aa446d7a1f8..f2a7f0fddda 100644
--- a/addons/website/website.py
+++ b/addons/website/website.py
@@ -69,11 +69,12 @@ class website(osv.osv):
         return values
 
     def render(self, template, values={}):
+        view = request.registry.get("ir.ui.view")
         context = {
             'inherit_branding': values.get('editable', False),
         }
         try:
-            return request.registry.get("ir.ui.view").render(request.cr, request.uid, template, values, context=context)
+            return view.render(request.cr, request.uid, template, values, context=context)
         except (osv.except_osv, orm.except_orm), err:
             logger.error(err)
             values['error'] = err[1]
@@ -82,12 +83,13 @@ class website(osv.osv):
         #     logger.error("Website Rendering Error.\n\n%s" % (traceback.format_exc()))
         #     return self.render('website.404', values)
         except Exception:
-            logger.error("Website Rendering Error.\n\n%s" % (traceback.format_exc()))
+            trace = traceback.format_exc()
+            logger.error("Website Rendering Error.\n\n%s" % trace)
             if values['editable']:
-                values['traceback'] = traceback.format_exc()
-                return self.render('website.500', values)
+                values['traceback'] = trace
+                return view.render(request.cr, request.uid, 'website.500', values, context=context)
             else:
-                return self.render('website.404', values)
+                return view.render(request.cr, request.uid, 'website.404', values, context=context)
 
     def pager(self, url, total, page=1, step=30, scope=5, url_args=None):
         # Compute Pager
diff --git a/addons/website_contract/__openerp__.py b/addons/website_contract/__openerp__.py
index 9a6de074518..3be38778530 100644
--- a/addons/website_contract/__openerp__.py
+++ b/addons/website_contract/__openerp__.py
@@ -9,7 +9,7 @@ OpenERP Blog
 
         """,
     'author': 'OpenERP SA',
-    'depends': ['website', 'project'],
+    'depends': ['website', 'sale'],
     'data': [
         'views/website_contract.xml',
     ],
diff --git a/addons/website_contract/controllers/main.py b/addons/website_contract/controllers/main.py
index fe7bb0f1f4a..674fef25343 100644
--- a/addons/website_contract/controllers/main.py
+++ b/addons/website_contract/controllers/main.py
@@ -10,10 +10,17 @@ class website_contract(http.Controller):
     def blog(self, **post):
         website = request.registry['website']
         partner_obj = request.registry['res.partner']
+        account_obj = request.registry['account.analytic.account']
+
         project_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, [('website_testimonial', "!=", False), ('website_published', '=', True)])
+
         if request.uid != website.get_public_user().id:
-            project_ids += partner_obj.search(request.cr, request.uid, [(1, "=", 1)])
+            contract_ids = account_obj.search(request.cr, openerp.SUPERUSER_ID, [(1, "=", 1)])
+            for contract in account_obj.browse(request.cr, openerp.SUPERUSER_ID, contract_ids):
+                if contract.partner_id:
+                    project_ids.append(contract.partner_id.id)
             project_ids = list(set(project_ids))
+
         values = website.get_rendering_context({
             'partner_ids': partner_obj.browse(request.cr, openerp.SUPERUSER_ID, project_ids)
         })

From c48ceabbcae1e1f25f0e08a5a68794375d290a52 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 20 Aug 2013 10:04:11 +0200
Subject: [PATCH 09/24] [IMP] website_contract: better check access rules

bzr revid: chm@openerp.com-20130820080411-x5jjlcshwzmypfs4
---
 addons/website_contract/controllers/main.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/website_contract/controllers/main.py b/addons/website_contract/controllers/main.py
index 674fef25343..a28ea95c9d0 100644
--- a/addons/website_contract/controllers/main.py
+++ b/addons/website_contract/controllers/main.py
@@ -12,13 +12,15 @@ class website_contract(http.Controller):
         partner_obj = request.registry['res.partner']
         account_obj = request.registry['account.analytic.account']
 
+        # public partner profile
         project_ids = partner_obj.search(request.cr, openerp.SUPERUSER_ID, [('website_testimonial', "!=", False), ('website_published', '=', True)])
 
         if request.uid != website.get_public_user().id:
             contract_ids = account_obj.search(request.cr, openerp.SUPERUSER_ID, [(1, "=", 1)])
-            for contract in account_obj.browse(request.cr, openerp.SUPERUSER_ID, contract_ids):
-                if contract.partner_id:
-                    project_ids.append(contract.partner_id.id)
+            contract_project_ids = [contract.partner_id.id 
+                for contract in account_obj.browse(request.cr, openerp.SUPERUSER_ID, contract_ids) if contract.partner_id]
+            # search for check access rules
+            project_ids += partner_obj.search(request.cr, request.uid, [('id', "in", contract_project_ids)])
             project_ids = list(set(project_ids))
 
         values = website.get_rendering_context({

From 05bb4f2dcaa1127c00a776a7e684aff75b806f45 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 20 Aug 2013 16:12:03 +0200
Subject: [PATCH 10/24] [IMP] website_sale: use product.template insead of
 product.product

bzr revid: chm@openerp.com-20130820141203-vkg93z9odh0rlf4d
---
 addons/product/product.py                     | 58 +++++++++----------
 addons/website_sale/controllers/main.py       | 30 ++++------
 .../website_sale/security/ir.model.access.csv |  1 +
 addons/website_sale/security/website_sale.xml | 10 ++++
 addons/website_sale/views/website_sale.xml    | 34 ++++++-----
 addons/website_sale/website_sale.py           |  2 +-
 6 files changed, 71 insertions(+), 64 deletions(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index c0a007789fd..8c74217efac 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -289,6 +289,15 @@ class product_template(osv.osv):
     _name = "product.template"
     _description = "Product Template"
 
+    def _get_image(self, cr, uid, ids, name, args, context=None):
+        result = dict.fromkeys(ids, False)
+        for obj in self.browse(cr, uid, ids, context=context):
+            result[obj.id] = tools.image_get_resized_images(obj.image, avoid_resize_medium=True)
+        return result
+
+    def _set_image(self, cr, uid, id, name, value, args, context=None):
+        return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)
+
     _columns = {
         'name': fields.char('Name', size=128, required=True, translate=True, select=True),
         'product_manager': fields.many2one('res.users','Product Manager'),
@@ -328,7 +337,26 @@ class product_template(osv.osv):
         'mes_type': fields.selection((('fixed', 'Fixed'), ('variable', 'Variable')), 'Measure Type'),
         'seller_ids': fields.one2many('product.supplierinfo', 'product_id', 'Supplier'),
         'company_id': fields.many2one('res.company', 'Company', select=1),
-        'product_ids': fields.one2many('product.product', 'product_tmpl_id', 'Product Variants'),
+        # image: all image fields are base64 encoded and PIL-supported
+        'image': fields.binary("Image",
+            help="This field holds the image used as image for the product, limited to 1024x1024px."),
+        'image_medium': fields.function(_get_image, fnct_inv=_set_image,
+            string="Medium-sized image", type="binary", multi="_get_image",
+            store={
+                'product.product': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
+            },
+            help="Medium-sized image of the product. It is automatically "\
+                 "resized as a 128x128px image, with aspect ratio preserved, "\
+                 "only when the image exceeds one of those sizes. Use this field in form views or some kanban views."),
+        'image_small': fields.function(_get_image, fnct_inv=_set_image,
+            string="Small-sized image", type="binary", multi="_get_image",
+            store={
+                'product.product': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
+            },
+            help="Small-sized image of the product. It is automatically "\
+                 "resized as a 64x64px image, with aspect ratio preserved. "\
+                 "Use this field anywhere a small image is required."),
+        'product_variant_ids': fields.one2many('product.product', 'product_tmpl_id', 'Product Variants'),
     }
 
     def _get_uom_id(self, cr, uid, *args):
@@ -515,15 +543,6 @@ class product_product(osv.osv):
         return result
 
 
-    def _get_image(self, cr, uid, ids, name, args, context=None):
-        result = dict.fromkeys(ids, False)
-        for obj in self.browse(cr, uid, ids, context=context):
-            result[obj.id] = tools.image_get_resized_images(obj.image, avoid_resize_medium=True)
-        return result
-
-    def _set_image(self, cr, uid, id, name, value, args, context=None):
-        return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)
-
     def _get_name_template_ids(self, cr, uid, ids, context=None):
         result = set()
         template_ids = self.pool.get('product.product').search(cr, uid, [('product_tmpl_id', 'in', ids)])
@@ -568,25 +587,6 @@ class product_product(osv.osv):
 
             }, select=True),
         'color': fields.integer('Color Index'),
-        # image: all image fields are base64 encoded and PIL-supported
-        'image': fields.binary("Image",
-            help="This field holds the image used as image for the product, limited to 1024x1024px."),
-        'image_medium': fields.function(_get_image, fnct_inv=_set_image,
-            string="Medium-sized image", type="binary", multi="_get_image",
-            store={
-                'product.product': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
-            },
-            help="Medium-sized image of the product. It is automatically "\
-                 "resized as a 128x128px image, with aspect ratio preserved, "\
-                 "only when the image exceeds one of those sizes. Use this field in form views or some kanban views."),
-        'image_small': fields.function(_get_image, fnct_inv=_set_image,
-            string="Small-sized image", type="binary", multi="_get_image",
-            store={
-                'product.product': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
-            },
-            help="Small-sized image of the product. It is automatically "\
-                 "resized as a 64x64px image, with aspect ratio preserved. "\
-                 "Use this field anywhere a small image is required."),
         'seller_info_id': fields.function(_calc_seller, type='many2one', relation="product.supplierinfo", string="Supplier Info", multi="seller_info"),
         'seller_delay': fields.function(_calc_seller, type='integer', string='Supplier Lead Time', multi="seller_info", help="This is the average delay in days between the purchase order confirmation and the reception of goods for this product and for the default supplier. It is used by the scheduler to order requests based on reordering delays."),
         'seller_qty': fields.function(_calc_seller, type='float', string='Supplier Quantity', multi="seller_info", help="This is minimum quantity to purchase from Main Supplier."),
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 4854da64aa5..0aae53a80fa 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -55,7 +55,7 @@ class Ecommerce(http.Controller):
     def category(self, cat_id=0, page=0, **post):
 
         website = request.registry['website']
-        product_obj = request.registry.get('product.product')
+        product_obj = request.registry.get('product.template')
 
         domain = [("sale_ok", "=", True)]
         if SUPERUSER_ID != request.uid:
@@ -66,49 +66,39 @@ class Ecommerce(http.Controller):
                 ('name', 'ilike', "%%%s%%" % post.get("search")), 
                 ('description', 'ilike', "%%%s%%" % post.get("search")),
                 ('description_website', 'ilike', "%%%s%%" % post.get("search")),
-                ('pos_categ_id.name', 'ilike', "%%%s%%" % post.get("search"))]
+                ('product_variant_ids.pos_categ_id.name', 'ilike', "%%%s%%" % post.get("search"))]
         if cat_id:
             cat_id = int(cat_id)
-            domain += [('pos_categ_id.id', 'child_of', cat_id)] + domain
+            domain += [('product_variant_ids.pos_categ_id.id', 'child_of', cat_id)] + domain
 
         step = 20
         product_count = len(product_obj.search(request.cr, request.uid, domain))
         pager = website.pager(url="/shop/category/%s/" % cat_id, total=product_count, page=page, step=step, scope=7, url_args=post)
 
-        product_ids = product_obj.search(request.cr, request.uid, domain, limit=step, offset=pager['offset'])
-
-        products = product_obj.browse(request.cr, request.uid, product_ids)
-        tmpl_ids = []
-        product_tmpl_ids = []
-        for product in products:
-            if product.product_tmpl_id.id not in tmpl_ids:
-                tmpl_ids.append(product.product_tmpl_id.id)
-                product_tmpl_ids.append(product)
+        product_ids = product_obj.search(request.cr, request.uid, domain, limit=step, offset=pager['offset'], order="website_published,name")
 
         values = website.get_rendering_context({
             'categories': self.get_categories(),
-            'current_category': cat_id,
-            'products': product_tmpl_ids,
+            'category_id': cat_id,
+            'products': product_obj.browse(request.cr, request.uid, product_ids),
             'search': post.get("search"),
             'pager': pager,
         })
         return website.render("website_sale.products", values)
 
     @http.route(['/shop/product/<product_id>/'], type='http', auth="public")
-    def product(self, cat_id=0, product_id=0):
+    def product(self, cat_id=0, product_id=0, **post):
         website = request.registry['website']
-        order = get_current_order()
 
         product_id = product_id and int(product_id) or 0
-        product_obj = request.registry.get('product.product')
-
-        line = [line for line in order.order_line if line.product_id.id == product_id]
+        product_obj = request.registry.get('product.template')
 
         product = product_obj.browse(request.cr, request.uid, product_id)
         values = website.get_rendering_context({
+            'category_id': post.get('category_id') and int(post.get('category_id')) or None,
+            'search': post.get("search"),
             'categories': self.get_categories(),
             'product': product,
-            'product_variants': product.product_tmpl_id.product_ids,
         })
         return website.render("website_sale.product", values)
 
diff --git a/addons/website_sale/security/ir.model.access.csv b/addons/website_sale/security/ir.model.access.csv
index 8d41ba779d4..1edc0bd5c8f 100644
--- a/addons/website_sale/security/ir.model.access.csv
+++ b/addons/website_sale/security/ir.model.access.csv
@@ -1,3 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_product_product_public,product.product.public,product.model_product_product,base.group_public,1,0,0,0
+access_product_template_public,product.template.public,product.model_product_template,base.group_public,1,0,0,0
 access_point_of_sale_category_public,point_of_sale.category.public,point_of_sale.model_pos_category,base.group_public,1,0,0,0
\ No newline at end of file
diff --git a/addons/website_sale/security/website_sale.xml b/addons/website_sale/security/website_sale.xml
index b37578d41e0..3b3489ac77c 100644
--- a/addons/website_sale/security/website_sale.xml
+++ b/addons/website_sale/security/website_sale.xml
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
+    <record id="product_template_public" model="ir.rule">
+        <field name="name">product: Public product template</field>
+        <field name="model_id" ref="product.model_product_template"/>
+        <field name="domain_force">[('website_published', '=', True), ("sale_ok", "=", 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="product_product_public" model="ir.rule">
         <field name="name">product: Public product</field>
         <field name="model_id" ref="product.model_product_product"/>
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index b03c425c22c..cf71349a75c 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -66,7 +66,7 @@
         <xpath expr="//div[@id='shop_content']" position="before">
             <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>
+                    <li t-att-class=" '' if category_id 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>
@@ -81,7 +81,7 @@
     <!-- List of categories -->
 
     <template id="categories_recursive">
-        <li t-att-class="category.id == current_category and 'active' or ''">
+        <li t-att-class="category.id == category_id and 'active' or ''">
             <a t-attf-href="/shop/category/#{ 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">
@@ -102,17 +102,16 @@
                         <t t-call="website.pager" >
                             <t t-set="classname">pull-left</t>
                         </t>
-                        <form action="/shop/" method="get" class="navbar-search pull-right pagination">
+                        <form t-attf-action="/shop/#{ category_id and ('category/%s/' % category_id) or ''}" method="get" class="navbar-search pull-right pagination">
                             <input type="text" name="search" class="search-query span2" placeholder="Search" t-att-value="search or '' or ''"/>
                         </form>
                     </div>
                 </div>
                 <div class='row grid grid-align-top'>
-                    <div t-foreach="products" t-as="product" class="span2 mb16 thumbnail text-center">
-                        <a t-attf-href="/shop/product/#{ product.id }/ ">
+                    <t t-foreach="products" t-as="product">
+                    <div t-attf-class="span2 mb16 thumbnail text-center #{not product.website_published and 'alert' or ''}">
+                        <a t-attf-href="/shop/product/#{ product.id }/?#{ search and ('search=%s' % search) or ''}#{ category_id and ('&amp;category_id=%s' % category_id) or ''}">
                             <h5  t-field="product.name"> </h5>
-                        </a>
-                        <a t-attf-href="/shop/product/#{ product.id }/">
                             <img class="img-rounded" t-att-src="product.img('image_small')"/>
                         </a>
                         <div>
@@ -123,6 +122,7 @@
                             </div>
                         </div>
                     </div>
+                    </t>
                 </div>
                 <div class="text-center">
                     <t t-call="website.pager" />
@@ -137,16 +137,22 @@
         <t t-call="website_sale.layout">
             <t t-set="title">Product</t>
             <t t-set="shop_content">
+                <div class='navbar navbar-inverse'>
+                    <div class='navbar-inner'>
+                        <form t-attf-action="/shop/#{ category_id and ('category/%s/' % category_id) or ''}" method="get" class="navbar-search pull-right pagination">
+                            <input type="text" name="search" class="search-query span2" placeholder="Search" t-att-value="search or '' or ''"/>
+                        </form>
+                    </div>
+                </div>
                 <div id="product_detail">
                     <t t-call="website.publish"><t t-set="object" t-value="product"/></t>
                     <h2 t-field="product.name"></h2>
-                    <a t-if="not product_variants" t-attf-href="/shop/add_cart/#{ product.id }/" class="btn btn-small btn-success pull-right">Add to cart</a>
-                    <form t-if="product_variants" action="/shop/add_cart/" class="pull-right">
-                        <select name="product_id">
-                            <t t-foreach="product_variants" t-as="product">
-                            <option t-att-value="product.id"><t t-esc="product.variants"/></option>
-                            </t>
-                        </select><br/>
+                    <a t-if="not product.product_variant_ids" t-attf-href="/shop/add_cart/#{ product.id }/" class="btn btn-small btn-success pull-right">Add to cart</a>
+                    <form t-if="len(product.product_variant_ids) > 1" action="/shop/add_cart/" class="pull-right">
+                        <label class="radio" t-foreach="product.product_variant_ids" t-as="product">
+                            <input type="radio" name="product_id" t-att-value="product.id" t-att-checked="product == product.product_variant_ids[0] or None"/>
+                            <t t-esc="product.variants or ''">Standard</t>
+                        </label><br/>
                         <button class="btn btn-small btn-success">Add to cart</button>
                     </form>
                     <img class="media-object" t-att-src="product.img('image')"/>
diff --git a/addons/website_sale/website_sale.py b/addons/website_sale/website_sale.py
index e647dab38d7..7bdd593f41a 100644
--- a/addons/website_sale/website_sale.py
+++ b/addons/website_sale/website_sale.py
@@ -29,7 +29,7 @@ class product_pricelist(osv.osv):
     }
 
 class product_product(osv.osv):
-    _inherit = "product.product"
+    _inherit = "product.template"
     _columns = {
         'website_published': fields.boolean('Available in the website'),
         'description_website': fields.html('Description for the website'),

From 6284b4b925a17e6c463694758c23c4ecf87d7035 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Tue, 20 Aug 2013 18:45:57 +0200
Subject: [PATCH 11/24] [WIP] cms: snippets are ugly but working well

bzr revid: fva@openerp.com-20130820164557-kjh87mrtv4tueln8
---
 addons/website/static/src/css/editor.css  |  29 ++++++
 addons/website/static/src/css/editor.sass |  23 +++++
 addons/website/static/src/js/website.js   | 117 ++++++++++++++++++----
 addons/website/static/src/xml/website.xml |   1 -
 addons/website/views/views.xml            |  15 ++-
 5 files changed, 165 insertions(+), 20 deletions(-)

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 94552c801c2..1416a4db2d8 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -76,7 +76,36 @@
   height: 100px;
   border-radius: 3px;
   margin: 10px;
+  cursor: move;
 }
 .oe_snippets .oe_snippet .oe_snippet_body {
   display: none;
 }
+
+.oe_drop_zone {
+  display: block;
+  background: rgba(255, 0, 0, 0.25);
+  border: solid 1px rgba(255, 0, 0, 0.5);
+  height: 30px;
+  margin: -16px 0px;
+}
+.oe_drop_zone.oe_inline {
+  display: inline;
+  height: auto;
+  width: 30px;
+  margin: 0px -16px;
+}
+.oe_drop_zone.oe_float_left {
+  float: left;
+}
+.oe_drop_zone.oe_float_right {
+  float: right;
+}
+.oe_drop_zone:hover {
+  background: rgba(255, 0, 0, 0.5);
+  border: solid 1px red;
+}
+.oe_drop_zone.oe_hover {
+  background: rgba(0, 255, 0, 0.5);
+  border: solid 1px green;
+}
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index 565e7571dca..a11a83c7f90 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -68,8 +68,31 @@
             height: 100px
             border-radius: 3px
             margin: 10px
+            cursor: move
 
         .oe_snippet_body
             display: none
 
+.oe_drop_zone
+    display: block
+    background: rgba(255,0,0,0.25)
+    border: solid 1px rgba(255,0,0,0.5)
+    height: 30px
+    margin: -16px 0px
+    &.oe_inline
+        display: inline
+        height: auto
+        width: 30px
+        margin: 0px -16px
+    &.oe_float_left
+        float: left
+    &.oe_float_right
+        float: right
+    &:hover
+        background: rgba(255,0,0,0.5)
+        border: solid 1px red
+    &.oe_hover
+        background: rgba(0,255,0,0.5)
+        border: solid 1px green
+
 
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index eb224c7905c..03841e3b87a 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -121,6 +121,7 @@ $(function(){
 
             this.snippets = new Snippets();
             this.snippets.appendTo($("body"));
+            window.snippets = this.snippets;
 
             return $.when(
                 this._super.apply(this, arguments),
@@ -335,32 +336,114 @@ $(function(){
                 type: "GET",
                 url:  "/page/website.snippets",
                 dataType: "text",
-                success: function(text){
-                    self.$el.html(text);
+                success: function(snippets){
+                    self.$el.html(snippets);
+                    self.start_snippets();
                 },
             });
 
-            // load snippets
-            // /page/website.snippets
         },
-        setup_droppable: function () {
+        // setup widget and drag and drop
+        start_snippets: function(){
             var self = this;
-            $('.oe_snippet_drop').remove();
-            var droppable = '<div class="oe_snippet_drop"></div>';
-            var $zone = $(':not(.oe_snippet) > .container');
-            $zone.after(droppable);//.after(droppable);
+            
+            this.$('.oe_snippet').draggable({
+                helper: 'clone',
+                start: function(){
+                    var snippet = $(this);
+                 
+                    self.activate_drop_zones({
+                        siblings: snippet.data('selector-siblings'),
+                        childs:   snippet.data('selector-childs')
+                    });
 
-            $(".oe_snippet_drop").droppable({
-                hoverClass: 'oe_accepting',
-                drop: function( event, ui ) {
-                    console.log(event, ui, "DROP");
-
-                    $(event.target).replaceWith($(ui.draggable).html());
-                    $('.oe_selected').remove();
-                    $('.oe_snippet_drop').remove();
+                    $('.oe_drop_zone').droppable({
+                        hoverClass: "oe_hover",
+                        drop:   function(event,ui){
+                            $(this).replaceWith(snippet.find('.oe_snippet_body').clone());
+                        },
+                    });
+                },
+                stop: function(){
+                    self.deactivate_drop_zones();
                 }
             });
         },
+        // A generic drop zone generator. two css selectors can be provided
+        // selector.childs -> will insert drop zones as direct child of the selected elements
+        //   in case the selected elements have children themselves, dropzones will be interleaved
+        //   with them.
+        // selector.siblings -> will insert drop zones after and before selected elements
+        activate_drop_zones: function(selector){
+            var self = this;
+            var child_selector   =  selector.childs   || '';
+            var sibling_selector =  selector.siblings || '';
+            var zone_template = "<div class='oe_drop_zone'></div>";
+            
+            $('.oe_drop_zone').remove();
+
+            if(child_selector){
+                var $zones = $(child_selector);
+                for( var i = 0, len = $zones.length; i < len; i++ ){
+                    $zones.eq(i).find('> *:not(.oe_drop_zone)').after(zone_template);
+                    $zones.eq(i).prepend(zone_template);
+                }
+            }
+            
+            if(sibling_selector){
+                var $zones = $(sibling_selector);
+                for( var i = 0, len = $zones.length; i < len; i++ ){
+                    if($zones.eq(i).prev('.oe_drop_zone').length === 0){
+                        $zones.eq(i).before(zone_template);
+                    }
+                    if($zones.eq(i).next('.oe_drop_zone').length === 0){
+                        $zones.eq(i).after(zone_template);
+                    }
+                }
+            }
+
+            // Cleaning up unnecessary zones
+            $('.oe_snippets .oe_drop_zone').remove();   // no zone in the snippet selector ...
+            $('#website-top-view .oe_drop_zone').remove();   // no zone in the top bars ...
+            $('#website-top-edit .oe_drop_zone').remove();
+            do {
+                var count = 0;
+                var $zones = $('.oe_drop_zone + .oe_drop_zone');    // no two consecutive zones
+                count += $zones.length;
+                $zones.remove();
+
+                $zones = $('.oe_drop_zone > .oe_drop_zone').remove();   // no recusrive zones
+                count += $zones.length;
+                $zones.remove();
+            }while(count > 0);
+
+            // Cleaning up zones placed between floating or inline elements
+            var $zones = $('.oe_drop_zone');
+            for( i = 0, len = $zones.length; i < len; i++ ){
+                var zone = $zones.eq(i);
+                var prev = zone.prev();
+                var next = zone.next();
+                var float_prev = zone.prev().css('float')   || 'none';
+                var float_next = zone.next().css('float')   || 'none';
+                var disp_prev  = zone.prev().css('display') ||  null;
+                var disp_next  = zone.next().css('display') ||  null;
+                if(     (float_prev === 'left' || float_prev === 'right')
+                    &&  (float_next === 'left' || float_next === 'right')  ){
+                    zone.remove();
+                    continue;
+                }else if( !(    disp_prev === null
+                             || disp_next === null
+                             || disp_prev === 'block'
+                             || disp_next === 'block'
+                            ) ){
+                    zone.remove();
+                    continue;
+                }
+            }
+        },
+        deactivate_drop_zones: function(){
+            $('.oe_drop_zone').remove();
+        },
         toggle: function(){
             if(this.$el.hasClass('oe_hidden')){
                 this.$el.removeClass('oe_hidden');
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index 3e2e5db538b..e6611121bb8 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -60,7 +60,6 @@
 
     <t t-name="website.snippets">
         <div class='oe_snippets oe_hidden'>
-            sadfasdfsadf
         </div>
     </t>
 
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index 7d75ecde6ba..6920fc48aa0 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -399,14 +399,25 @@
         </template>
 
         <template id="snippets">
-            <div class='oe_snippet' name='FooBar'>
+
+            <div class='oe_snippet' name='FooBar' data-selector-siblings='p,h1,h2,h3,h4,h5'>
                 <div class='oe_snippet_thumbnail'>
                     foobar
                 </div>
-                <div class='oe_snippet_body' data-selector-siblings='[class*="span"]' data-selector-childs=''>
+                <div class='oe_snippet_body'>
                     FOOBAR
                 </div>
             </div>
+
+            <div class='oe_snippet' name='BarFoo' data-selector-childs='.container'>
+                <div class='oe_snippet_thumbnail'>
+                    barfoo
+                </div>
+                <div class='oe_snippet_body'>
+                    BARFOO
+                </div>
+            </div>
+
         </template>
 
      </data>

From 2794f018b79f447147ab5881a285c8ad49c5129a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 20 Aug 2013 22:58:20 +0200
Subject: [PATCH 12/24] [FIX] jshint

bzr revid: fme@openerp.com-20130820205820-m24w4b4so10k4fql
---
 addons/website/static/src/js/website.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index 03841e3b87a..6feb8227f70 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -406,8 +406,9 @@ $(function(){
             $('.oe_snippets .oe_drop_zone').remove();   // no zone in the snippet selector ...
             $('#website-top-view .oe_drop_zone').remove();   // no zone in the top bars ...
             $('#website-top-edit .oe_drop_zone').remove();
+            var count;
             do {
-                var count = 0;
+                count = 0;
                 var $zones = $('.oe_drop_zone + .oe_drop_zone');    // no two consecutive zones
                 count += $zones.length;
                 $zones.remove();
@@ -419,7 +420,7 @@ $(function(){
 
             // Cleaning up zones placed between floating or inline elements
             var $zones = $('.oe_drop_zone');
-            for( i = 0, len = $zones.length; i < len; i++ ){
+            for( var i = 0, len = $zones.length; i < len; i++ ){
                 var zone = $zones.eq(i);
                 var prev = zone.prev();
                 var next = zone.next();

From ae8630a73522a51c462fdc613b21d13d7fc2ac35 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 20 Aug 2013 23:34:50 +0200
Subject: [PATCH 13/24] [IMP] website's framework setup and template loading

bzr revid: fme@openerp.com-20130820213450-r71yyp42lw45plem
---
 addons/website/static/src/js/website.js | 115 ++++++++++++++----------
 addons/website/views/views.xml          |  19 ++--
 2 files changed, 78 insertions(+), 56 deletions(-)

diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index 6feb8227f70..c3d8dd1e5f3 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -1,17 +1,19 @@
-$(function(){
+(function() {
+    "use strict";
 
-    // Ugly. I'll clean this monday
-    if ($('html').attr('data-editable') !== '1'){
-        return;
-    }
+    var website = {};
+    // The following line can be removed in 2017
+    openerp.website = website;
 
-    // TODO fme: put everything in openerp.website scope and load templates on
-    // next tick or document ready
-    // Also check with xmo if jquery.keypress.js is still needed.
+    var templates = [
+        '/website/static/src/xml/website.xml'
+    ];
 
     /* ----- TEMPLATE LOADING ---- */
-
-    function loadTemplates(templates) {
+    website.add_template = function(template) {
+        templates.push(template);
+    };
+    website.load_templates = function(templates) {
         var def = $.Deferred();
         var count = templates.length;
         templates.forEach(function(t) {
@@ -27,41 +29,16 @@ $(function(){
             });
         });
         return def;
-    }
+    };
 
-    var templates = [
-        '/website/static/src/xml/website.xml'
-    ];
-
-    loadTemplates(templates).then(function(){
-        var editor = new EditorBar();
+    website.init_editor = function () {
+        var editor = new website.EditorBar();
         editor.prependTo($('body'));
         $('body').css('padding-top', '50px'); // Not working properly: editor.$el.outerHeight());
-        // TODO: Create an openerp.Widget out of this
-    });
-
-    /* ----- PUBLISHING STUFF ---- */
-
-    $(document).on('click', '.js_publish, .js_unpublish', function (e) {
-        e.preventDefault();
-        var $link = $(this).parent();
-        $link.find('.js_publish, .js_unpublish').addClass("hidden");
-        var $unp = $link.find(".js_unpublish");
-        var $p = $link.find(".js_publish");
-        $.post('/website/publish', {'id': $link.data('id'), 'object': $link.data('object')}, function (result) {
-            if (+result) {
-                $p.addClass("hidden");
-                $unp.removeClass("hidden");
-            } else {
-                $p.removeClass("hidden");
-                $unp.addClass("hidden");
-            }
-        });
-    });
+    };
 
     /* ----- TOP EDITOR BAR FOR ADMIN ---- */
-
-    var EditorBar = openerp.Widget.extend({
+    website.EditorBar = openerp.Widget.extend({
         template: 'Website.EditorBar',
         events: {
             'click button[data-action=edit]': 'edit',
@@ -116,10 +93,10 @@ $(function(){
                 snippet: this.$('button[data-action=snippet]'),
             };
 
-            this.rte = new RTE(this);
+            this.rte = new website.RTE(this);
             this.rte.on('change', this, this.proxy('rte_changed'));
 
-            this.snippets = new Snippets();
+            this.snippets = new website.Snippets();
             this.snippets.appendTo($("body"));
             window.snippets = this.snippets;
 
@@ -218,8 +195,7 @@ $(function(){
     });
 
     /* ----- RICH TEXT EDITOR ---- */
-
-    var RTE = openerp.Widget.extend({
+    website.RTE = openerp.Widget.extend({
         tagName: 'li',
         id: 'oe_rte_toolbar',
         className: 'oe_right oe_rte_toolbar',
@@ -323,8 +299,7 @@ $(function(){
     });
 
     /* ----- SNIPPET SELECTOR ---- */
-
-    var Snippets = openerp.Widget.extend({
+    website.Snippets = openerp.Widget.extend({
         template: 'website.snippets',
         init: function () {
             this._super.apply(this, arguments);
@@ -464,5 +439,51 @@ $(function(){
         },
     });
 
-});
+    var all_ready = null;
+    var dom_ready = $.Deferred();
+    $(dom_ready.resolve);
+
+    /**
+     * Returns a deferred resolved when the templates are loaded
+     * and the Widgets can be instanciated.
+     */
+    website.ready = function() {
+        if (!all_ready) {
+            all_ready = dom_ready.then(function () {
+                // TODO: load translations
+                return website.load_templates(templates);
+            });
+        }
+        return all_ready;
+    };
+
+    dom_ready.then(function () {
+        website.is_editable = $('html').attr('data-editable') === '1';
+
+        if (website.is_editable) {
+            website.ready().then(website.init_editor);
+        }
+
+        /* ----- PUBLISHING STUFF ---- */
+        $(document).on('click', '.js_publish, .js_unpublish', function (e) {
+            e.preventDefault();
+            var $link = $(this).parent();
+            $link.find('.js_publish, .js_unpublish').addClass("hidden");
+            var $unp = $link.find(".js_unpublish");
+            var $p = $link.find(".js_publish");
+            $.post('/website/publish', {'id': $link.data('id'), 'object': $link.data('object')}, function (result) {
+                if (+result) {
+                    $p.addClass("hidden");
+                    $unp.removeClass("hidden");
+                } else {
+                    $p.removeClass("hidden");
+                    $unp.addClass("hidden");
+                }
+            });
+        });
+
+    });
+
+    return website;
+})();
 
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index 87ba3d49e03..a2b42cf2f84 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -27,21 +27,22 @@
                         <script type="text/javascript" src="/web/static/lib/underscore.string/lib/underscore.string.js"></script>
                         <script type="text/javascript" src="/web/static/lib/jquery/jquery.js"></script>
                         <script type="text/javascript" src="/website/static/lib/bootstrap/js/bootstrap.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;
-                            // EDIT ALL THE THINGS
-                            CKEDITOR.dtd.$editable = $.extend( {}, CKEDITOR.dtd.$block, CKEDITOR.dtd.$inline);
-                        </script>
+
+                        <script type="text/javascript" src="/web/static/lib/qweb/qweb2.js"></script>
+                        <script type="text/javascript" src="/web/static/src/js/openerpframework.js"></script>
 
                         <t t-if="editable">
                             <link rel='stylesheet' href='/website/static/src/css/snippets.css'/>
                             <link rel='stylesheet' href='/website/static/src/css/editor.css'/>
 
+                            <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;
+                                // EDIT ALL THE THINGS
+                                CKEDITOR.dtd.$editable = $.extend( {}, CKEDITOR.dtd.$block, CKEDITOR.dtd.$inline);
+                            </script>
                             <script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js"></script>
-                            <script type="text/javascript" src="/web/static/lib/qweb/qweb2.js"></script>
-                            <script type="text/javascript" src="/web/static/src/js/openerpframework.js"></script>
                         </t>
 
                         <script type="text/javascript" src="/website/static/src/js/website.js"></script>

From 1df99b04829f396e4fd8aec48b6814f5366bcdf2 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 21 Aug 2013 10:52:46 +0200
Subject: [PATCH 14/24] [IMP] website_project: display table of task by stage

bzr revid: chm@openerp.com-20130821085246-721xkh5bji0vqi9q
---
 addons/website_mail/views/website_mail.xml    |  6 +--
 addons/website_project/controllers/main.py    | 37 +++++++++++++--
 .../website_project/views/website_project.xml | 46 ++++++++++++++-----
 3 files changed, 69 insertions(+), 20 deletions(-)

diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml
index f77eae83468..38efb67c1ba 100644
--- a/addons/website_mail/views/website_mail.xml
+++ b/addons/website_mail/views/website_mail.xml
@@ -16,10 +16,8 @@
         <xpath expr="//body/header//ul[@id='top_menu']/li[last()]" position="before">
             <li><a href="/blog/%(website_mail.website_mail_blog)d/">News</a></li>
         </xpath>
-        <xpath expr="//body/footer//h5[@name='info_title']" position="after">
-            <ul class='unstyled'>
-                <li><a href="/blog/%(website_mail.website_mail_blog)d/">News</a></li>
-            </ul>
+        <xpath expr="//body/footer//div[@name='info']/ul" position="inside">
+            <li><a href="/blog/%(website_mail.website_mail_blog)d/">News</a></li>
         </xpath>
     </template>
 
diff --git a/addons/website_project/controllers/main.py b/addons/website_project/controllers/main.py
index d79bd786a3f..b2eba78720e 100644
--- a/addons/website_project/controllers/main.py
+++ b/addons/website_project/controllers/main.py
@@ -1,16 +1,43 @@
 # -*- coding: utf-8 -*-
 
+from openerp.osv import osv
 from openerp.addons.web import http
 from openerp.addons.web.http import request
 
-class website_project(http.Controller):
 
-    @http.route(['/projects/'], type='http', auth="public")
-    def blog(self, **post):
-        website = request.registry['website']
+class website(osv.osv):
+    _inherit = "website"
+    def get_rendering_context(self, additional_values=None):
         project_obj = request.registry['project.project']
         project_ids = project_obj.search(request.cr, request.uid, [('privacy_visibility', "=", "public")])
+        values = {
+            'project_ids': project_obj.browse(request.cr, request.uid, project_ids),
+        }
+        if additional_values:
+            values.update(additional_values)
+        return super(website, self).get_rendering_context(values)
+
+
+class website_project(http.Controller):
+
+    @http.route(['/project/<int:project_id>/'], type='http', auth="public")
+    def blog(self, project_id=None, **post):
+        website = request.registry['website']
+        project_obj = request.registry['project.project']
+        task_obj = request.registry['project.task']
+        stage_obj = request.registry['project.task.type']
+
+        project = project_obj.browse(request.cr, request.uid, project_id)
+
+        domain = [('id', 'in', [task.id for task in project.tasks])]
+        stages = task_obj.read_group(request.cr, request.uid, domain, ["id", "stage_id"], groupby="stage_id")
+        for stage in stages:
+            stage['stage_id'] = stage_obj.browse(request.cr, request.uid, stage['stage_id'][0])
+            task_ids = task_obj.search(request.cr, request.uid, stage['__domain'])
+            stage['task_ids'] = task_obj.browse(request.cr, request.uid, task_ids)
+
         values = website.get_rendering_context({
-            'project_ids': project_obj.browse(request.cr, request.uid, project_ids)
+            'project_id': project,
+            'stages': stages,
         })
         return website.render("website_project.index", values)
diff --git a/addons/website_project/views/website_project.xml b/addons/website_project/views/website_project.xml
index 36e93f56413..3864eb8256a 100644
--- a/addons/website_project/views/website_project.xml
+++ b/addons/website_project/views/website_project.xml
@@ -6,27 +6,51 @@
     <!-- Layout add nav and footer -->
 
     <template id="footer_custom" inherit_id="website.layout" name="Custom Footer">
-        <xpath expr="//body/header//ul[@id='top_menu']/li[last()]" position="before">
-            <li><a href="/projects/">Projects</a></li>
+        <xpath expr="//body/footer//div[@name='info']/ul" position="inside">
+            <li t-foreach="project_ids" t-as="project_id"><a t-attf-href="/project/#{ project_id.id }/"><t t-esc="project_id.name"/></a></li>
         </xpath>
     </template>
 
     <!-- Page --> 
 
-    <template id="index" name="Projects">
+    <template id="index" name="Project">
         <t t-call="website.layout">
-            <t t-set="title">Projects</t>
+            <t t-set="title">Project</t>
             <div class="container">
-                <div t-foreach="project_ids" t-as="project_id">
-                    <h4 t-field="project_id.name"/>
-                    <div t-foreach="project_id.tasks" t-as="task">
-                        <a t-attf-href="/admin#view_type=form&amp;model=project.task&amp;id=#{task.id}"><span t-field="task.name"/></a>
-                    </div>
-                </div>
+                <h4 t-field="project_id.name"/>
+                <table class="table">
+                    <thead>
+                        <tr>
+                            <th t-foreach="stages" t-as="stage">
+                                <span t-field="stage_id.name"/>
+                            </th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr>
+                            <td t-foreach="stages" t-as="stage">
+                                <div t-foreach="task_ids" t-as="task_id" class="thumbnail">
+                                    <a t-attf-href="/task/#{ task_id.id }/"><span t-field="task_id.name"/></a>
+                                    <div>
+                                        Assigned to <span t-field="task_id.user_id"/>
+                                    </div>
+                                    <div>
+                                        <span t-foreach="task_id.categ_ids" t-as="categ_id" class="label">
+                                            <t t-esc="categ_id.name"/>
+                                        </span>
+                                    </div>
+                                    <small>
+                                        <i class="icon-time"></i> <span t-field="task_id.date_start"/><br/>
+                                        <t t-if="task_id.date_end">Ending Date: <span t-field="task_id.date_end"/></t>
+                                    </small>
+                                </div>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
             </div>
         </t>
     </template>
 
-
  </data>
 </openerp>

From 71f2c8ee4b14e33cdf8a54a28a5b3f8b55a1594b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 21 Aug 2013 11:45:50 +0200
Subject: [PATCH 15/24] [IMP] simplify CKEditor's image dialog, implement very
 basic attachment picker

TODO: image picker which isn't just a crappy select, using widget type
      html (?)

bzr revid: xmo@openerp.com-20130821094550-u3k5aaqna7zyl8ek
---
 addons/website/controllers/main.py      | 23 ++++--
 addons/website/static/src/js/website.js | 94 ++++++++++++++++++++++++-
 2 files changed, 109 insertions(+), 8 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index bd3f7285126..04b801715bf 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -27,6 +27,10 @@ def auth_method_public():
 http.auth_methods['public'] = auth_method_public
 
 
+# PIL images have a type flag, but no MIME. Reverse type flag to MIME.
+PIL_MIME_MAPPING = {'PNG': 'image/png', 'JPEG': 'image/jpeg', 'GIF': 'image/gif', }
+# Completely arbitrary limits
+MAX_IMAGE_WIDTH, MAX_IMAGE_HEIGHT = IMAGE_LIMITS = (1024, 768)
 class Website(openerp.addons.web.controllers.main.Home):
     @http.route('/', type='http', auth="admin")
     def index(self, **kw):
@@ -145,15 +149,20 @@ class Website(openerp.addons.web.controllers.main.Home):
         buf = cStringIO.StringIO(base64.decodestring(attachment.datas))
 
         image = Image.open(buf)
-        image.thumbnail((1024, 768), Image.ANTIALIAS)
+        mime = PIL_MIME_MAPPING[image.format]
 
-        response = werkzeug.wrappers.Response(status=200, mimetype={
-            'PNG': 'image/png',
-            'JPEG': 'image/jpeg',
-            'GIF': 'image/gif',
-        }[image.format])
+        w, h = image.size
+        resized = w > MAX_IMAGE_WIDTH or h > MAX_IMAGE_HEIGHT
+
+        # If saving unnecessary, just send the image buffer, don't go through
+        # Image.save() (especially as it breaks animated gifs)
+        if not resized:
+            buf.seek(0)
+            return werkzeug.wrappers.Response(buf, status=200, mimetype=mime)
+
+        image.thumbnail(IMAGE_LIMITS, Image.ANTIALIAS)
+        response = werkzeug.wrappers.Response(status=200, mimetype=mime)
         image.save(response.stream, image.format)
-
         return response
 
     @http.route('/website/image', type='http', auth="public")
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index eb224c7905c..afe7cc53448 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -273,7 +273,7 @@ $(function(){
                     ]},{
                     name: 'span', items: [
                         "Link", "Unlink", "Blockquote", "BulletedList",
-                        "NumberedList", "Indent", "Outdent",
+                        "NumberedList", "Indent", "Outdent"
                     ]},{
                     name: 'justify', items: [
                         "JustifyLeft", "JustifyCenter", "JustifyRight", "JustifyBlock"
@@ -380,5 +380,97 @@ $(function(){
         },
     });
 
+    function noop() {}
+    var alter_dialog = {
+        image: function (definition) {
+            definition.removeContents('Link');
+            definition.removeContents('advanced');
+
+            var upload = definition.getContents('Upload');
+            upload.add({
+                type: 'select',
+                label: 'Existing attachments',
+                id: 'ir_attachment',
+                items: [['']],
+                /**
+                 * On dialog load, fetch all attachments (on ir.ui.view =>
+                 * previously uploaded images) and add them to the select's
+                 * options (items array & add method)
+                 */
+                onLoad: function () {
+                    var field = this;
+
+                    // FIXME: fuck this garbage, also fuck openerp.Model
+                    return openerp.jsonRpc('/web/dataset/call_kw', 'call', {
+                        model: 'ir.attachment',
+                        method: 'search_read',
+                        args: [],
+                        kwargs: {
+                            fields: ['name'],
+                            domain: [['res_model', '=', 'ir.ui.view']],
+                            order: 'name',
+                        }
+                    }).then(function (results) {
+                        _(results).each(function (result) {
+                            field.add(result.name, result.id);
+                        });
+                    });
+                },
+                /**
+                 * The image widgets uses "txtUrl" to do most of its stuff.
+                 * Synchronize select & txtUrl by generating the correct URL
+                 * and setting it there
+                 */
+                onChange: function () {
+                    var id = this.getValue();
+                    var url = this.getDialog().getContentElement('info', 'txtUrl');
+                    if (!id) {
+                        url.setValue('');
+                        return;
+                    }
+
+                    url.setValue('/website/attachment/' + id);
+                },
+            });
+            // Override uploadButton to send its information to the select
+            // created above instead of directly to txtUrl. The select will
+            // propagate to txtUrl
+            upload.get('uploadButton').filebrowser = {
+                onSelect: function (url) {
+                    var id = url.split('/').pop();
+                    var attachments = this.getDialog().getContentElement('Upload', 'ir_attachment');
+                    // TODO: return supplementary info to get image/attachment name?
+                    attachments.add(id, id);
+                    attachments.setValue(id);
+                }
+            };
+
+            var old_show = definition.onShow;
+            definition.onShow = function () {
+                // CKEDITOR does not *override* onShow, is smashes the existing
+                // one instead, so override "by hand"
+                if (old_show) {
+                    old_show.call(this);
+                }
+                // Assloads of code in the image plugin just go and tear into
+                // the info tab without a care, so can't just remove the tab or
+                // its content. Hide the tab instead, the effect is roughly the
+                // same.
+                this.hidePage('info');
+                // Force the dialog to always and only display the Upload tab
+                this.selectPage('Upload');
+                this.on('selectPage', function (e) {
+                    setTimeout(function () {
+                        if (e.data.page !== 'Upload') {
+                            this.selectPage('Upload');
+                        }
+                    }.bind(this), 0);
+                });
+            }
+        }
+    };
+    CKEDITOR.on('dialogDefinition', function (ev) {
+        (alter_dialog[ev.data.name] || noop)(ev.data.definition);
+    })
 });
 

From 2731bc014c859c63417bdc0e15ae1b38e8953733 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 21 Aug 2013 14:13:58 +0200
Subject: [PATCH 16/24] [IMP] mark a bunch of templates as pages, mark all new
 pages as pages on creation

bzr revid: xmo@openerp.com-20130821121358-b6y5d1b8wgz8iyo0
---
 addons/website/controllers/main.py           |  3 ++-
 addons/website/views/views.xml               |  6 +++---
 addons/website_crm/views/website_crm.xml     |  2 +-
 addons/website_event/views/website_event.xml |  4 ++--
 addons/website_hr/views/website_hr.xml       |  2 +-
 addons/website_mail/views/website_mail.xml   |  2 +-
 addons/website_sale/views/website_sale.xml   | 10 +++++-----
 7 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 04b801715bf..2d977287560 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -49,7 +49,8 @@ class Website(openerp.addons.web.controllers.main.Home):
         newview = view.browse(request.cr, request.uid, newview_id, context={})
         newview.write({
             'arch': newview.arch.replace("website.default_page", path),
-            'name': "page/%s" % path
+            'name': "page/%s" % path,
+            'page': True,
         })
         if '.' in path:
             module, idname = path.split('.')
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index 7d75ecde6ba..9db549d334e 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -131,7 +131,7 @@
             </xpath>
         </template>
 
-        <template id="homepage">
+        <template id="homepage" page="True">
             <t t-call="website.layout">
 
                 <section>
@@ -317,7 +317,7 @@
         </template>
 
 
-        <template id="contactus" name="Contact us">
+        <template id="contactus" name="Contact us" page="True">
             <t t-call="website.layout">
                 <t t-set="title">Contact us - <t t-raw="res_company.name"/></t>
                 <div class="container">
@@ -352,7 +352,7 @@
             </t>
         </template>
 
-        <template id="aboutus">
+        <template id="aboutus" page="True">
             <t t-call="website.layout">
                 <t t-set="title">About us - <t t-raw="res_company.name"/></t>
                 <div class="container">
diff --git a/addons/website_crm/views/website_crm.xml b/addons/website_crm/views/website_crm.xml
index 478731db937..5fa7fd5eb83 100644
--- a/addons/website_crm/views/website_crm.xml
+++ b/addons/website_crm/views/website_crm.xml
@@ -43,7 +43,7 @@
             </xpath>
         </template>
 
-        <template id="thanks">
+        <template id="thanks" page="True">
             <t t-call="website.layout">
                 <t t-set="title">Message Sent</t>
                 <div class="container">
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index be9902732f4..15a542921a2 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -15,7 +15,7 @@
 
     <!-- Page --> 
  
-    <template id="index" name="Events">
+    <template id="index" name="Events" page="True">
         <t t-call="website.layout">
             <t t-set="head">
                 <script type="text/javascript" src="/website_hr/static/src/js/website_hr.js"></script>
@@ -108,7 +108,7 @@
         </xpath>
     </template>
 
-    <template id="detail">
+    <template id="detail" page="True">
         <t t-call="website.layout">
             <t t-set="head">
                 <script type="text/javascript" src="/website_event/static/src/js/website_event.js"></script>
diff --git a/addons/website_hr/views/website_hr.xml b/addons/website_hr/views/website_hr.xml
index 024aa3e7b6e..f5923db46a2 100644
--- a/addons/website_hr/views/website_hr.xml
+++ b/addons/website_hr/views/website_hr.xml
@@ -21,7 +21,7 @@
     <!-- Page --> 
 
  
-    <template id="aboutus" inherit_id="website.aboutus">
+    <template id="aboutus" inherit_id="website.aboutus" page="True">
         <xpath expr="//div[@class='span8']" position="inside">
             <t t-set="head">
                 <script type="text/javascript" src="/website_hr/static/src/js/website_hr.js"></script>
diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml
index f77eae83468..7882ba31696 100644
--- a/addons/website_mail/views/website_mail.xml
+++ b/addons/website_mail/views/website_mail.xml
@@ -25,7 +25,7 @@
 
     <!-- Page --> 
 
-    <template id="index" name="Blogs">
+    <template id="index" name="Blogs" page="True">
         <t t-call="website.layout">
             <t t-set="head">
                 <script type="text/javascript" src="/website_mail/static/src/js/blog.js"></script>
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 9f310ce180e..9eef40aab09 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -92,7 +92,7 @@
 
     <!-- Product list --> 
 
-    <template id="products">
+    <template id="products" page="True">
         <t t-call="website_sale.layout">
             <t t-set="title">Product</t>
             <t t-set="shop_content">
@@ -132,7 +132,7 @@
 
     <!-- product --> 
 
-    <template id="product" name="Product">
+    <template id="product" name="Product" page="True">
         <t t-call="website_sale.layout">
             <t t-set="title">Product</t>
             <t t-set="shop_content">
@@ -169,7 +169,7 @@
 
     <!-- Page Shop my cart --> 
 
-    <template id="mycart">
+    <template id="mycart" page="True">
         <t t-call="website_sale.layout">
             <t t-set="title">My cart</t>
             <t t-set="shop_content">
@@ -228,7 +228,7 @@
 
     <!-- Page confirm my cart -->
 
-    <template id="checkout">
+    <template id="checkout" page="True">
         <t t-call="website.layout">
             <t t-set="head">
                 <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
@@ -414,7 +414,7 @@
         </t>
     </template>
 
-    <template id="payment">
+    <template id="payment" page="True">
         <t t-call="website.layout">
             <t t-set="title">Shop - Payment</t>
             <div class="container mt48 oe_website_sale">

From 402ee2b1bcf3717a96124861c1982f690f6e5a2d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 21 Aug 2013 15:59:17 +0200
Subject: [PATCH 17/24] [ADD] pages listing method

bzr revid: xmo@openerp.com-20130821135917-7uztqr3yy7hfzbal
---
 addons/website/website.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/addons/website/website.py b/addons/website/website.py
index 461ad67f86a..ef15e8ae81a 100644
--- a/addons/website/website.py
+++ b/addons/website/website.py
@@ -120,6 +120,29 @@ class website(osv.osv):
 
         return d
 
+    def list_pages(self, cr, uid, context=None):
+        """ Available pages in the website/CMS. This is mostly used for links
+        generation and can be overridden by modules setting up new HTML
+        controllers for dynamic pages (e.g. blog).
+
+        By default, returns template views marked as pages.
+
+        :returns: a list of mappings with two keys: ``name`` is the displayable
+                  name of the resource (page), ``url`` is the absolute URL
+                  of the same.
+        :rtype: list({name: str, url: str})
+        """
+        View = self.pool['ir.ui.view']
+        views = View.search_read(cr, uid, [['page', '=', True]],
+                                 fields=['name'], order='name', context=context)
+        xids = View.get_external_id(cr, uid, [view['id'] for view in views], context=context)
+
+        return [
+            {'name': view['name'], 'url': '/page/' + xids[view['id']]}
+            for view in views
+            if xids[view['id']]
+        ]
+
 
 class res_partner(osv.osv):
     _inherit = "res.partner"

From 7423dd59494990979df47b170400dac36615fe2e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 21 Aug 2013 15:59:31 +0200
Subject: [PATCH 18/24] [REM] page flags on a bunch of templates which turn out
 not to be pages after all

bzr revid: xmo@openerp.com-20130821135931-6ezsw089sju2eyga
---
 addons/website_crm/views/website_crm.xml     | 2 +-
 addons/website_event/views/website_event.xml | 2 +-
 addons/website_hr/views/website_hr.xml       | 2 +-
 addons/website_sale/views/website_sale.xml   | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/website_crm/views/website_crm.xml b/addons/website_crm/views/website_crm.xml
index 5fa7fd5eb83..478731db937 100644
--- a/addons/website_crm/views/website_crm.xml
+++ b/addons/website_crm/views/website_crm.xml
@@ -43,7 +43,7 @@
             </xpath>
         </template>
 
-        <template id="thanks" page="True">
+        <template id="thanks">
             <t t-call="website.layout">
                 <t t-set="title">Message Sent</t>
                 <div class="container">
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 15a542921a2..8a8c987b49a 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -108,7 +108,7 @@
         </xpath>
     </template>
 
-    <template id="detail" page="True">
+    <template id="detail">
         <t t-call="website.layout">
             <t t-set="head">
                 <script type="text/javascript" src="/website_event/static/src/js/website_event.js"></script>
diff --git a/addons/website_hr/views/website_hr.xml b/addons/website_hr/views/website_hr.xml
index f5923db46a2..024aa3e7b6e 100644
--- a/addons/website_hr/views/website_hr.xml
+++ b/addons/website_hr/views/website_hr.xml
@@ -21,7 +21,7 @@
     <!-- Page --> 
 
  
-    <template id="aboutus" inherit_id="website.aboutus" page="True">
+    <template id="aboutus" inherit_id="website.aboutus">
         <xpath expr="//div[@class='span8']" position="inside">
             <t t-set="head">
                 <script type="text/javascript" src="/website_hr/static/src/js/website_hr.js"></script>
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 9eef40aab09..acb9b2803db 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -132,7 +132,7 @@
 
     <!-- product --> 
 
-    <template id="product" name="Product" page="True">
+    <template id="product" name="Product">
         <t t-call="website_sale.layout">
             <t t-set="title">Product</t>
             <t t-set="shop_content">
@@ -228,7 +228,7 @@
 
     <!-- Page confirm my cart -->
 
-    <template id="checkout" page="True">
+    <template id="checkout">
         <t t-call="website.layout">
             <t t-set="head">
                 <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
@@ -414,7 +414,7 @@
         </t>
     </template>
 
-    <template id="payment" page="True">
+    <template id="payment">
         <t t-call="website.layout">
             <t t-set="title">Shop - Payment</t>
             <div class="container mt48 oe_website_sale">

From 93da6f2396857af0c94d4bc53e63f1b092dd9f85 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 21 Aug 2013 16:04:31 +0200
Subject: [PATCH 19/24] [IMP] pager

bzr revid: xmo@openerp.com-20130821140431-xwh2pk6xe880nz1q
---
 addons/website/website.py | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/addons/website/website.py b/addons/website/website.py
index ef15e8ae81a..d0f48a64cb3 100644
--- a/addons/website/website.py
+++ b/addons/website/website.py
@@ -91,19 +91,16 @@ class website(osv.osv):
 
     def pager(self, url, total, page=1, step=30, scope=5, url_args=None):
         # Compute Pager
-        d = {}
-        d["page_count"] = int(math.ceil(float(total) / step))
+        page_count = int(math.ceil(float(total) / step))
 
-        page = max(1, min(int(page), d["page_count"]))
-
-        d["offset"] = (page-1) * step
+        page = max(1, min(int(page), page_count))
         scope -= 1
 
         pmin = max(page - int(math.floor(scope/2)), 1)
-        pmax = min(pmin + scope, d["page_count"])
+        pmax = min(pmin + scope, page_count)
 
         if pmax - pmin < scope:
-            pmin = pmax - scope > 0 and pmax - scope or 1
+            pmin = pmax - scope if pmax - scope > 0 else 1
 
         def get_url(page):
             _url = "%spage/%s/" % (url, page)
@@ -111,14 +108,18 @@ class website(osv.osv):
                 _url = "%s?%s" % (_url, urllib.urlencode(url_args))
             return _url
 
-        d["page"] = {'url': get_url(page), 'num': page}
-        d["page_start"] = {'url': get_url(pmin), 'num': pmin}
-        d["page_end"] = {'url': get_url(min(pmax, page+1)), 'num': min(pmax, page+1)}
-        d["pages"] = []
-        for page in range(pmin, pmax+1):
-            d["pages"].append({'url': get_url(page), 'num': page})
-
-        return d
+        return {
+            "page_count": page_count,
+            "offset": (page - 1) * step,
+            "page": {'url': get_url(page), 'num': page},
+            "page_start": {'url': get_url(pmin), 'num': pmin},
+            "page_end": {'url': get_url(min(pmax, page + 1)),
+                         'num': min(pmax, page + 1)},
+            "pages": [
+                {'url': get_url(page), 'num': page}
+                for page in xrange(pmin, pmax+1)
+            ]
+        }
 
     def list_pages(self, cr, uid, context=None):
         """ Available pages in the website/CMS. This is mostly used for links

From e039e76883ef2d2bcbeaf3090330cc793516a448 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 21 Aug 2013 16:09:53 +0200
Subject: [PATCH 20/24] [IMP] Improved template's t-foreach

You need to pull Rev#4980 of server/trunk-website-al

bzr revid: fme@openerp.com-20130821140953-zb2hdglg1nvp2ckq
---
 addons/website/views/views.xml                |  6 ++--
 .../views/website_contract.xml                | 10 +++---
 addons/website_event/views/website_event.xml  | 36 +++++++++----------
 addons/website_hr/views/website_hr.xml        | 20 +++++------
 .../website_project/views/website_project.xml | 18 +++++-----
 addons/website_sale/views/website_sale.xml    | 10 +++---
 6 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index a2b42cf2f84..bc6c73820c9 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -380,9 +380,9 @@
                     <li t-att-class=" 'disabled' if pager['page']['num'] == 1 else '' " >
                         <a t-att-href=" pager['page_start']['url'] if pager['page']['num'] != 1 else '' ">Prev</a>
                     </li>
-                    <t t-foreach="pager['pages']">
-                        <li t-att-class=" 'active' if num == pager['page']['num'] else '' ">
-                            <a t-att-href="url" t-raw="num"></a>
+                    <t t-foreach="pager['pages']" t-as="page">
+                        <li t-att-class=" 'active' if page['num'] == pager['page']['num'] else '' ">
+                            <a t-att-href="page['url']" t-raw="page['num']"></a>
                         </li>
                     </t>
                     <li t-att-class=" 'disabled' if pager['page']['num'] == pager['page_count'] else '' " >
diff --git a/addons/website_contract/views/website_contract.xml b/addons/website_contract/views/website_contract.xml
index 3ec536d3677..1991de3ec61 100644
--- a/addons/website_contract/views/website_contract.xml
+++ b/addons/website_contract/views/website_contract.xml
@@ -18,15 +18,15 @@
             <t t-set="title">References</t>
             <div class="container">
                 <div class="thumbnails grid grid-align-top">
-                    <div t-foreach="partner_ids" t-as="partner_id" class="span6">
+                    <div t-foreach="partner_ids" t-as="partner" class="span6">
                         <div class="media thumbnail">
                             <a class="pull-left" href="#">
-                                <img class="media-object" t-att-src="partner_id.img('image_small')"/>
+                                <img class="media-object" t-att-src="partner.img('image_small')"/>
                             </a>
                             <div class="media-body">
-                                <t t-call="website.publish"><t t-set="object" t-value="partner_id"/></t>
-                                <h5 class="media-heading" t-field="partner_id.name"/>
-                                <pre t-field="partner_id.website_testimonial"/>
+                                <t t-call="website.publish"><t t-set="object" t-value="partner"/></t>
+                                <h5 class="media-heading" t-field="partner.name"/>
+                                <pre t-field="partner.website_testimonial"/>
                             </div>
                         </div>
                     </div>
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index be9902732f4..1cea730f475 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -43,33 +43,33 @@
                     </div>
                     <div class="span8">
                         <ul class="media-list">
-                            <li t-foreach="event_ids" t-as="event_id" class="media thumbnail">
+                            <li t-foreach="event_ids" t-as="event" class="media thumbnail">
                                 <div class="media-body">
-                                    <span t-if="not event_id.event_ticket_ids" class="label pull-right">No tickets needed.</span>
-                                    <t t-if="event_id.event_ticket_ids">
-                                        <span t-if="event_id.register_avail == 9999" class="label pull-right label-info">Tickets availables.</span>
-                                        <span t-if="not event_id.register_avail" class="label pull-right">No ticket available.</span>
-                                        <span t-if="event_id.register_avail and 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>
+                                    <span t-if="not event.event_ticket_ids" class="label pull-right">No tickets needed.</span>
+                                    <t t-if="event.event_ticket_ids">
+                                        <span t-if="event.register_avail == 9999" class="label pull-right label-info">Tickets availables.</span>
+                                        <span t-if="not event.register_avail" class="label pull-right">No ticket available.</span>
+                                        <span t-if="event.register_avail and event.register_avail != 9999" t-att-class="'label pull-right label-%%s' %% (event.register_avail &lt;= 10 and 'warning' or 'info')">
+                                            <t t-if="event.register_avail &lt;= 10">Only</t>
+                                            <t t-esc="event.register_avail"/>
+                                            <t t-if="event.register_avail &gt; 1">tickets</t>
+                                            <t t-if="event.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>
-                                    <t t-call="website.publish"><t t-set="object" t-value="event_id"/></t>
+                                    <h4 class="media-heading"><a t-att-href="'/event/%%s/' %% event.id"><span t-field="event.name"> </span></a></h4>
+                                    <t t-call="website.publish"><t t-set="object" t-value="event"/></t>
                                     <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>
+                                        <span t-field="event.type">: </span>
+                                        <t t-if="event.user_id">
+                                            Organized by: <span t-field="event.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>
+                                        <i class="icon-time"></i> <span t-field="event.date_begin"> </span> <i>to</i> <span t-field="event.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 t-if="event.country_id">
+                                        <i class="icon-map-marker"></i> <span t-field="event.city"> </span>  <span t-field="event.zip"> </span>, <span t-field="event.country_id"> </span>
                                     </div>
                                 </div>
                             </li>
diff --git a/addons/website_hr/views/website_hr.xml b/addons/website_hr/views/website_hr.xml
index 024aa3e7b6e..3f5c07dc980 100644
--- a/addons/website_hr/views/website_hr.xml
+++ b/addons/website_hr/views/website_hr.xml
@@ -29,20 +29,20 @@
             </t>
             <h3>Our team</h3>
             <div class="thumbnails">
-                <div t-foreach="employee_ids" t-as="employee_id" class="span4 mt16">
+                <div t-foreach="employee_ids" t-as="employee" class="span4 mt16">
                     <div class="media thumbnail">
                         <a class="pull-left" href="#">
-                            <img class="media-object" t-att-src="employee_id.img('image_small')"/>
+                            <img class="media-object" t-att-src="employee.img('image_small')"/>
                         </a>
                         <div class="media-body">
-                            <t t-call="website.publish"><t t-set="object" t-value="employee_id"/></t>
-                            <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"/>
+                            <t t-call="website.publish"><t t-set="object" t-value="employee"/></t>
+                            <h5 class="media-heading" t-field="employee.name"/>
+                            <div t-field="employee.department_id"/>
+                            <div t-field="employee.job_id"/>
+                            <div t-field="employee.work_location"/>
+                            <div t-field="employee.work_phone"/>
+                            <div t-field="employee.work_email"/>
+                            <div t-field="employee.public_info"/>
                         </div>
                     </div>
                 </div>
diff --git a/addons/website_project/views/website_project.xml b/addons/website_project/views/website_project.xml
index 3864eb8256a..b05b19fd0bf 100644
--- a/addons/website_project/views/website_project.xml
+++ b/addons/website_project/views/website_project.xml
@@ -7,7 +7,7 @@
 
     <template id="footer_custom" inherit_id="website.layout" name="Custom Footer">
         <xpath expr="//body/footer//div[@name='info']/ul" position="inside">
-            <li t-foreach="project_ids" t-as="project_id"><a t-attf-href="/project/#{ project_id.id }/"><t t-esc="project_id.name"/></a></li>
+            <li t-foreach="project_ids" t-as="project"><a t-attf-href="/project/#{ project.id }/"><t t-esc="project.name"/></a></li>
         </xpath>
     </template>
 
@@ -21,7 +21,7 @@
                 <table class="table">
                     <thead>
                         <tr>
-                            <th t-foreach="stages" t-as="stage">
+                            <th t-foreach="stages">
                                 <span t-field="stage_id.name"/>
                             </th>
                         </tr>
@@ -29,19 +29,19 @@
                     <tbody>
                         <tr>
                             <td t-foreach="stages" t-as="stage">
-                                <div t-foreach="task_ids" t-as="task_id" class="thumbnail">
-                                    <a t-attf-href="/task/#{ task_id.id }/"><span t-field="task_id.name"/></a>
+                                <div t-foreach="stage['task_ids']" t-as="task" class="thumbnail">
+                                    <a t-attf-href="/task/#{ task.id }/"><span t-field="task.name"/></a>
                                     <div>
-                                        Assigned to <span t-field="task_id.user_id"/>
+                                        Assigned to <span t-field="task.user_id"/>
                                     </div>
                                     <div>
-                                        <span t-foreach="task_id.categ_ids" t-as="categ_id" class="label">
-                                            <t t-esc="categ_id.name"/>
+                                        <span t-foreach="task.categ_ids" t-as="categ" class="label">
+                                            <t t-esc="categ.name"/>
                                         </span>
                                     </div>
                                     <small>
-                                        <i class="icon-time"></i> <span t-field="task_id.date_start"/><br/>
-                                        <t t-if="task_id.date_end">Ending Date: <span t-field="task_id.date_end"/></t>
+                                        <i class="icon-time"></i> <span t-field="task.date_start"/><br/>
+                                        <t t-if="task.date_end">Ending Date: <span t-field="task.date_end"/></t>
                                     </small>
                                 </div>
                             </td>
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index cf71349a75c..c3c7d841cc4 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -269,18 +269,18 @@
                     </tr>
                 </thead>
                 <tbody>
-                    <t t-foreach="suggested_products" t-as="product_id">
+                    <t t-foreach="suggested_products" t-as="product">
                         <tr>
                             <td>
-                                <a t-attf-href="/shop/product/#{ product_id.id }/"><span t-field="product_id.name"/></a><br/>
-                                <small t-field="product_id.description_sale"/>
+                                <a t-attf-href="/shop/product/#{ product.id }/"><span t-field="product.name"/></a><br/>
+                                <small t-field="product.description_sale"/>
                             </td>
                             <td>
-                               <span t-field="product_id.list_price"></span>€
+                               <span t-field="product.list_price"></span>€
                             </td>
                             <td>
                                 <div class="pull-right">
-                                    <a t-attf-href="./add_cart/#{ product_id.id }/" class="btn btn-small btn-success">+</a>
+                                    <a t-attf-href="./add_cart/#{ product.id }/" class="btn btn-small btn-success">+</a>
                                 </div>
                             </td>
                         </tr>

From 92a20deca88dd925bb0d341543216bacc3ce689f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 21 Aug 2013 16:31:52 +0200
Subject: [PATCH 21/24] [ADD] simplified link dialog + link to existing pages
 dropdown

TODO: better UI, create new page, correct selection when reopen dialog

bzr revid: xmo@openerp.com-20130821143152-o3lawyupxcssuq2v
---
 addons/website/static/src/js/website.js | 47 +++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index afe7cc53448..c7c80fd9b09 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -467,6 +467,53 @@ $(function(){
                     }.bind(this), 0);
                 });
             }
+        },
+        link: function (definition) {
+            definition.removeContents('target');
+            definition.removeContents('advanced');
+
+            var info = definition.getContents('info');
+            info.remove('linkType');
+            info.remove('anchorOptions');
+            info.remove('emailOptions');
+
+            info.get('urlOptions').children[0].widths = [ '0%', '100%' ];
+            info.get('protocol').style = 'display: none';
+            // TODO: sync edition of url to website_pages?
+            info.add({
+                type: 'select',
+                label: "Existing page",
+                id: 'website_pages',
+                items: [['']],
+                /**
+                 * onload fetch all the pages existing in the website, then
+                 * display that.
+                 */
+                onLoad: function () {
+                    var field = this;
+
+                    return openerp.jsonRpc('/web/dataset/call_kw', 'call', {
+                        model: 'website',
+                        method: 'list_pages',
+                        args: [],
+                        kwargs: {}
+                    }).then(function (results) {
+                        _(results).each(function (result) {
+                            field.add(result.name, result.url);
+                        });
+                    });
+                },
+                onChange: function () {
+                    var url = this.getValue();
+                    var url_field = this.getDialog().getContentElement('info', 'url');
+                    if (!url) {
+                        url_field.setValue('');
+                        return;
+                    }
+
+                    url_field.setValue(url);
+                }
+            })
         }
     };
     CKEDITOR.on('dialogDefinition', function (ev) {

From 98f19d88906a278685c172f0134cf44f0ff63a35 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 21 Aug 2013 16:57:31 +0200
Subject: [PATCH 22/24] [IMP] Improved string interpolation in templates

bzr revid: fme@openerp.com-20130821145731-kkw9sxiv6oqz65qk
---
 addons/website/views/views.xml               |  4 ++--
 addons/website_event/views/website_event.xml | 18 +++++++++---------
 addons/website_mail/views/website_mail.xml   | 14 +++++++-------
 addons/website_sale/views/website_sale.xml   |  2 +-
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index d3bda075b37..ee2b6b4f52e 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -394,8 +394,8 @@
 
         <template id="publish">
             <a href="#" t-att-data-id="object.id" t-att-data-object="object._name" class="pull-right" t-if="editable" t-ignore="true">
-                <span t-att-class="'label label-success js_unpublish %%s' %% (not object.website_published and 'hidden' or '')">Unpublish</span>
-                <span t-att-class="'label label-important js_publish %%s' %% (object.website_published and 'hidden' or '')">Publish</span>
+                <span t-attf-class="label label-success js_unpublish #{ '' if object.website_published else 'hidden' }">Unpublish</span>
+                <span t-attf-class="label label-important js_publish #{ 'hidden' if object.website_published else '' }">Publish</span>
             </a>
         </template>
 
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 4ccd0c31948..7c05419d15a 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -29,7 +29,7 @@
                             <li class="nav-header">Date</li>
                             <t t-foreach="dates" t-as="date">
                                 <li t-att-class="searches.get('date') == date[0] and 'active' or ''">
-                                    <a  t-att-href="'/event/%%s&amp;date=%%s' %% (search_path, date[0])"><t t-esc="date[1]"/> <small t-if="date[3]">(<t t-esc="date[3]"/>)</small></a>
+                                    <a t-attf-href="/event/#{ search_path }&amp;date=#{ date[0] }"><t t-esc="date[1]"/> <small t-if="date[3]">(<t t-esc="date[3]"/>)</small></a>
                                 </li>
                             </t>
                         </ul>
@@ -49,7 +49,7 @@
                                     <t t-if="event.event_ticket_ids">
                                         <span t-if="event.register_avail == 9999" class="label pull-right label-info">Tickets availables.</span>
                                         <span t-if="not event.register_avail" class="label pull-right">No ticket available.</span>
-                                        <span t-if="event.register_avail and event.register_avail != 9999" t-att-class="'label pull-right label-%%s' %% (event.register_avail &lt;= 10 and 'warning' or 'info')">
+                                        <span t-if="event.register_avail and event.register_avail != 9999" t-attf-class="label pull-right label-#{ event.register_avail &lt;= 10 and 'warning' or 'info' }">
                                             <t t-if="event.register_avail &lt;= 10">Only</t>
                                             <t t-esc="event.register_avail"/>
                                             <t t-if="event.register_avail &gt; 1">tickets</t>
@@ -57,7 +57,7 @@
                                             available.
                                         </span>
                                     </t>
-                                    <h4 class="media-heading"><a t-att-href="'/event/%%s/' %% event.id"><span t-field="event.name"> </span></a></h4>
+                                    <h4 class="media-heading"><a t-attf-href="/event/#{ event.id }/"><span t-field="event.name"> </span></a></h4>
                                     <t t-call="website.publish"><t t-set="object" t-value="event"/></t>
                                     <div>
                                         <span t-field="event.type">: </span>
@@ -89,7 +89,7 @@
                 <li class="nav-header">Category</li>
                 <t t-foreach="types">
                     <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>
+                        <a t-attf-href="/event/#{ search_path }&amp;type=#{ type[0] }"><t t-esc="type[1]"/> <small>(<t t-esc="type_count"/>)</small></a>
                     </li>
                 </t>
             </ul>
@@ -101,7 +101,7 @@
                 <li class="nav-header">Location</li>
                 <t t-foreach="countries">
                     <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>
+                        <a t-attf-href="/event/#{ search_path }&amp;country=#{ country_id[0] }"><t t-esc="country_id[1]"/><small>(<t t-esc="country_id_count"/>)</small></a>
                     </li>
                 </t>
             </ul>
@@ -138,7 +138,7 @@
                             <t t-if="event_id.event_ticket_ids">
                                 <span t-if="event_id.register_avail == 9999" class="label pull-right">Tickets availables.</span>
                                 <span t-if="not event_id.register_avail" class="label pull-right">No ticket available.</span>
-                                <span t-if="event_id.register_avail and event_id.register_avail != 9999" t-att-class="'label pull-right label-%%s' %% (event_id.register_avail &lt;= 10 and 'warning' or 'info')">
+                                <span t-if="event_id.register_avail and event_id.register_avail != 9999" t-attf-class="label pull-right label-#{ 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>
@@ -146,7 +146,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-attf-href="/event/#{ event_id.id }/"><span t-field="event_id.name"> </span></a></h4>
                             <t t-call="website.publish"><t t-set="object" t-value="event_id"/></t>
                             <h5 class="media-heading">
                                 <span t-field="event_id.address_id"/><br/>
@@ -154,7 +154,7 @@
                                 <i class="icon-time"></i> <span t-field="event_id.date_end"/>
                             </h5>
                             <h4 t-if="event_id.event_ticket_ids">Ticket Information</h4>
-                            <form t-att-action="'/event/%%s/add_cart' %% event_id.id" method="post" t-if="event_id.event_ticket_ids">
+                            <form t-attf-action="/event/#{ event_id.id }/add_cart" method="post" t-if="event_id.event_ticket_ids">
                                 <table class="table">
                                     <thead>
                                         <tr>
@@ -172,7 +172,7 @@
                                             <td t-field="ticket.price"/>
                                             <td><span t-if="ticket.register_max"><t t-esc="ticket.register_current"/>/<t t-field="ticket.register_max"/></span></td>
                                             <td>
-                                                <select t-if="ticket.register_avail" t-att-name="'ticket-%%s' %% ticket.id">
+                                                <select t-if="ticket.register_avail" t-attf-name="ticket- #{ ticket.id }">
                                                     <t t-foreach="range(0, ticket.register_avail > 9 and 10 or ticket.register_avail+1 )" t-as="nb"><option t-esc="nb"/></t>
                                                 </select>
                                                 <span t-if="not ticket.register_avail">Not ticket available</span>
diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml
index 236da4b3817..b96c58fff6d 100644
--- a/addons/website_mail/views/website_mail.xml
+++ b/addons/website_mail/views/website_mail.xml
@@ -34,7 +34,7 @@
             <div class="container mt48 js_website_mail">
                 <div class="row">
                     <div class="span4" id="left_column">
-                        <a t-if="mail_group_id and editable" t-att-href="'/blog/%%s/new' %% mail_group_id" class="btn">Add a new Blog</a>
+                        <a t-if="mail_group_id and editable" t-attf-href="/blog/#{ mail_group_id }/new" class="btn">Add a new Blog</a>
 
                         <div id="blog_subscribe">
                             <form action="./subscribe" method="POST" class="form-inline" t-if="not subscribe">
@@ -69,7 +69,7 @@
                                         </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">
+                                <form id="post" t-attf-action="/blog/#{ blog_id.res_id }/#{ blog_id.id }/post#post" method="POST" class="form-horizontal text-center" groups="group_website_mail_reply">
                                     <textarea rows="4" placeholder="Your comment" class="span7"> </textarea>
                                     <button type="submit" class="btn">Post your comment</button>
                                 </form>
@@ -80,14 +80,14 @@
                     <div class="span8" t-if="not blog_id and blog_ids">
                         <ul class="media-list">
                             <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 '')">
+                                <div t-attf-class="media-body #{ 'css_published' if blog.website_published else '' }">
                                     <t t-call="website.publish"><t t-set="object" t-value="blog"/></t>
-                                    <h4 class="media-heading" ><a t-att-href="'/blog/%%s/%%s#comment' %% (blog.res_id, blog.id)" t-field="blog.subject"></a></h4>
+                                    <h4 class="media-heading" ><a t-attf-href="/blog/#{ blog.res_id }/#{ blog.id }#comment" 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#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>
+                                            <a t-if="len(blog.child_ids) &lt;= 1" t-attf-href="/blog/#{ blog.res_id }/#{ blog.id }#comment"><t t-esc="len(blog.child_ids)"/> Comment</a>
+                                            <a t-if="len(blog.child_ids) > 1" t-attf-href="/blog/#{ blog.res_id }/#{ blog.id }#comment"><t t-esc="len(blog.child_ids)"/> Comments</a>
                                         </small>
                                         <small class="pull-right muted text-right">
                                             <div t-field="blog.author_id"/>
@@ -109,7 +109,7 @@
     <template id="blog_history" inherit_id="website_mail.index" inherit_option_id="website_mail.index" name="History">
         <xpath expr="//div[@id='left_column']" position="inside">
             <ul class="nav nav-list">    
-                <li class="nav-header"><a t-att-href="'/blog/%%s/' %% mail_group_id">BLOG ARCHIVE</a></li>
+                <li class="nav-header"><a t-attf-href="/blog/#{ 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]"/>
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 77ae340fc30..3bcd38c76c4 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -356,7 +356,7 @@
                     </div>
                     <form class="span8 form-horizontal" action="/shop/confirm_order/" method="post">
                         <div class=" row">
-                            <a t-if="not partner" t-att-href="'/admin#action=redirect&amp;url=%%s/shop/checkout/' %% host_url" class="btn btn-primary">Log me, I have an account</a>
+                            <a t-if="not partner" t-attf-href="/admin#action=redirect&amp;url=#{ host_url }/shop/checkout/" class="btn btn-primary">Log me, I have an account</a>
                             <h3 class="span8">Billing Information</h3>
                              <div t-attf-class="control-group #{error.get('name', '')}">
                                 <label class="control-label" for="contact_name">Name and firstname</label>

From b806728af122b2e7b5d796d0d719950732e17faf Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 21 Aug 2013 18:06:32 +0200
Subject: [PATCH 23/24] [IMP] website: create generic kanban view

bzr revid: chm@openerp.com-20130821160632-tsl5v1l5cj10w92c
---
 addons/website/controllers/main.py            |   4 +
 addons/website/views/views.xml                | 120 ++++++++++++++++++
 addons/website/website.py                     |  83 +++++++++++-
 addons/website_project/controllers/main.py    |  10 --
 .../website_project/views/website_project.xml |  53 ++++----
 5 files changed, 226 insertions(+), 44 deletions(-)

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 2d977287560..0199c3cc1c5 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -218,4 +218,8 @@ class Website(openerp.addons.web.controllers.main.Home):
 
         return obj.website_published and "1" or "0"
 
+    @http.route(['/website/kanban/'], type='http', auth="public")
+    def kanban(self, **post):
+        return request.registry['website'].kanban_col(**post)
+
 # vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index ee2b6b4f52e..ff2253ef8ef 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -421,5 +421,125 @@
 
         </template>
 
+
+        <template id="kanban">
+            <t t-set="step"><t t-esc="step or 0"/></t>
+            <t t-set="scope"><t t-esc="scope or 0"/></t>
+            <t t-set="orderby"><t t-esc="orderby or 'name'"/></t>
+            <t t-raw="snipped['kanban'](model, domain, column, content, step=step, scope=scope, orderby=orderby)"/>
+        </template>
+
+        <template id="kanban_contain">
+            <table class="table">
+                <thead>
+                    <tr>
+                        <t t-set="width" t-value="'%%s%%%%' % (100/len(objects))"/>
+                        <t t-foreach="objects">
+                        <th t-att-width="width">
+                            <div t-field="column_id.name" class="text-center"/>
+                        </th>
+                        </t>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <t t-foreach="objects">
+
+                        <t t-set="pager">
+                            <div t-if="1 != page_end" class="pagination pagination-centered">
+                                <ul>
+                                    <li t-attf-class="prev #{'active' if page == 1 else '' }" >
+                                        <a t-att-href=" '%s,%s-%s' % (kanban_url, column_id.id, (page &gt; 1 and page-1 or 1)) ">Prev</a>
+                                    </li>
+                                    <t t-foreach="range(page_start, page_end+1)" t-as="p">
+                                    <li t-att-class=" 'active' if page == p else '' ">
+                                        <a t-att-href=" '%s,%s-%s' % (kanban_url, column_id.id, p)" t-esc="p"/>
+                                    </li>
+                                    </t>
+                                    <li t-attf-class="next #{'active' if page == page_end else '' }" >
+                                        <a t-att-href=" '%s,%s-%s' % (kanban_url, column_id.id, (page &lt; page_end and page+1 or page_end) )">Next</a>
+                                    </li>
+                                </ul>
+                            </div>
+                        </t>
+
+                        <td class="js_kanban_col"
+                                t-att-data-content="content"
+                                t-att-data-domain="domain"
+                                t-att-data-page_count="page_count"
+                                t-att-data-model="model"
+                                t-att-data-step="step"
+                                t-att-data-orderby="orderby">
+                            <t t-raw="pager"/>
+                            <div t-foreach="object_ids" t-as="object_id" class="thumbnail">
+                                <t t-call="website_project.kanban_card"/>
+                            </div>
+                            <t t-raw="pager"/>
+                        </td>
+
+                        </t>
+                    </tr>
+                </tbody>
+            </table>
+<script>
+
+$('.js_kanban_col').each(function () {
+    var $col = $(this);
+    var $pagination = $('.pagination', $col);
+    if(!$pagination.size()) {
+        return;
+    }
+    
+    var page_count =  $col.data('page_count');
+    var scope = $pagination.first().find("li").size()-2;
+    var kanban_url_col = $pagination.find("li a:first").attr("href").replace(/[0-9]+$/, '');
+
+    var data = {
+        'domain': $col.data('domain'),
+        'model': $col.data('model'),
+        'content': $col.data('content'),
+        'step': $col.data('step'),
+        'orderby': $col.data('orderby')
+    };
+
+    $pagination.on('click', 'a', function (ev) {
+        ev.preventDefault();
+        var $a = $(ev.target);
+        if($a.hasClass('active')) {
+            return;
+        }
+
+        var page = +$a.attr("href").split(",").pop().split('-')[1];
+        data['page'] = page;
+
+        $.post('/website/kanban/', data, function (col) {
+            $col.find("&gt; .thumbnail").remove();
+            $pagination.first().after('<div class="thumbnail">'+col+'</div>');
+        });
+
+        var page_start = page - parseInt(Math.floor((scope-1)/2));
+        if (page_start &lt; 1 ) page_start = 1;
+        var page_end = page_start + (scope-1);
+        if (page_end &gt; page_count ) page_end = page_count;
+
+        if (page_end - page_start &lt; scope) {
+            page_start = page_end - scope &gt; 0 ? page_end - scope : 1;
+        }
+
+        $pagination.find('li.prev a').attr("href", kanban_url_col+(page-1 > 0 ? page-1 : 1));
+        $pagination.find('li.next a').attr("href", kanban_url_col+(page+1));
+        for(var i=0; i &lt; scope; i++) {
+            $pagination.find('li:not(.prev):not(.next):eq('+i+') a').attr("href", kanban_url_col+(page_start+i)).html(page_start+i);
+        }
+        $pagination.find('li.active').removeClass('active');
+        $pagination.find('li:has(a[href="'+kanban_url_col+page+'"])').addClass('active');
+
+    });
+
+});
+</script>
+        </template>
+
+
      </data>
 </openerp>
diff --git a/addons/website/website.py b/addons/website/website.py
index 1a23f2b3cc5..e238db562c6 100644
--- a/addons/website/website.py
+++ b/addons/website/website.py
@@ -9,6 +9,7 @@ from openerp.addons.web.http import request
 import urllib
 import math
 import traceback
+from openerp.tools.safe_eval import safe_eval
 
 import logging
 logger = logging.getLogger(__name__)
@@ -63,6 +64,9 @@ class website(osv.osv):
             'host_url': request.httprequest.host_url,
             'res_company': request.registry['res.company'].browse(request.cr, openerp.SUPERUSER_ID, 1),
             'json': simplejson,
+            'snipped': {
+                'kanban': self.kanban
+            }
         }
         if additional_values:
             values.update(additional_values)
@@ -75,10 +79,10 @@ class website(osv.osv):
         }
         try:
             return view.render(request.cr, request.uid, template, values, context=context)
-        except (osv.except_osv, orm.except_orm), err:
-            logger.error(err)
-            values['error'] = err[1]
-            return self.render('website.401', values)
+        # except (osv.except_osv, orm.except_orm), err:
+        #     logger.error(err)
+        #     values['error'] = err[1]
+        #     return self.render('website.401', values)
         # except ValueError:
         #     logger.error("Website Rendering Error.\n\n%s" % (traceback.format_exc()))
         #     return self.render('website.404', values)
@@ -146,6 +150,77 @@ class website(osv.osv):
             if xids[view['id']]
         ]
 
+    def kanban(self, model, domain, column, content, step=None, scope=None, orderby=None):
+        step = step and int(step) or 10
+        scope = scope and int(scope) or 5
+        orderby = orderby or "name"
+
+        get_args = dict(request.httprequest.args or {})
+        model_obj = request.registry[model]
+        relation = model_obj._columns.get(column)._obj
+        relation_obj = request.registry[relation]
+
+        get_args.setdefault('kanban', "")
+        kanban = get_args.pop('kanban')
+        kanban_url = "?%s&kanban=" % urllib.urlencode(get_args)
+
+        pages = {}
+        for col in kanban.split(","):
+            if col:
+                col = col.split("-")
+                pages[int(col[0])] = int(col[1])
+
+        objects = []
+        for group in model_obj.read_group(request.cr, request.uid, domain, ["id", column], groupby=column):
+            obj = {}
+
+            # browse column
+            relation_id = group[column][0]
+            obj['column_id'] = relation_obj.browse(request.cr, request.uid, relation_id)
+
+            obj['kanban_url'] = kanban_url
+            for k, v in pages.items():
+                if k != relation_id:
+                    obj['kanban_url'] += "%s-%s" % (k, v)
+
+            # pager
+            number = model_obj.search(request.cr, request.uid, group['__domain'], count=True)
+            obj['page'] = pages.get(relation_id) or 1
+            obj['page_count'] = int(math.ceil(float(number) / step))
+            offset = (obj['page']-1) * step
+            obj['page_start'] = max(obj['page'] - int(math.floor((scope-1)/2)), 1)
+            obj['page_end'] = min(obj['page_start'] + (scope-1), obj['page_count'])
+
+            # view data
+            obj['domain'] = group['__domain']
+            obj['model'] = model
+            obj['step'] = step
+            obj['orderby'] = orderby
+
+            # browse objects
+            object_ids = model_obj.search(request.cr, request.uid, group['__domain'], limit=step, offset=offset, order=orderby)
+            obj['object_ids'] = model_obj.browse(request.cr, request.uid, object_ids)
+
+            objects.append(obj)
+
+        values = self.get_rendering_context({
+            'objects': objects,
+            'range': range,
+            'content': content,
+        })
+        return self.render("website.kanban_contain", values)
+
+    def kanban_col(self, model, domain, page, content, step, orderby):
+        html = ""
+        model_obj = request.registry[model]
+        domain = safe_eval(domain)
+        step = int(step)
+        offset = (int(page)-1) * step
+        object_ids = model_obj.search(request.cr, request.uid, domain, limit=step, offset=offset, order=orderby)
+        object_ids = model_obj.browse(request.cr, request.uid, object_ids)
+        for object_id in object_ids:
+            html += self.render(content, self.get_rendering_context({'object_id': object_id}))
+        return html
 
 class res_partner(osv.osv):
     _inherit = "res.partner"
diff --git a/addons/website_project/controllers/main.py b/addons/website_project/controllers/main.py
index b2eba78720e..1d87564bfa9 100644
--- a/addons/website_project/controllers/main.py
+++ b/addons/website_project/controllers/main.py
@@ -24,20 +24,10 @@ class website_project(http.Controller):
     def blog(self, project_id=None, **post):
         website = request.registry['website']
         project_obj = request.registry['project.project']
-        task_obj = request.registry['project.task']
-        stage_obj = request.registry['project.task.type']
 
         project = project_obj.browse(request.cr, request.uid, project_id)
 
-        domain = [('id', 'in', [task.id for task in project.tasks])]
-        stages = task_obj.read_group(request.cr, request.uid, domain, ["id", "stage_id"], groupby="stage_id")
-        for stage in stages:
-            stage['stage_id'] = stage_obj.browse(request.cr, request.uid, stage['stage_id'][0])
-            task_ids = task_obj.search(request.cr, request.uid, stage['__domain'])
-            stage['task_ids'] = task_obj.browse(request.cr, request.uid, task_ids)
-
         values = website.get_rendering_context({
             'project_id': project,
-            'stages': stages,
         })
         return website.render("website_project.index", values)
diff --git a/addons/website_project/views/website_project.xml b/addons/website_project/views/website_project.xml
index b05b19fd0bf..ae1b513da86 100644
--- a/addons/website_project/views/website_project.xml
+++ b/addons/website_project/views/website_project.xml
@@ -13,41 +13,34 @@
 
     <!-- Page --> 
 
+
+    <template id="kanban_card" name="Project">
+        <a t-attf-href="/task/#{ object_id.id }/"><span t-field="object_id.name"/></a>
+        <div>
+            Assigned to <span t-field="object_id.user_id"/>
+        </div>
+        <div>
+            <span t-foreach="object_id.categ_ids" t-as="categ_id" class="label">
+                <t t-esc="categ_id.name"/>
+            </span>
+        </div>
+        <small>
+            <i class="icon-time"></i> <span t-field="object_id.date_start"/><br/>
+            <t t-if="object_id.date_end">Ending Date: <span t-field="object_id.date_end"/></t>
+        </small>
+    </template>
+
     <template id="index" name="Project">
         <t t-call="website.layout">
             <t t-set="title">Project</t>
             <div class="container">
                 <h4 t-field="project_id.name"/>
-                <table class="table">
-                    <thead>
-                        <tr>
-                            <th t-foreach="stages">
-                                <span t-field="stage_id.name"/>
-                            </th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr>
-                            <td t-foreach="stages" t-as="stage">
-                                <div t-foreach="stage['task_ids']" t-as="task" class="thumbnail">
-                                    <a t-attf-href="/task/#{ task.id }/"><span t-field="task.name"/></a>
-                                    <div>
-                                        Assigned to <span t-field="task.user_id"/>
-                                    </div>
-                                    <div>
-                                        <span t-foreach="task.categ_ids" t-as="categ" class="label">
-                                            <t t-esc="categ.name"/>
-                                        </span>
-                                    </div>
-                                    <small>
-                                        <i class="icon-time"></i> <span t-field="task.date_start"/><br/>
-                                        <t t-if="task.date_end">Ending Date: <span t-field="task.date_end"/></t>
-                                    </small>
-                                </div>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
+                <t t-call="website.kanban">
+                    <t t-set="model">project.task</t>
+                    <t t-set="domain" t-value="[('project_id', '=', project_id.id)]"/>
+                    <t t-set="column">stage_id</t>
+                    <t t-set="content">website_project.kanban_card</t>
+                </t>
             </div>
         </t>
     </template>

From 5848dc526f3f0b502e6952b2f74ea26c66509061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Wed, 21 Aug 2013 18:25:34 +0200
Subject: [PATCH 24/24] [IMP] website: basics of snippet system are now working
 and looking good

bzr revid: fva@openerp.com-20130821162534-yr6nx292xoj2m2s2
---
 addons/website/static/src/css/editor.css  | 93 +++++++++++++++-------
 addons/website/static/src/css/editor.sass | 93 +++++++++++++++-------
 addons/website/static/src/js/website.js   | 21 +++--
 addons/website/views/views.xml            | 96 ++++++++++++++++++++---
 4 files changed, 226 insertions(+), 77 deletions(-)

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index 1416a4db2d8..d446d14f3bc 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -63,49 +63,84 @@
   left: 0px;
   right: 0px;
   bottom: 0px;
-  height: 120px;
-  background: black;
+  max-height: 280px;
+  min-height: 140px;
+  background: #282828;
+  box-shadow: 0px 10px 10px -10px black inset;
+  overflow-y: auto;
 }
-.oe_snippets .oe_snippet {
-  display: inline;
-}
-.oe_snippets .oe_snippet .oe_snippet_thumbnail {
+
+.oe_snippet {
   display: inline-block;
-  background: red;
-  width: 100px;
-  height: 100px;
+  vertical-align: top;
+  background: white;
+  width: 120px;
+  height: 120px;
   border-radius: 3px;
   margin: 10px;
+  margin-right: 0px;
   cursor: move;
+  position: relative;
+  box-shadow: 0px 3px 10px rgba(0, 0, 0, 0.2);
+  overflow: hidden;
+  -webkit-user-select: none;
+  user-select: none;
 }
-.oe_snippets .oe_snippet .oe_snippet_body {
+.oe_snippet .oe_snippet_thumbnail.oe_label {
+  text-align: center;
+  background: #747474;
+  background-image: radial-gradient(rgba(0, 0, 0, 0.25), rgba(0, 0, 0, 0.4));
+  height: 100%;
+  line-height: 120px;
+  color: white;
+  text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.95);
+}
+.oe_snippet .oe_snippet_body {
   display: none;
 }
+.oe_snippet > * {
+  pointer-events: none;
+}
+.oe_snippet > *:first-child:not(.oe_snippet_thumbnail) {
+  display: block;
+  -webkit-transform-origin-x: 5px;
+  -webkit-transform-origin-y: 10px;
+  -webkit-transform: scale(0.095);
+}
 
 .oe_drop_zone {
   display: block;
-  background: rgba(255, 0, 0, 0.25);
-  border: solid 1px rgba(255, 0, 0, 0.5);
-  height: 30px;
+  background: rgba(153, 0, 255, 0.17);
+  border-radius: 3px;
+  height: 32px;
   margin: -16px 0px;
+  -webkit-transition: margin 250ms linear;
 }
-.oe_drop_zone.oe_inline {
-  display: inline;
-  height: auto;
-  width: 30px;
-  margin: 0px -16px;
+.oe_drop_zone:first-child:not(:last-child) {
+  margin-top: -8px;
+  margin-bottom: -24px;
 }
-.oe_drop_zone.oe_float_left {
-  float: left;
-}
-.oe_drop_zone.oe_float_right {
-  float: right;
-}
-.oe_drop_zone:hover {
-  background: rgba(255, 0, 0, 0.5);
-  border: solid 1px red;
+.oe_drop_zone:last-child:not(:first-child) {
+  margin-top: -24px;
+  margin-bottom: -8px;
 }
 .oe_drop_zone.oe_hover {
-  background: rgba(0, 255, 0, 0.5);
-  border: solid 1px green;
+  background: rgba(0, 255, 133, 0.22);
+  z-index: 100000;
+}
+.oe_drop_zone:before {
+  content: "";
+  display: block;
+  border-top: dashed 2px rgba(209, 178, 255, 0.72);
+  position: relative;
+  top: 16px;
+}
+.oe_drop_zone:first-child:not(:last-child):before {
+  top: 8px;
+}
+.oe_drop_zone:last-child:not(:first-child):before {
+  top: 24px;
+}
+.oe_drop_zone.oe_hover:before {
+  border-top: dashed 2px rgba(116, 255, 161, 0.72);
 }
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index a11a83c7f90..f7ce999257e 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -56,43 +56,76 @@
     left: 0px
     right: 0px
     bottom: 0px
+    max-height: 280px
+    min-height: 140px
+    background: rgb(40,40,40)
+    box-shadow: 0px 10px 10px -10px black inset
+    overflow-y: auto
+
+.oe_snippet
+    display: inline-block
+    vertical-align: top
+    background: white
+    width: 120px
     height: 120px
-    background: black
+    border-radius: 3px
+    margin: 10px
+    margin-right: 0px
+    cursor: move 
+    position: relative
+    box-shadow: 0px 3px 10px rgba(0,0,0,0.2)
+    overflow: hidden
+    -webkit-user-select: none
+    user-select: none
 
-    .oe_snippet
-        display: inline
-        .oe_snippet_thumbnail
-            display: inline-block
-            background: red
-            width: 100px
-            height: 100px
-            border-radius: 3px
-            margin: 10px
-            cursor: move
+    .oe_snippet_thumbnail.oe_label
+        text-align: center
+        background: rgb(116, 116, 116)
+        background-image: radial-gradient(rgba(0,0,0,0.25),rgba(0,0,0,0.4))
+        height: 100%
+        line-height: 120px
+        color: white
+        text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.95)
 
-        .oe_snippet_body
-            display: none
+    .oe_snippet_body
+        display: none
+    & > *
+        pointer-events: none
+
+    & > *:first-child:not(.oe_snippet_thumbnail)
+        display: block
+        -webkit-transform-origin-x: 5px
+        -webkit-transform-origin-y: 10px
+        -webkit-transform: scale(0.095)
+               
 
 .oe_drop_zone
     display: block
-    background: rgba(255,0,0,0.25)
-    border: solid 1px rgba(255,0,0,0.5)
-    height: 30px
+    background: rgba(153, 0, 255, 0.17)
+    border-radius: 3px
+    height: 32px
     margin: -16px 0px
-    &.oe_inline
-        display: inline
-        height: auto
-        width: 30px
-        margin: 0px -16px
-    &.oe_float_left
-        float: left
-    &.oe_float_right
-        float: right
-    &:hover
-        background: rgba(255,0,0,0.5)
-        border: solid 1px red
+    -webkit-transition: margin 250ms linear
+    &:first-child:not(:last-child)
+        margin-top: -8px
+        margin-bottom: -24px
+    &:last-child:not(:first-child)
+        margin-top: -24px
+        margin-bottom: -8px
     &.oe_hover
-        background: rgba(0,255,0,0.5)
-        border: solid 1px green
+        background: rgba(0, 255, 133, 0.22)
+        z-index: 100000
+    &:before
+        content: ""
+        display: block
+        border-top: dashed 2px rgba(209, 178, 255, 0.72)
+        position: relative
+        top: 16px
+    &:first-child:not(:last-child):before
+        top: 8px
+    &:last-child:not(:first-child):before
+        top: 24px
+    &.oe_hover:before
+        border-top: dashed 2px rgba(116, 255, 161, 0.72)
 
 
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index c3d8dd1e5f3..3f99df872f1 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -118,7 +118,7 @@
             var $editables = $('[data-oe-model]')
                     .not('link, script')
                     // FIXME: propagation should make "meta" blocks non-editable in the first place...
-                    .not('.oe_snippet_editor')
+                    .not('.oe_snippets,.oe_snippet, .oe_snippet *')
                     .prop('contentEditable', true)
                     .addClass('oe_editable');
             var $rte_ables = $editables.not('[data-oe-type]');
@@ -324,6 +324,7 @@
             
             this.$('.oe_snippet').draggable({
                 helper: 'clone',
+                appendTo: 'body',
                 start: function(){
                     var snippet = $(this);
                  
@@ -333,15 +334,25 @@
                     });
 
                     $('.oe_drop_zone').droppable({
-                        hoverClass: "oe_hover",
-                        drop:   function(event,ui){
-                            $(this).replaceWith(snippet.find('.oe_snippet_body').clone());
+                        over:   function(){
+                            // FIXME: stupid hack to prevent multiple droppable to activate at once ... 
+                            // it's not even working properly but it's better than nothing.
+                            $(".oe_drop_zone.oe_hover").removeClass("oe_hover");
+                            $(this).addClass("oe_hover");
+                        },
+                        out:    function(){
+                            $(this).removeClass("oe_hover");
+                        },
+                        drop:   function(){
+                            $(".oe_drop_zone.oe_hover")
+                                .replaceWith(snippet.find('.oe_snippet_body').clone())
+                                .removeClass('oe_snippet_body');
                         },
                     });
                 },
                 stop: function(){
                     self.deactivate_drop_zones();
-                }
+                },
             });
         },
         // A generic drop zone generator. two css selectors can be provided
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index a2b42cf2f84..2c3ea14c4b0 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -401,22 +401,92 @@
 
         <template id="snippets">
 
-            <div class='oe_snippet' name='FooBar' data-selector-siblings='p,h1,h2,h3,h4,h5'>
-                <div class='oe_snippet_thumbnail'>
-                    foobar
-                </div>
-                <div class='oe_snippet_body'>
-                    FOOBAR
-                </div>
+            <div class='oe_snippet' name='Spacer' data-selector-siblings='#wrap .container'>
+                <div class='oe_snippet_thumbnail oe_label'>Spacer</div>
+                <div class="oe_snippet_body container mt32"></div>
             </div>
 
-            <div class='oe_snippet' name='BarFoo' data-selector-childs='.container'>
-                <div class='oe_snippet_thumbnail'>
-                    barfoo
-                </div>
-                <div class='oe_snippet_body'>
-                    BARFOO
+            <div class='oe_snippet' name='FooBar' data-selector-siblings='#wrap .container'>
+                <div class='oe_snippet_thumbnail oe_label'>
+                    Main Title
                 </div>
+                <section class="oe_snippet_body container">
+                    <div class="row">
+                        <div class="span12 text-center">
+                            <h1 class='mt64'>Welcome To Your New Homepage,</h1>
+                            <h2 class='mt32 subheader'>where <b><em>everything</em></b> can be customized </h2>
+                        </div>
+                    </div>
+                </section>
+            </div>
+
+            <div class='oe_snippet' name='BarFoo' data-selector-siblings='#wrap .container'>
+                <section class="oe_snippet_body container">
+                    <div class="row">
+                        <div class="span12 text-center">
+                            <h2 class='mt48'>Ut enim ad minim veniam</h2>
+                        </div>
+                    </div>
+                    <div class="row mt32">
+                        <div class="span4">
+                            <img class='img-rounded' src="/website/static/src/img/china_thumb.jpg"/>
+                            <h4 class='mt16'>Cillum Dolore</h4>
+                            <p>
+                                Lorem ipsum dolor sit amet, consectetur adipisicing elit,
+                                sed do eiusmod tempor incididunt ut labore et dolore magna 
+                                aliqua. Ut enim ad minim veniam, quis nostrud exercitation 
+                                ullamco laboris nisi ut aliquip ex ea commodo consequat. 
+                            </p>
+                        </div>
+                        <div class="span4">
+                            <img class='img-rounded' src="/website/static/src/img/desert_thumb.jpg"/>
+                            <h4 class='mt16'>Mollit Anim</h4>
+                            <p>
+                                Duis aute irure dolor in reprehenderit in voluptate velit 
+                                esse cillum dolore eu fugiat nulla pariatur. Excepteur sint 
+                                occaecat cupidatat non proident, sunt in culpa qui officia 
+                                deserunt mollit anim id est laborum
+                            </p>
+                        </div>
+                        <div class="span4">
+                            <img class='img-rounded' src="/website/static/src/img/deers_thumb.jpg"/>
+                            <h4 class='mt16'>Nemo Enim Ipsam</h4>
+                            <p>
+                                Sed ut perspiciatis unde omnis iste natus error sit voluptatem
+                                accusantium doloremque laudantium, totam rem aperiam, eaque ipsa 
+                                quae ab illo inventore veritatis et quasi architecto beatae vitae
+                                dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas 
+                            </p>
+                        </div>
+                    </div>
+                </section>
+            </div>
+
+            <div class='oe_snippet' name='Header' data-selector-siblings='#wrap .container'>
+                <section class="container oe_snippet_body">
+                    <div class="row">
+                        <div class="span5">
+                            <img class='img-rounded' src="/website/static/src/img/island.jpg"/>
+                        </div>
+                        <div class="span6 offset1">
+                            <p class='mt16'>
+                                Lorem ipsum dolor sit amet, consectetur adipisicing elit,
+                                sed do eiusmod tempor incididunt ut labore et dolore magna 
+                                aliqua. Ut enim ad minim veniam, quis nostrud exercitation 
+                                ullamco laboris nisi ut aliquip ex ea commodo consequat. 
+                            </p>
+                            <p>
+                                Duis aute irure dolor in reprehenderit in voluptate velit 
+                                esse cillum dolore eu fugiat nulla pariatur. Excepteur sint 
+                                occaecat cupidatat non proident, sunt in culpa qui officia 
+                                deserunt mollit anim id est laborum
+                            </p>
+                            <div class="text-center">
+                                <a href="http://www.openerp.com/start" class="btn mt16 btn-large btn-primary">Call To  <em>Action</em></a>
+                            </div>
+                        </div>
+                    </div>
+                </section>
             </div>
 
         </template>