From 6655cd8ccd78c9f74dd861ae2ee4d70d698bcdd5 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 12 Dec 2013 11:47:24 +0100
Subject: [PATCH 1/3] [IMP] website_sale: product placeholder image must be
 bigger

bzr revid: chm@openerp.com-20131212104724-0jmsepf8k5gtl18h
---
 addons/website_sale/static/src/css/website_sale.css  | 6 ++++++
 addons/website_sale/static/src/css/website_sale.sass | 6 ++++++
 addons/website_sale/views/website_sale.xml           | 3 ++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/addons/website_sale/static/src/css/website_sale.css b/addons/website_sale/static/src/css/website_sale.css
index 25484199e55..38b1339f592 100644
--- a/addons/website_sale/static/src/css/website_sale.css
+++ b/addons/website_sale/static/src/css/website_sale.css
@@ -420,3 +420,9 @@ ul.wizard li:first-child {
   padding-left: 15px;
   border-radius: 4px 0 0 4px;
 }
+
+/* product detail */
+.product_detail_img {
+  min-width: 128px;
+  max-height: 500px;
+}
diff --git a/addons/website_sale/static/src/css/website_sale.sass b/addons/website_sale/static/src/css/website_sale.sass
index 4143dfe62cc..ac42e10267e 100644
--- a/addons/website_sale/static/src/css/website_sale.sass
+++ b/addons/website_sale/static/src/css/website_sale.sass
@@ -366,3 +366,9 @@ ul.wizard li.text-primary .chevron:before
 ul.wizard li:first-child
     padding-left: 15px
     border-radius: 4px 0 0 4px
+
+/* product detail */
+
+.product_detail_img
+    min-width: 128px
+    max-height: 500px
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 2f26d4fe7ee..95afde8e829 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -253,6 +253,7 @@
         <t t-call="website.layout">
             <t t-set="head">
                 <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
+                <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
             </t>
             <t t-set="additional_title" t-value="product.name"/>
             <div id="wrap">
@@ -290,7 +291,7 @@
               <section class="container oe_website_sale" id="product_detail">
                 <div class="row">
                   <div class="col-sm-7 col-md-7 col-lg-7">
-                      <span t-field="product.image" style="max-height: 500px" t-field-options='{"widget": "image", "class": "img img-responsive"}'/>
+                      <span t-field="product.image" t-field-options='{"widget": "image", "class": "product_detail_img"}'/>
                   </div><div class="col-sm-5 col-md-5 col-lg-4 col-lg-offset-1">
                       <h1 t-field="product.name">Product Name</h1>
 

From ee370a837c0aff3ddfb7339e74ae6a9a81247446 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 12 Dec 2013 11:58:21 +0100
Subject: [PATCH 2/3] [IMP] website: Removing unnecessary spaces at beginning
 of line

bzr revid: chm@openerp.com-20131212105821-mqvxb7yc04cj5k2s
---
 addons/website/views/website_templates.xml    |  976 ++++-----
 .../views/website_blog_templates.xml          |  731 +++----
 addons/website_crm/views/website_crm.xml      |  168 +-
 .../views/website_crm_partner_assign.xml      |  213 +-
 .../views/website_customer.xml                |  344 +--
 addons/website_event/views/website_event.xml  |  742 +++----
 .../views/website_event.xml                   |  514 ++---
 addons/website_hr/views/website_hr.xml        |   40 +-
 .../views/website_hr_recruitment.xml          |  470 ++--
 addons/website_mail/views/website_mail.xml    |   50 +-
 .../views/website_membership.xml              |  230 +-
 .../views/website_partner_view.xml            |  126 +-
 .../views/website_payment_templates.xml       |   54 +-
 .../website_project/views/website_project.xml |  118 +-
 addons/website_sale/views/website_sale.xml    | 1899 ++++++++---------
 15 files changed, 3338 insertions(+), 3337 deletions(-)

diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 8cb80f6558f..257e3bb4562 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -3,32 +3,33 @@
 -->
 <openerp>
     <data>
-        <!-- Layout and generic templates -->
 
-        <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>
+<!-- Layout and generic templates -->
 
-        <template id="website.submenu" name="Submenu">
-            <li t-if="not submenu.child_id">
-                <a t-att-href="url_for(submenu.url)" t-ignore="true">
-                    <span t-field="submenu.name"/>
-                </a>
-            </li>
-            <li t-if="submenu.child_id" class="dropdown">
-                <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                    <span t-field="submenu.name"/> <span class="caret" t-ignore="true"></span>
-                </a>
-                <ul class="dropdown-menu" role="menu">
-                    <t t-foreach="submenu.child_id" t-as="submenu">
-                        <t t-call="website.submenu"/>
-                    </t>
-                </ul>
-            </li>
-        </template>
+<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="layout" name="Main layout">&lt;!DOCTYPE html&gt;
+<template id="website.submenu" name="Submenu">
+    <li t-if="not submenu.child_id">
+        <a t-att-href="url_for(submenu.url)" t-ignore="true">
+            <span t-field="submenu.name"/>
+        </a>
+    </li>
+    <li t-if="submenu.child_id" class="dropdown">
+        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+            <span t-field="submenu.name"/> <span class="caret" t-ignore="true"></span>
+        </a>
+        <ul class="dropdown-menu" role="menu">
+            <t t-foreach="submenu.child_id" t-as="submenu">
+                <t t-call="website.submenu"/>
+            </t>
+        </ul>
+    </li>
+</template>
+
+<template id="layout" name="Main layout">&lt;!DOCTYPE html&gt;
     <html t-att-lang="lang and lang.replace('_', '-')"
           t-att-data-website-id="website.id if editable else None"
           t-att-data-editable="'1' if editable else None"
@@ -189,519 +190,520 @@
             </div>
         </body>
     </html>
-        </template>
+</template>
 
-        <template id="editor_head" inherit_id="website.layout" name="Editor" groups="base.group_website_publisher">
-            <xpath expr="//head" position="inside">
-                <link rel='stylesheet' href='/website/static/src/css/snippets.css'/>
-                <link rel='stylesheet' href='/website/static/src/css/editor.css'/>
-                <link rel='stylesheet' href='/website/static/lib/bootstrap-tour/bootstrap-tour.css'/>
+<template id="editor_head" inherit_id="website.layout" name="Editor" groups="base.group_website_publisher">
+    <xpath expr="//head" position="inside">
+        <link rel='stylesheet' href='/website/static/src/css/snippets.css'/>
+        <link rel='stylesheet' href='/website/static/src/css/editor.css'/>
+        <link rel='stylesheet' href='/website/static/lib/bootstrap-tour/bootstrap-tour.css'/>
 
 
-                <link rel="stylesheet" href="/select2/static/lib/select2/select2.css"/>
-                <link rel="stylesheet" href="/website/static/lib/select2-bootstrap-css/select2-bootstrap.css"/>
-                <link rel='stylesheet' href="/web/static/lib/jquery.ui/css/smoothness/jquery-ui-1.9.1.custom.css"/>
+        <link rel="stylesheet" href="/select2/static/lib/select2/select2.css"/>
+        <link rel="stylesheet" href="/website/static/lib/select2-bootstrap-css/select2-bootstrap.css"/>
+        <link rel='stylesheet' href="/web/static/lib/jquery.ui/css/smoothness/jquery-ui-1.9.1.custom.css"/>
 
-                <script type="text/javascript" src="/select2/static/lib/select2/select2.js"></script>
-                <script type="text/javascript" src="/web/static/lib/ckeditor/ckeditor.js"></script>
-                <script type="text/javascript" src="/website/static/lib/bootstrap-tour/bootstrap-tour.js"></script>
-                <script t-if="not translatable" type="text/javascript" src="/website/static/lib/ace/ace.js"></script>
-                <script type="text/javascript" src="/website/static/lib/vkbeautify/vkbeautify.0.99.00.beta.js"></script>
-                <script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js"></script>
-                <!-- mutation observers shim backed by mutation events (8 < IE < 11, Safari < 6, FF < 14, Chrome < 17) -->
-                <script type="text/javascript" src="/website/static/lib//jquery.mjs.nestedSortable/jquery.mjs.nestedSortable.js"></script>
-                <script type="text/javascript" src="/website/static/lib/MutationObservers/test/sidetable.js"></script>
-                <script type="text/javascript" src='/website/static/lib/nearest/jquery.nearest.js'></script>
-                <script type="text/javascript" src="/website/static/lib/MutationObservers/MutationObserver.js"></script>
+        <script type="text/javascript" src="/select2/static/lib/select2/select2.js"></script>
+        <script type="text/javascript" src="/web/static/lib/ckeditor/ckeditor.js"></script>
+        <script type="text/javascript" src="/website/static/lib/bootstrap-tour/bootstrap-tour.js"></script>
+        <script t-if="not translatable" type="text/javascript" src="/website/static/lib/ace/ace.js"></script>
+        <script type="text/javascript" src="/website/static/lib/vkbeautify/vkbeautify.0.99.00.beta.js"></script>
+        <script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js"></script>
+        <!-- mutation observers shim backed by mutation events (8 < IE < 11, Safari < 6, FF < 14, Chrome < 17) -->
+        <script type="text/javascript" src="/website/static/lib//jquery.mjs.nestedSortable/jquery.mjs.nestedSortable.js"></script>
+        <script type="text/javascript" src="/website/static/lib/MutationObservers/test/sidetable.js"></script>
+        <script type="text/javascript" src='/website/static/lib/nearest/jquery.nearest.js'></script>
+        <script type="text/javascript" src="/website/static/lib/MutationObservers/MutationObserver.js"></script>
 
-                <script type="text/javascript" src="/website/static/src/js/website.editor.js"></script>
-                <script type="text/javascript" src="/website/static/src/js/website.menu.js"></script>
-                <script type="text/javascript" src="/website/static/src/js/website.mobile.js"></script>
-                <script type="text/javascript" src="/website/static/src/js/website.seo.js"></script>
-                <script type="text/javascript" src="/website/static/src/js/website.tour.js"></script>
-                <script type="text/javascript" src="/website/static/src/js/website.tour.banner.js"></script>
-                <script t-if="not translatable" type="text/javascript" src="/website/static/src/js/website.snippets.editor.js"></script>
-                <script t-if="not translatable" type="text/javascript" src="/website/static/src/js/website.ace.js"></script>
-                <script t-if="translatable" type="text/javascript" src="/website/static/src/js/website.translator.js"></script>
-            </xpath>
-        </template>
+        <script type="text/javascript" src="/website/static/src/js/website.editor.js"></script>
+        <script type="text/javascript" src="/website/static/src/js/website.menu.js"></script>
+        <script type="text/javascript" src="/website/static/src/js/website.mobile.js"></script>
+        <script type="text/javascript" src="/website/static/src/js/website.seo.js"></script>
+        <script type="text/javascript" src="/website/static/src/js/website.tour.js"></script>
+        <script type="text/javascript" src="/website/static/src/js/website.tour.banner.js"></script>
+        <script t-if="not translatable" type="text/javascript" src="/website/static/src/js/website.snippets.editor.js"></script>
+        <script t-if="not translatable" type="text/javascript" src="/website/static/src/js/website.ace.js"></script>
+        <script t-if="translatable" type="text/javascript" src="/website/static/src/js/website.translator.js"></script>
+    </xpath>
+</template>
 
 
 
-        <template id="show_sign_in" inherit_option_id="website.layout" inherit_id="website.layout" name="Show Sign In">
-            <xpath expr="//ul[@id='top_menu']" position="inside">
-                <li t-if="user_id.id == website.public_user.id">
-                    <a t-attf-href="/web#redirect=#{ quote_plus(url_for('', keep_query='*')) }">
-                        <span class="badge">Sign in</span>
+<template id="show_sign_in" inherit_option_id="website.layout" inherit_id="website.layout" name="Show Sign In">
+    <xpath expr="//ul[@id='top_menu']" position="inside">
+        <li t-if="user_id.id == website.public_user.id">
+            <a t-attf-href="/web#redirect=#{ quote_plus(url_for('', keep_query='*')) }">
+                <span class="badge">Sign in</span>
+            </a>
+        </li>
+    </xpath>
+</template>
+
+<template id="footer_custom" inherit_option_id="website.layout" name="Custom Footer">
+    <xpath expr="//div[@id='footer_container']" position="before">
+        <div class="oe_structure">
+            <section data-snippet-id='three-columns' class="mt16 mb16">
+                <div class="container">
+                    <div class="row">
+                        <div class="col-md-4">
+                            <h4 class="mt16">Subtitle</h4>
+                            <p>
+                                <a href="/">Homepage</a>
+                            </p>
+                        </div>
+                        <div class="col-md-4">
+                            <h4 class="mt16">Subtitle 2</h4>
+                            <p>
+                                ...
+                            </p>
+                        </div>
+                        <div class="col-md-4">
+                            <h4 class="mt16">Subtitle 3</h4>
+                            <p>
+                                ...
+                            </p>
+                        </div>
+                    </div>
+                </div>
+            </section>
+        </div>
+    </xpath>
+    <xpath expr="//div[@id='footer_container']" position="attributes">
+        <attribute name="style">display: none</attribute>
+    </xpath>
+</template>
+
+<template id="publish_management">
+    <div groups="base.group_website_publisher" t-ignore="true" class="pull-right css_editable_mode_hidden" t-att-style="style or ''">
+        <div t-attf-class="btn-group js_publish_management #{object.website_published and 'css_published' or 'css_unpublished'}" t-att-data-id="object.id" t-att-data-object="object._name" t-att-data-controller="publish_controller">
+            <button class="btn btn-danger js_publish_btn">Not Published</button>
+            <button class="btn btn-success js_publish_btn">Published</button>
+            <button type="button" t-attf-class="btn btn-default dropdown-toggle" t-att-id="'dopprod-%s' % object.id" data-toggle="dropdown">
+                <span class="caret"></span>
+            </button>
+            <ul class="dropdown-menu" role="menu" t-att-aria-labelledby="'dopprod-%s' % object.id">
+                <li>
+                    <a href="#" class="js_publish_btn">
+                        <span class="css_unpublish">Unpublish</span>
+                        <span class="css_publish">Publish</span>
                     </a>
                 </li>
-            </xpath>
-        </template>
-
-        <template id="footer_custom" inherit_option_id="website.layout" name="Custom Footer">
-            <xpath expr="//div[@id='footer_container']" position="before">
-                <div class="oe_structure">
-                    <section data-snippet-id='three-columns' class="mt16 mb16">
-                        <div class="container">
-                            <div class="row">
-                                <div class="col-md-4">
-                                    <h4 class="mt16">Subtitle</h4>
-                                    <p>
-                                        <a href="/">Homepage</a>
-                                    </p>
-                                </div>
-                                <div class="col-md-4">
-                                    <h4 class="mt16">Subtitle 2</h4>
-                                    <p>
-                                        ...
-                                    </p>
-                                </div>
-                                <div class="col-md-4">
-                                    <h4 class="mt16">Subtitle 3</h4>
-                                    <p>
-                                        ...
-                                    </p>
-                                </div>
-                            </div>
-                        </div>
-                    </section>
-                </div>
-            </xpath>
-            <xpath expr="//div[@id='footer_container']" position="attributes">
-                <attribute name="style">display: none</attribute>
-            </xpath>
-        </template>
-
-        <template id="publish_management">
-            <div groups="base.group_website_publisher" t-ignore="true" class="pull-right css_editable_mode_hidden" t-att-style="style or ''">
-                <div t-attf-class="btn-group js_publish_management #{object.website_published and 'css_published' or 'css_unpublished'}" t-att-data-id="object.id" t-att-data-object="object._name" t-att-data-controller="publish_controller">
-                    <button class="btn btn-danger js_publish_btn">Not Published</button>
-                    <button class="btn btn-success js_publish_btn">Published</button>
-                    <button type="button" t-attf-class="btn btn-default dropdown-toggle" t-att-id="'dopprod-%s' % object.id" data-toggle="dropdown">
-                        <span class="caret"></span>
-                    </button>
-                    <ul class="dropdown-menu" role="menu" t-att-aria-labelledby="'dopprod-%s' % object.id">
-                        <li>
-                            <a href="#" class="js_publish_btn">
-                                <span class="css_unpublish">Unpublish</span>
-                                <span class="css_publish">Publish</span>
-                            </a>
-                        </li>
-                        <t t-raw="0"/>
-                        <li t-if="publish_edit">
-                            <a t-att-href="'/web#return_label=Website&amp;model=%s&amp;id=%s' % (object._name, object.id)"
-                            title='Edit in backend'>Edit</a>
-                        </li>
-                    </ul>
-                </div>
-            </div>
-        </template>
-
-        <template id="publish_short">
-            <t groups="base.group_website_publisher" t-ignore="true">
-                <div t-attf-class="btn-group pull-right js_publish_management #{object.website_published and 'css_published' or 'css_unpublished'}" t-att-data-id="object.id" t-att-data-object="object._name" t-att-data-controller="publish_controller">
-                    <button t-attf-class="btn btn-sm btn-#{object.website_published and 'success' or 'danger'} js_publish_btn">
-                        <span class="css_publish">Not Published</span>
-                        <span class="css_unpublish">Published</span>
-                    </button>
-                </div>
-            </t>
-        </template>
-
-        <template id="pager" name="Pager">
-            <ul t-if="pager['page_count'] > 1" t-attf-class="#{ classname or '' } pagination" t-att-style="style or ''">
-                <li t-att-class=" 'disabled' if pager['page']['num'] == 1 else '' ">
-                    <a t-att-href=" pager['page_previous']['url'] if pager['page']['num'] != 1 else '' ">Prev</a>
-                </li>
-                <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 '' ">
-                    <a t-att-href=" pager['page_next']['url'] if pager['page']['num'] != pager['page_count'] else '' ">Next</a>
+                <t t-raw="0"/>
+                <li t-if="publish_edit">
+                    <a t-att-href="'/web#return_label=Website&amp;model=%s&amp;id=%s' % (object._name, object.id)"
+                    title='Edit in backend'>Edit</a>
                 </li>
             </ul>
-        </template>
+        </div>
+    </div>
+</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="website.kanban(model, domain, column, template, step=step, scope=scope, orderby=orderby)"/>
-        </template>
+<template id="publish_short">
+    <t groups="base.group_website_publisher" t-ignore="true">
+        <div t-attf-class="btn-group pull-right js_publish_management #{object.website_published and 'css_published' or 'css_unpublished'}" t-att-data-id="object.id" t-att-data-object="object._name" t-att-data-controller="publish_controller">
+            <button t-attf-class="btn btn-sm btn-#{object.website_published and 'success' or 'danger'} js_publish_btn">
+                <span class="css_publish">Not Published</span>
+                <span class="css_unpublish">Published</span>
+            </button>
+        </div>
+    </t>
+</template>
 
-        <template id="kanban_contain">
-            <table class="table js_kanban">
-                <thead>
-                    <tr>
-                        <t t-set="width" t-value="str(round(100.0 / len(objects), 2)) + '%'"/>
-                        <t t-foreach="objects">
-                            <th t-att-width="width">
-                                <div t-field="column_id.name" class="text-center"></div>
-                            </th>
+<template id="pager" name="Pager">
+    <ul t-if="pager['page_count'] > 1" t-attf-class="#{ classname or '' } pagination" t-att-style="style or ''">
+        <li t-att-class=" 'disabled' if pager['page']['num'] == 1 else '' ">
+            <a t-att-href=" pager['page_previous']['url'] if pager['page']['num'] != 1 else '' ">Prev</a>
+        </li>
+        <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 '' ">
+            <a t-att-href=" pager['page_next']['url'] if pager['page']['num'] != pager['page_count'] else '' ">Next</a>
+        </li>
+    </ul>
+</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="website.kanban(model, domain, column, template, step=step, scope=scope, orderby=orderby)"/>
+</template>
+
+<template id="kanban_contain">
+    <table class="table js_kanban">
+        <thead>
+            <tr>
+                <t t-set="width" t-value="str(round(100.0 / len(objects), 2)) + '%'"/>
+                <t t-foreach="objects">
+                    <th t-att-width="width">
+                        <div t-field="column_id.name" class="text-center"></div>
+                    </th>
+                </t>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <t t-foreach="objects">
+                    <td class="js_kanban_col" t-att-data-template="template" 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-foreach="object_ids" t-as="object_id">
+                            <t t-call="#{ template }"></t>
                         </t>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr>
-                        <t t-foreach="objects">
-                            <td class="js_kanban_col" t-att-data-template="template" 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-foreach="object_ids" t-as="object_id">
-                                    <t t-call="#{ template }"></t>
-                                </t>
-                                <!-- 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"></a></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>
-                            </td>
-                        </t>
-                    </tr>
-                </tbody>
-            </table>
-        </template>
-
-        <!-- Error and special pages -->
-
-        <template id="default_page">
-            <t t-call="website.layout">
-              <div id="wrap" class="oe_structure oe_empty"></div>
-            </t>
-        </template>
-
-        <template id="page_404">
-            <t t-call="website.404">
-                <div class="container">
-                    <div class="well mt32">
-                        <p>This page does not exists, but you can create it as you are administrator of this site.</p>
-                        <a class="btn btn-primary" t-attf-href="/pagenew/#{ path }">Create Page</a>
-                        <span class="text-muted">or</span> <a href="/sitemap">Search a Page</a>
-                    </div>
-                    <div class="text-center text-muted">Edit the content below this line to adapt the default "page not found" page.</div>
-                </div>
-                <hr/>
-            </t>
-        </template>
-
-       <template id="http_error">
-            <t t-call="website.layout">
-                <div id="wrap">
-                    <div class="oe_structure">
-                        <h1 class="container mt32"><t t-esc="status_code"/>: <t t-esc="status_message"/></h1>
-                    </div>
-
-                    <t t-if="editable or request.debug">
-                        <t t-call="website.http_error_debug"/>
-                    </t>
-                </div>
-            </t>
-        </template>
-
-        <template id="http_error_debug">
-            <div class="container panel-group mb32 mt32" id="debug_infos">
-                <div class="panel panel-default" t-if="exception">
-                    <div class="panel-heading">
-                        <h4 class="panel-title">
-                            <a data-toggle="collapse" data-parent="#debug_infos" href="#error_main">
-                                Error
-                            </a>
-                        </h4>
-                    </div>
-                    <div id="error_main" class="panel-collapse collapse in">
-                        <div class="panel-body">
-                            <p t-if="website_controller">The following error was raised in the website controller <code t-esc="website_controller"/></p>
-                            <p><strong>Error message:</strong> <pre t-esc="exception.message"/></p>
-                        </div>
-                    </div>
-                </div>
-                <div class="panel panel-default" t-if="qweb_template">
-                    <div class="panel-heading">
-                        <h4 class="panel-title">
-                            <a data-toggle="collapse" data-parent="#adebug_infos" href="#error_qweb">
-                                QWeb
-                            </a>
-                        </h4>
-                    </div>
-                    <div id="error_qweb" class="panel-collapse collapse">
-                        <div class="panel-body">
-                            <p>
-                                The error occured while rendering the template <code t-esc="qweb_template"/>
-                                <t t-if="qweb_eval">and evaluating the following expression: <code t-esc="qweb_eval"/></t>
-                            </p>
-                            <t t-if="qweb_node">
-                                <pre id="exception_node" t-esc="qweb_node.toxml()"/>
-                            </t>
-                        </div>
-                    </div>
-                </div>
-                <div class="panel panel-default" t-if="traceback">
-                    <div class="panel-heading">
-                        <h4 class="panel-title">
-                            <a data-toggle="collapse" data-parent="#adebug_infos" href="#error_traceback">
-                                Traceback
-                            </a>
-                        </h4>
-                    </div>
-                    <div id="error_traceback" class="panel-collapse collapse">
-                        <div class="panel-body">
-                            <pre id="exception_traceback" t-esc="traceback"/>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </template>
-
-        <template id="404">
-            <t t-call="website.layout">
-                <div id="wrap">
-                    <t t-raw="0"/>
-                    <div class="oe_structure oe_empty">
-                        <div class="container">
-                            <h1 class="mt32">404: Page not found!</h1>
-                            <p>
-                                The page you were looking for could not be found; it is possible you have
-                                typed the address incorrectly, but it has most probably been removed due
-                                to the recent website reorganisation.
-                            </p>
-                            <p>Maybe you were looking for one of these popular pages ?</p>
+                        <!-- pager -->
+                        <div t-if="1 != page_end" class="pagination pagination-centered">
                             <ul>
-                                <li><a href="/">Homepage</a></li>
-                                <li><a href="/page/website.contactus/">Contact Us</a></li>
+                                <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"></a></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>
-                    </div>
+                    </td>
+                </t>
+            </tr>
+        </tbody>
+    </table>
+</template>
 
-                    <t t-if="request.debug">
-                        <t t-call="website.http_error_debug"/>
+<!-- Error and special pages -->
+
+<template id="default_page">
+    <t t-call="website.layout">
+      <div id="wrap" class="oe_structure oe_empty"></div>
+    </t>
+</template>
+
+<template id="page_404">
+    <t t-call="website.404">
+        <div class="container">
+            <div class="well mt32">
+                <p>This page does not exists, but you can create it as you are administrator of this site.</p>
+                <a class="btn btn-primary" t-attf-href="/pagenew/#{ path }">Create Page</a>
+                <span class="text-muted">or</span> <a href="/sitemap">Search a Page</a>
+            </div>
+            <div class="text-center text-muted">Edit the content below this line to adapt the default "page not found" page.</div>
+        </div>
+        <hr/>
+    </t>
+</template>
+
+<template id="http_error">
+    <t t-call="website.layout">
+        <div id="wrap">
+            <div class="oe_structure">
+                <h1 class="container mt32"><t t-esc="status_code"/>: <t t-esc="status_message"/></h1>
+            </div>
+
+            <t t-if="editable or request.debug">
+                <t t-call="website.http_error_debug"/>
+            </t>
+        </div>
+    </t>
+</template>
+
+<template id="http_error_debug">
+    <div class="container panel-group mb32 mt32" id="debug_infos">
+        <div class="panel panel-default" t-if="exception">
+            <div class="panel-heading">
+                <h4 class="panel-title">
+                    <a data-toggle="collapse" data-parent="#debug_infos" href="#error_main">
+                        Error
+                    </a>
+                </h4>
+            </div>
+            <div id="error_main" class="panel-collapse collapse in">
+                <div class="panel-body">
+                    <p t-if="website_controller">The following error was raised in the website controller <code t-esc="website_controller"/></p>
+                    <p><strong>Error message:</strong> <pre t-esc="exception.message"/></p>
+                </div>
+            </div>
+        </div>
+        <div class="panel panel-default" t-if="qweb_template">
+            <div class="panel-heading">
+                <h4 class="panel-title">
+                    <a data-toggle="collapse" data-parent="#adebug_infos" href="#error_qweb">
+                        QWeb
+                    </a>
+                </h4>
+            </div>
+            <div id="error_qweb" class="panel-collapse collapse">
+                <div class="panel-body">
+                    <p>
+                        The error occured while rendering the template <code t-esc="qweb_template"/>
+                        <t t-if="qweb_eval">and evaluating the following expression: <code t-esc="qweb_eval"/></t>
+                    </p>
+                    <t t-if="qweb_node">
+                        <pre id="exception_node" t-esc="qweb_node.toxml()"/>
                     </t>
                 </div>
-            </t>
-        </template>
+            </div>
+        </div>
+        <div class="panel panel-default" t-if="traceback">
+            <div class="panel-heading">
+                <h4 class="panel-title">
+                    <a data-toggle="collapse" data-parent="#adebug_infos" href="#error_traceback">
+                        Traceback
+                    </a>
+                </h4>
+            </div>
+            <div id="error_traceback" class="panel-collapse collapse">
+                <div class="panel-body">
+                    <pre id="exception_traceback" t-esc="traceback"/>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
 
-        <template id="500">
-            <t t-call="website.http_error"/>
-        </template>
-
-        <template id="403">
-            <t t-call="website.layout">
-              <div id="wrap">
+<template id="404">
+    <t t-call="website.layout">
+        <div id="wrap">
+            <t t-raw="0"/>
+            <div class="oe_structure oe_empty">
                 <div class="container">
-                    <h1 class="mt32">403: Forbidden</h1>
+                    <h1 class="mt32">404: Page not found!</h1>
                     <p>
-                        The page you were looking for could not be
-                        authorized.
-                    </p>
-                    <p>
-                        Maybe you were looking for one of these
-                        popular pages ?
+                        The page you were looking for could not be found; it is possible you have
+                        typed the address incorrectly, but it has most probably been removed due
+                        to the recent website reorganisation.
                     </p>
+                    <p>Maybe you were looking for one of these popular pages ?</p>
                     <ul>
                         <li><a href="/">Homepage</a></li>
                         <li><a href="/page/website.contactus/">Contact Us</a></li>
                     </ul>
                 </div>
-                <t t-if="editable or request.debug">
-                    <t t-call="website.http_error_debug"/>
-                </t>
-              </div>
-            </t>
-        </template>
+            </div>
 
-        <template id="robots">
+            <t t-if="request.debug">
+                <t t-call="website.http_error_debug"/>
+            </t>
+        </div>
+    </t>
+</template>
+
+<template id="500">
+    <t t-call="website.http_error"/>
+</template>
+
+<template id="403">
+    <t t-call="website.layout">
+      <div id="wrap">
+        <div class="container">
+            <h1 class="mt32">403: Forbidden</h1>
+            <p>
+                The page you were looking for could not be
+                authorized.
+            </p>
+            <p>
+                Maybe you were looking for one of these
+                popular pages ?
+            </p>
+            <ul>
+                <li><a href="/">Homepage</a></li>
+                <li><a href="/page/website.contactus/">Contact Us</a></li>
+            </ul>
+        </div>
+        <t t-if="editable or request.debug">
+            <t t-call="website.http_error_debug"/>
+        </t>
+      </div>
+    </t>
+</template>
+
+<template id="robots">
 # robotstxt.org/
 User-agent: *
 Sitemap: <t t-esc="url_root"/>sitemap.xml
-        </template>
+</template>
 
-        <template id="sitemap" name="Site Map">
-            <t t-call="website.layout">
-                <ul>
-                    <li t-foreach="pages" t-as="page">
-                        <a t-att-href="page['url']"><t t-esc="page['name']"/></a>
-                    </li>
-                </ul>
-            </t>
-        </template>
+<template id="sitemap" name="Site Map">
+    <t t-call="website.layout">
+        <ul>
+            <li t-foreach="pages" t-as="page">
+                <a t-att-href="page['url']"><t t-esc="page['name']"/></a>
+            </li>
+        </ul>
+    </t>
+</template>
 
-        <template id="sitemap_xml">
-            <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-                <t t-foreach="pages" t-as="page">
-                    <url>
-                        <loc><t t-esc="page['url']"/></loc>
-                    </url>
-                </t>
-            </urlset>
-        </template>
+<template id="sitemap_xml">
+    <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+        <t t-foreach="pages" t-as="page">
+            <url>
+                <loc><t t-esc="page['url']"/></loc>
+            </url>
+        </t>
+    </urlset>
+</template>
 
-        <!-- Actual pages -->
+<!-- Actual pages -->
 
-        <template id="homepage" name="Homepage" page="True">
-            <t t-call="website.layout">
-              <div id="wrap" class="oe_structure oe_empty"></div>
-            </t>
-        </template>
+<template id="homepage" name="Homepage" page="True">
+    <t t-call="website.layout">
+      <div id="wrap" class="oe_structure oe_empty"></div>
+    </t>
+</template>
 
-        <template id="company_description" name="Company Description">
-            <address>
-                <div t-field="res_company.partner_id">Name</div>
-                <br />
-                <div>&amp;#x2706; <span t-field="res_company.phone"></span></div>
-                <div class="fa fa-envelope" t-field="res_company.email"></div>
-            </address>
-             <a t-att-href="res_company.google_map_link()" target="_BLANK">
-                <img class="thumbnail img-responsive" t-att-src="res_company.google_map_img()" />
-            </a>
-        </template>
+<template id="company_description" name="Company Description">
+    <address>
+        <div t-field="res_company.partner_id">Name</div>
+        <br />
+        <div>&amp;#x2706; <span t-field="res_company.phone"></span></div>
+        <div class="fa fa-envelope" t-field="res_company.email"></div>
+    </address>
+     <a t-att-href="res_company.google_map_link()" target="_BLANK">
+        <img class="thumbnail img-responsive" t-att-src="res_company.google_map_img()" />
+    </a>
+</template>
 
-        <template id="contactus" name="Contact us" page="True">
-            <t t-call="website.layout">
-              <div id="wrap">
-                <div class="oe_structure"/>
-                <div class="container">
-                    <h1>Contact us</h1>
-                    <div class="row">
-                        <div class="col-md-8">
-                            <div class="oe_structure">
-                                <div>
-                                    <p>Contact us about anything related to our company or services.</p>
-                                    <p>We'll do our best to get back to you as soon as possible.</p>
-                                </div>
-                            </div>
-                            <div class="text-center mt64" name="mail_button">
-                                <a t-attf-href="mailto:{{ res_company.email }}" class="btn btn-primary">Send us an email</a>
-                            </div>
-                        </div>
-                        <div class="col-md-4 mb32">
-                            <t t-call="website.company_description"/>
+<template id="contactus" name="Contact us" page="True">
+    <t t-call="website.layout">
+      <div id="wrap">
+        <div class="oe_structure"/>
+        <div class="container">
+            <h1>Contact us</h1>
+            <div class="row">
+                <div class="col-md-8">
+                    <div class="oe_structure">
+                        <div>
+                            <p>Contact us about anything related to our company or services.</p>
+                            <p>We'll do our best to get back to you as soon as possible.</p>
                         </div>
                     </div>
-                </div>
-                <div class="oe_structure"/>
-              </div>
-            </t>
-        </template>
-
-        <template id="aboutus" name="About us" page="True">
-            <t t-call="website.layout">
-                <div id="wrap">
-                    <div class="oe_structure">
-
-                        <section data-snippet-id="title">
-                            <div class="container">
-                                <div class="row">
-                                    <div class="col-md-12">
-                                        <h1 class="text-center">About us</h1>
-                                        <h3 class="text-muted text-center">Great products for great people</h3>
-                                    </div>
-                                </div>
-                            </div>
-                        </section>
-
-                        <section data-snippet-id="text-image">
-                            <div class="container">
-                                <div class="row">
-                                    <div class="col-md-6 mt32">
-                                        <p>
-                                              We are a team of passionate people whose goal is to improve everyone's
-                                              life through disruptive products. We build great products to solve your
-                                              business problems.
-                                        </p>
-                                        <p>
-                                              Our products are designed for small to medium companies willing to optimize
-                                              their performance.
-                                        </p>
-                                    </div>
-                                    <div class="col-md-4 col-md-offset-2 mt16 mb16">
-                                        <img src="/website/static/src/img/library/business_conference.jpg" class="img img-responsive shadow" alt="Our Team"/>
-                                    </div>
-                                </div>
-                            </div>
-                        </section>
-
-                        <div class="parallax oe_structure mt16 oe_medium mb64" data-scroll-background-ratio="0.6" data-snippet-id="parallax" style="background-image: url(http://localhost:8069/website/static/src/img/parallax/parallax_bg.jpg); background-attachment: scroll; background-position: 0px 0px; ">
-                            <section class="mb32 mt16" data-snippet-id="references">
-                                <div class="container">
-                                    <div class="row">
-                                        <div class="col-md-12 mt16 mb8">
-                                            <h1 class="text-center">What do customers say about us...</h1>
-                                        </div>
-                                        <div class="col-md-4 col-md-offset-1 mt16 mb0">
-                                            <blockquote data-snippet-id="quote">
-                                                <p><span style="background-color:#FFFFFF;">Write here a quote from one of your customer. Quotes are are great way to give confidence in your products or services.</span></p>
-                                                <small><span style="background-color:#FFFFFF;">Author of this quote</span></small>
-                                            </blockquote>
-                                        </div>
-                                        <div class="col-md-4 col-md-offset-2 mt16 mb32">
-                                            <blockquote data-snippet-id="quote">
-                                                <p><span style="background-color:#FFFFFF;">OpenERP provides essential platform for our project management. Things are better organized and more visible with it.</span></p>
-                                                <small><span style="background-color:#FFFFFF;">John Doe, CEO</span></small>
-                                            </blockquote>
-                                        </div>
-                                    </div>
-                                </div>
-                            </section>
-                        </div>
-
+                    <div class="text-center mt64" name="mail_button">
+                        <a t-attf-href="mailto:{{ res_company.email }}" class="btn btn-primary">Send us an email</a>
                     </div>
-                    <div class="oe_structure"></div>
                 </div>
-            </t>
-        </template>
+                <div class="col-md-4 mb32">
+                    <t t-call="website.company_description"/>
+                </div>
+            </div>
+        </div>
+        <div class="oe_structure"/>
+      </div>
+    </t>
+</template>
 
-        <template id="creation_failed">
-            <t t-call="website.layout">
-                <div id="wrap">
-                    <div class="oe_structure">
+<template id="aboutus" name="About us" page="True">
+    <t t-call="website.layout">
+        <div id="wrap">
+            <div class="oe_structure">
+
+                <section data-snippet-id="title">
+                    <div class="container">
+                        <div class="row">
+                            <div class="col-md-12">
+                                <h1 class="text-center">About us</h1>
+                                <h3 class="text-muted text-center">Great products for great people</h3>
+                            </div>
+                        </div>
+                    </div>
+                </section>
+
+                <section data-snippet-id="text-image">
+                    <div class="container">
+                        <div class="row">
+                            <div class="col-md-6 mt32">
+                                <p>
+                                      We are a team of passionate people whose goal is to improve everyone's
+                                      life through disruptive products. We build great products to solve your
+                                      business problems.
+                                </p>
+                                <p>
+                                      Our products are designed for small to medium companies willing to optimize
+                                      their performance.
+                                </p>
+                            </div>
+                            <div class="col-md-4 col-md-offset-2 mt16 mb16">
+                                <img src="/website/static/src/img/library/business_conference.jpg" class="img img-responsive shadow" alt="Our Team"/>
+                            </div>
+                        </div>
+                    </div>
+                </section>
+
+                <div class="parallax oe_structure mt16 oe_medium mb64" data-scroll-background-ratio="0.6" data-snippet-id="parallax" style="background-image: url(http://localhost:8069/website/static/src/img/parallax/parallax_bg.jpg); background-attachment: scroll; background-position: 0px 0px; ">
+                    <section class="mb32 mt16" data-snippet-id="references">
                         <div class="container">
-                            <h1 class="text-center">
-                                The page "<em><t t-esc="page"/></em>"
-                                already exists
-                            </h1>
-                            <h3 class="text-center text-muted">We could not create it.</h3>
-                            <ul>
-                                <li>
-                                    You can <a t-href="#{path}">visit the existing page</a>
-                                </li>
-                                <li>Or you can <a href="#" class="create-new-page">
-                                    create an other page.</a></li>
-                            </ul>
+                            <div class="row">
+                                <div class="col-md-12 mt16 mb8">
+                                    <h1 class="text-center">What do customers say about us...</h1>
+                                </div>
+                                <div class="col-md-4 col-md-offset-1 mt16 mb0">
+                                    <blockquote data-snippet-id="quote">
+                                        <p><span style="background-color:#FFFFFF;">Write here a quote from one of your customer. Quotes are are great way to give confidence in your products or services.</span></p>
+                                        <small><span style="background-color:#FFFFFF;">Author of this quote</span></small>
+                                    </blockquote>
+                                </div>
+                                <div class="col-md-4 col-md-offset-2 mt16 mb32">
+                                    <blockquote data-snippet-id="quote">
+                                        <p><span style="background-color:#FFFFFF;">OpenERP provides essential platform for our project management. Things are better organized and more visible with it.</span></p>
+                                        <small><span style="background-color:#FFFFFF;">John Doe, CEO</span></small>
+                                    </blockquote>
+                                </div>
+                            </div>
                         </div>
-                    </div>
+                    </section>
                 </div>
-                <script type="application/javascript">
-                    $(document.body).on('click', 'a.create-new-page', function (e) {
-                        e.preventDefault();
-                        openerp.website.prompt({
-                            window_title: "New Page",
-                            input: "Page Title",
-                        }).then(function (val) {
-                            if (val) {
-                                document.location = '/pagenew/' + encodeURI(val);
-                            }
-                        });
-                    });
-                </script>
-            </t>
-        </template>
 
-        <template id="contact">
-            <address t-ignore="true">
-                <div t-att-class='"" if "name" in fields else "css_non_editable_mode_hidden"'><span t-esc="name"/></div>
-                <div class='css_editable_mode_hidden'>
-                    <div t-if="address and 'address' in fields">
-                        <i class='fa fa-map-marker'/>
-                        <span t-raw="address.replace('\n', options.get('no_tag_br') and ', ' or '&lt;br/&gt; &amp;nbsp; &amp;nbsp; ')"/>
-                    </div>
-                    <div t-if="phone and 'phone' in fields"><i class='fa fa-phone'/> <span t-esc="phone"/></div>
-                    <div t-if="mobile and 'mobile' in fields"><i class='fa fa-mobile-phone'/> <span t-esc="mobile"/></div>
-                    <div t-if="fax and 'fax' in fields"><i class='fa fa-file-text-o'/> <span t-esc="fax"/></div>
-                    <div t-if="email and 'email' in fields"><i class='fa fa-envelope'/> <span t-esc="email"/></div>
+            </div>
+            <div class="oe_structure"></div>
+        </div>
+    </t>
+</template>
+
+<template id="creation_failed">
+    <t t-call="website.layout">
+        <div id="wrap">
+            <div class="oe_structure">
+                <div class="container">
+                    <h1 class="text-center">
+                        The page "<em><t t-esc="page"/></em>"
+                        already exists
+                    </h1>
+                    <h3 class="text-center text-muted">We could not create it.</h3>
+                    <ul>
+                        <li>
+                            You can <a t-href="#{path}">visit the existing page</a>
+                        </li>
+                        <li>Or you can <a href="#" class="create-new-page">
+                            create an other page.</a></li>
+                    </ul>
                 </div>
-            </address>
-        </template>
+            </div>
+        </div>
+        <script type="application/javascript">
+            $(document.body).on('click', 'a.create-new-page', function (e) {
+                e.preventDefault();
+                openerp.website.prompt({
+                    window_title: "New Page",
+                    input: "Page Title",
+                }).then(function (val) {
+                    if (val) {
+                        document.location = '/pagenew/' + encodeURI(val);
+                    }
+                });
+            });
+        </script>
+    </t>
+</template>
+
+<template id="contact">
+    <address t-ignore="true">
+        <div t-att-class='"" if "name" in fields else "css_non_editable_mode_hidden"'><span t-esc="name"/></div>
+        <div class='css_editable_mode_hidden'>
+            <div t-if="address and 'address' in fields">
+                <i class='fa fa-map-marker'/>
+                <span t-raw="address.replace('\n', options.get('no_tag_br') and ', ' or '&lt;br/&gt; &amp;nbsp; &amp;nbsp; ')"/>
+            </div>
+            <div t-if="phone and 'phone' in fields"><i class='fa fa-phone'/> <span t-esc="phone"/></div>
+            <div t-if="mobile and 'mobile' in fields"><i class='fa fa-mobile-phone'/> <span t-esc="mobile"/></div>
+            <div t-if="fax and 'fax' in fields"><i class='fa fa-file-text-o'/> <span t-esc="fax"/></div>
+            <div t-if="email and 'email' in fields"><i class='fa fa-envelope'/> <span t-esc="email"/></div>
+        </div>
+    </address>
+</template>
+
      </data>
 </openerp>
diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index ba54d07b240..e3ee875d143 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -1,395 +1,396 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
-    <template id="editor_head" inherit_id="website.editor_head" name="Blog Editor" groups="base.group_website_designer">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/website_blog/static/src/js/website_blog.editor.js"></script>
-            <script type="text/javascript" src="/website_blog/static/src/js/website.tour.blog.js"></script>
-        </xpath>
-    </template>
 
-    <!-- Layout add nav and footer -->
-    <template id="header_footer_custom" inherit_id="website.layout" name="Footer News Blog Link">
-        <xpath expr="//footer//div[@name='info']/ul" position="inside">
-            <li><a t-href="/blog/%(website_blog.blog_category_1)d/">News</a></li>
-        </xpath>
-    </template>
+<template id="editor_head" inherit_id="website.editor_head" name="Blog Editor" groups="base.group_website_designer">
+    <xpath expr="//script[last()]" position="after">
+        <script type="text/javascript" src="/website_blog/static/src/js/website_blog.editor.js"></script>
+        <script type="text/javascript" src="/website_blog/static/src/js/website.tour.blog.js"></script>
+    </xpath>
+</template>
 
-    <!-- Blog Post Summary -->
-    <template id="latest_blogs" name="Latest Blogs">
-        <t t-call="website.layout">
-            <div id="wrap">
-                <div class="oe_structure"/>
-                <section groups="base.group_website_publisher">
-                    <div class="container text-center mt16">
-                        <div class="alert alert-warning alert-dismissable">
-                           <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&amp;times;</button>
-                           <p>
-                           This page is great to improve your <strong>Search Engine Optimization</strong>;
-                           You can review titles, keywords and descriptions of all blogs at once.
-                           </p><p>
-                           You should <strong>add a banner on the top</strong> as it is a frequent landing page for new visitors.
-                           <span class="text-muted">This box will not be visible to your visitors.</span>
-                           </p>
-                        </div>
+<!-- Layout add nav and footer -->
+<template id="header_footer_custom" inherit_id="website.layout" name="Footer News Blog Link">
+    <xpath expr="//footer//div[@name='info']/ul" position="inside">
+        <li><a t-href="/blog/%(website_blog.blog_category_1)d/">News</a></li>
+    </xpath>
+</template>
+
+<!-- Blog Post Summary -->
+<template id="latest_blogs" name="Latest Blogs">
+    <t t-call="website.layout">
+        <div id="wrap">
+            <div class="oe_structure"/>
+            <section groups="base.group_website_publisher">
+                <div class="container text-center mt16">
+                    <div class="alert alert-warning alert-dismissable">
+                       <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&amp;times;</button>
+                       <p>
+                       This page is great to improve your <strong>Search Engine Optimization</strong>;
+                       You can review titles, keywords and descriptions of all blogs at once.
+                       </p><p>
+                       You should <strong>add a banner on the top</strong> as it is a frequent landing page for new visitors.
+                       <span class="text-muted">This box will not be visible to your visitors.</span>
+                       </p>
                     </div>
-                </section>
-                <section class="container">
-                    <t t-call="website.pager" >
-                        <t t-set="classname">pull-right</t>
-                    </t>
-                </section>
-                <section data-snippet-id="title" class="container">
-                    <div class="row">
-                        <div class="col-md-12 text-center">
-                            <h1>Latest Blogs</h1>
-                        </div>
-                    </div>
-                </section>
-                <section class="container">
-                    <div class="row">
-                        <t t-set="count" t-value="0"/>
-                        <t t-foreach="blogs" t-as="blog">
-                          <div class="col-md-4">
-                            <h4>
-                                <a t-href="/blogpost/#{ slug(blog) }?#{ tag and 'tag=%s' % tag.id or '' }#{tag and date and '&amp;' or ''}#{ date and 'date=%s' % date or ''}" t-field="blog.name"></a>
-                                <span t-if="not blog.website_published" class="text-warning">
-                                    &amp;nbsp;
-                                    <span class="fa fa-warning" title="Not published"/>
-                                </span>
-                            </h4>
-                            <div class="text-muted">
-                                <span class="fa fa-calendar"> <span t-field="blog.create_date"/> &amp;nbsp;</span>
-                                <span class="fa fa-folder-open"> In
-                                    <a t-href="/blog/#{ slug(blog.category_id) }">
-                                    <span t-field="blog.category_id"/>
-                                    </a> &amp;nbsp;
-                                </span>
-                            </div>
-                            <div class="text-muted fa fa-tags">
-                                <span t-field="blog.website_meta_keywords"/>
-                                <span t-if="editable and not blog.website_meta_keywords" class="label label-danger">
-                                    No keywords defined!
-                                </span>
-                            </div>
-                            <div class="text-muted" t-if="len(blog.message_ids) &gt; 0">
-                                <span class="fa fa-comment-o">
-                                    <a t-href="/blogpost/#{ slug(blog) }/?#{ tag and 'tag=%s' % tag.id or '' }#{tag and date and '&amp;' or ''}#{ date and 'date=%s' % date or ''}#comment">
-                                        <t t-if="len(blog.message_ids) &lt;= 1" ><t t-esc="len(blog.message_ids)"/> comment</t>
-                                        <t t-if="len(blog.message_ids) > 1"><t t-esc="len(blog.message_ids)"/> comments</t>
-                                    </a>
-                                </span>
-                            </div>
-                            <div class="text-muted mb16" t-field="blog.website_meta_description"/>
-                          </div>
-                          <t t-set="count" t-value="count+1"/>
-                          <div class="clearfix" t-if="(count % 3) == 0"/>
-                        </t>
-                    </div>
-                </section>
-                <div class="oe_structure"/>
-            </div>
-        </t>
-    </template>
-
-
-    <!-- Blog Post Summary -->
-    <template id="blog_post_short" name="Blog Post Summary">
-        <t t-call="website_blog.index">
-        <div t-if="not blog_posts">
-            <h1>
-                No blog post yet!
-            </h1>
-            <p groups="base.group_website_publisher">
-                To create a new blog post, use the top-right menu <em>Content</em>
-                and select the menuitem <em>New Blog Post</em>.
-            </p>
-
-        </div>
-        <t t-foreach="blog_posts" t-as="blog_post">
-          <div t-att-data-publish="blog_post.website_published and 'on' or 'off'">
-            <h2 class="text-center">
-                <a t-href="/blogpost/#{ slug(blog_post) }/?#{ tag and 'tag=%s' % tag.id or '' }#{tag and date and '&amp;' or ''}#{ date and 'date=%s' % date or ''}" t-field="blog_post.name"></a>
-            </h2>
-            <p class="post-meta text-muted text-center" name='blog_post_data'>
-                <span class="fa fa-calendar oe_date"> <span t-field="blog_post.create_date"/> &amp;nbsp;</span>
-                <span t-if="len(blog_post.message_ids) &gt; 0" class="fa fa-comment-o">
-                    <a t-href="/blogpost/#{ slug(blog_post) }/?#{ tag and 'tag=%s' % tag.id or '' }#{tag and date and '&amp;' or ''}#{ date and 'date=%s' % date or ''}#comment">
-                        <t t-if="len(blog_post.message_ids) &lt;= 1" ><t t-esc="len(blog_post.message_ids)"/> comment</t>
-                        <t t-if="len(blog_post.message_ids) > 1"><t t-esc="len(blog_post.message_ids)"/> comments</t>
-                    </a>
-                </span>
-                <span t-if="not blog_post.website_published" class="label label-danger">not published</span>
-            </p>
-            <div t-raw="blog_post.shortened_content" class="blog_content"/>
-            <hr/>
-          </div>
-
-        </t>
-        </t>
-    </template>
-
-    <!-- Options: Blog Post Summary: hide author -->
-    <template id="opt_blog_post_short_author" name="Author"
-            inherit_option_id="website_blog.blog_post_short">
-        <xpath expr="//span[@class*='oe_date']" position="after">
-            <span class="fa fa-user"> By <span t-field="blog_post.create_uid"/> &amp;nbsp;</span>
-        </xpath>
-    </template>
-
-    <!-- Option: Blog Post Summary: show tags -->
-    <template id="opt_blog_post_short_tags" name="Tags"
-            inherit_option_id="website_blog.blog_post_short" inherit_id="website_blog.blog_post_short">
-        <xpath expr="//p[@name='blog_post_data']" position="after">
-            <p class="post-meta text-muted text-center" t-if="len(blog_post.tag_ids)">
-                <span class="fa fa-tags"/>
-                <t t-foreach="blog_post.tag_ids" t-as="tag">
-                    <a t-href="/blog/#{ slug(category) }/tag/#{ slug(tag) }" t-esc="tag.name"/> &amp;nbsp;
+                </div>
+            </section>
+            <section class="container">
+                <t t-call="website.pager" >
+                    <t t-set="classname">pull-right</t>
                 </t>
-            </p>
-        </xpath>
-    </template>
-
-    <!-- Blog Post Complete -->
-    <template id="blog_post_complete" name="Blog Post">
-        <t t-call="website_blog.index">
-
-        <div class="row">
-          <div class="col-sm-9">
-              <ol class="breadcrumb">
-                  <li><a t-href="/blog/#{ slug(category) }"><span t-field="category.name"/></a></li>
-                  <li t-if="tag"><a t-href="/blog/#{ slug(category) }/tag/#{ slug(tag) }"><span t-field="tag.name"/></a></li>
-                  <li t-if="tag and date"><a t-href="/blog/#{ slug(category) }/tag/#{ slug(tag) }/date/#{ date }" t-esc="date_name"/></li>
-                  <li t-if="not tag and date"><a t-href="/blog/#{ slug(category) }/date/#{ date }" t-esc="date_name"/></li>
-                  <li class="active"><span t-field="blog_post.name"/></li>
-              </ol>
-          </div><div class="col-sm-3">
-            <t t-call="website.publish_management">
-                <t t-set="object" t-value="blog_post"/>
-                <t t-set="publish_edit" t-value="True"/>
-                <li>
-                    <form class="duplicate hidden" action="/blogpost/duplicate">
-                        <input name="blog_post_id" t-att-value="blog_post.id"/>
-                    </form>
-                    <a href="#" class="duplicate" onclick="$(this).prev('form').submit()">Duplicate</a>
-                </li>
-            </t>
-          </div>
+            </section>
+            <section data-snippet-id="title" class="container">
+                <div class="row">
+                    <div class="col-md-12 text-center">
+                        <h1>Latest Blogs</h1>
+                    </div>
+                </div>
+            </section>
+            <section class="container">
+                <div class="row">
+                    <t t-set="count" t-value="0"/>
+                    <t t-foreach="blogs" t-as="blog">
+                      <div class="col-md-4">
+                        <h4>
+                            <a t-href="/blogpost/#{ slug(blog) }?#{ tag and 'tag=%s' % tag.id or '' }#{tag and date and '&amp;' or ''}#{ date and 'date=%s' % date or ''}" t-field="blog.name"></a>
+                            <span t-if="not blog.website_published" class="text-warning">
+                                &amp;nbsp;
+                                <span class="fa fa-warning" title="Not published"/>
+                            </span>
+                        </h4>
+                        <div class="text-muted">
+                            <span class="fa fa-calendar"> <span t-field="blog.create_date"/> &amp;nbsp;</span>
+                            <span class="fa fa-folder-open"> In
+                                <a t-href="/blog/#{ slug(blog.category_id) }">
+                                <span t-field="blog.category_id"/>
+                                </a> &amp;nbsp;
+                            </span>
+                        </div>
+                        <div class="text-muted fa fa-tags">
+                            <span t-field="blog.website_meta_keywords"/>
+                            <span t-if="editable and not blog.website_meta_keywords" class="label label-danger">
+                                No keywords defined!
+                            </span>
+                        </div>
+                        <div class="text-muted" t-if="len(blog.message_ids) &gt; 0">
+                            <span class="fa fa-comment-o">
+                                <a t-href="/blogpost/#{ slug(blog) }/?#{ tag and 'tag=%s' % tag.id or '' }#{tag and date and '&amp;' or ''}#{ date and 'date=%s' % date or ''}#comment">
+                                    <t t-if="len(blog.message_ids) &lt;= 1" ><t t-esc="len(blog.message_ids)"/> comment</t>
+                                    <t t-if="len(blog.message_ids) > 1"><t t-esc="len(blog.message_ids)"/> comments</t>
+                                </a>
+                            </span>
+                        </div>
+                        <div class="text-muted mb16" t-field="blog.website_meta_description"/>
+                      </div>
+                      <t t-set="count" t-value="count+1"/>
+                      <div class="clearfix" t-if="(count % 3) == 0"/>
+                    </t>
+                </div>
+            </section>
+            <div class="oe_structure"/>
         </div>
+    </t>
+</template>
 
-        <div class="clearfix"/>
 
-        <h1 class="text-center" t-field="blog_post.name"/>
-        <p class="post-meta text-muted text-center" name="blog_post_data">
-            <span class="fa fa-calendar"> <span t-field="blog_post.create_date"/> &amp;nbsp;</span>
-            <span t-if="len(blog_post.message_ids) &gt; 0" class="fa fa-comment-o"> With
-                <a t-attf-href="#comments">
+<!-- Blog Post Summary -->
+<template id="blog_post_short" name="Blog Post Summary">
+    <t t-call="website_blog.index">
+    <div t-if="not blog_posts">
+        <h1>
+            No blog post yet!
+        </h1>
+        <p groups="base.group_website_publisher">
+            To create a new blog post, use the top-right menu <em>Content</em>
+            and select the menuitem <em>New Blog Post</em>.
+        </p>
+
+    </div>
+    <t t-foreach="blog_posts" t-as="blog_post">
+      <div t-att-data-publish="blog_post.website_published and 'on' or 'off'">
+        <h2 class="text-center">
+            <a t-href="/blogpost/#{ slug(blog_post) }/?#{ tag and 'tag=%s' % tag.id or '' }#{tag and date and '&amp;' or ''}#{ date and 'date=%s' % date or ''}" t-field="blog_post.name"></a>
+        </h2>
+        <p class="post-meta text-muted text-center" name='blog_post_data'>
+            <span class="fa fa-calendar oe_date"> <span t-field="blog_post.create_date"/> &amp;nbsp;</span>
+            <span t-if="len(blog_post.message_ids) &gt; 0" class="fa fa-comment-o">
+                <a t-href="/blogpost/#{ slug(blog_post) }/?#{ tag and 'tag=%s' % tag.id or '' }#{tag and date and '&amp;' or ''}#{ date and 'date=%s' % date or ''}#comment">
                     <t t-if="len(blog_post.message_ids) &lt;= 1" ><t t-esc="len(blog_post.message_ids)"/> comment</t>
                     <t t-if="len(blog_post.message_ids) > 1"><t t-esc="len(blog_post.message_ids)"/> comments</t>
                 </a>
             </span>
+            <span t-if="not blog_post.website_published" class="label label-danger">not published</span>
         </p>
+        <div t-raw="blog_post.shortened_content" class="blog_content"/>
+        <hr/>
+      </div>
 
-        <div t-field="blog_post.content" class="mt16"/>
-        <hr class="mb32"/>
+    </t>
+    </t>
+</template>
 
-        <a id="comments"/>
-        <ul class="media-list" id="comments-list">
-            <li t-foreach="blog_post.website_message_ids" t-as="message" class="media">
-                <div class="media-body">
-                    <img class="media-object pull-left" t-att-src="'/website/image?model=res.partner&amp;field=image_small&amp;id='+str(message.author_id.id)" style="width: 50px; margin-right: 10px;"/>
-                    <div class="media-body">
-                        <t t-call="website.publish_short">
-                            <t t-set="object" t-value="message"/>
-                        </t>
-                        <h5 class="media-heading">
-                            <span t-field="message.author_id"/> <small>on <span t-field="message.date"/></small>
-                        </h5>
-                        <div t-field="message.body"/>
-                    </div>
-                </div>
-            </li>
-        </ul>
-        </t>
-    </template>
+<!-- Options: Blog Post Summary: hide author -->
+<template id="opt_blog_post_short_author" name="Author"
+        inherit_option_id="website_blog.blog_post_short">
+    <xpath expr="//span[@class*='oe_date']" position="after">
+        <span class="fa fa-user"> By <span t-field="blog_post.create_uid"/> &amp;nbsp;</span>
+    </xpath>
+</template>
 
-    <!-- Options: Blog Post: user can reply -->
-    <template id="opt_blog_post_complete_comment" name="Allow Comments"
-            inherit_option_id="website_blog.blog_post_complete" inherit_id="website_blog.blog_post_complete"
-            groups="website_mail.group_comment">
-        <xpath expr="//ul[@id='comments-list']" position="after">
-            <section class="mb32 css_editable_mode_hidden">
-                <form id="comment" t-attf-action="/blogpost/#{blog_post.id}/comment"
-                        method="POST">
-                    <img class="img pull-left img-rounded" t-att-src="'/website/image?model=res.partner&amp;field=image_small&amp;id='+str(user_id.partner_id.id)" style="width: 50px; margin-right: 10px;"/>
-                    <div class="pull-left mb32" style="width: 75%%">
-                        <textarea rows="3" name="comment" class="form-control" placeholder="Write a comment..."></textarea>
-                        <button type="submit" class="btn btn-primary mt8">Post</button>
-                    </div>
-                </form>
-            </section>
-            <div class="clearfix"/>
-        </xpath>
-    </template>
-
-    <!-- Options: Blog Post: hide author -->
-    <template id="opt_blog_post_complete_author" name="Authors"
-            inherit_option_id="website_blog.blog_post_complete">
-        <xpath expr="//span[@class*='oe_date']" position="after">
-            <span class="fa fa-user"> By <span t-field="blog_post.create_uid"/> &amp;nbsp;</span>
-        </xpath>
-    </template>
-
-    <!-- Options: Blog Post: show category -->
-    <template id="opt_blog_post_complete_category" name="Blog Category"
-            inherit_option_id="website_blog.blog_post_complete">
-        <xpath expr="//span[@class*='oe_date']" position="after">
-            <span class="fa fa-folder-open"> In <span t-field="blog_post.category_id"/> &amp;nbsp;</span>
-        </xpath>
-    </template>
-
-    <!-- Options: Blog Post: show tags -->
-    <template id="opt_blog_post_complete_tags" name="Tags"
-            inherit_option_id="website_blog.blog_post_complete" inherit_id="website_blog.blog_post_complete">
-        <xpath expr="//p[@name='blog_post_data']" position="after">
-            <p class="post-meta text-muted text-center" t-if="len(blog_post.tag_ids)">
-                <span class="fa fa-tags"/>
-                <t t-foreach="blog_post.tag_ids" t-as="tag">
-                    <a t-href="/blog/#{ slug(category) }/tag/#{ slug(tag) }" t-esc="tag.name"/> &amp;nbsp;
-                </t>
-            </p>
-        </xpath>
-    </template>
-
-    <!-- Page -->
-    <template id="index" name="Blog Navigation">
-        <t t-call="website.layout">
-            <t t-set="head">
-                <link rel='stylesheet' href='/website_blog/static/src/css/website_blog.css'/>
+<!-- Option: Blog Post Summary: show tags -->
+<template id="opt_blog_post_short_tags" name="Tags"
+        inherit_option_id="website_blog.blog_post_short" inherit_id="website_blog.blog_post_short">
+    <xpath expr="//p[@name='blog_post_data']" position="after">
+        <p class="post-meta text-muted text-center" t-if="len(blog_post.tag_ids)">
+            <span class="fa fa-tags"/>
+            <t t-foreach="blog_post.tag_ids" t-as="tag">
+                <a t-href="/blog/#{ slug(category) }/tag/#{ slug(tag) }" t-esc="tag.name"/> &amp;nbsp;
             </t>
-            <div id="wrap">
-                <div class="oe_structure"></div>
-                <div class="container mt16 js_website_blog">
-                    <div class="row">
-                        <div class="col-lg-12 col-sm-12" id="blog_left_column">
-                            <t t-raw="0"/>
-                        </div>
-                        <div class="col-lg-3 col-lg-offset-1 col-sm-4" id="blog_right_column"/>
-                    </div>
-                </div>
-                <div class="oe_structure"></div>
-            </div>
+        </p>
+    </xpath>
+</template>
+
+<!-- Blog Post Complete -->
+<template id="blog_post_complete" name="Blog Post">
+    <t t-call="website_blog.index">
+
+    <div class="row">
+      <div class="col-sm-9">
+          <ol class="breadcrumb">
+              <li><a t-href="/blog/#{ slug(category) }"><span t-field="category.name"/></a></li>
+              <li t-if="tag"><a t-href="/blog/#{ slug(category) }/tag/#{ slug(tag) }"><span t-field="tag.name"/></a></li>
+              <li t-if="tag and date"><a t-href="/blog/#{ slug(category) }/tag/#{ slug(tag) }/date/#{ date }" t-esc="date_name"/></li>
+              <li t-if="not tag and date"><a t-href="/blog/#{ slug(category) }/date/#{ date }" t-esc="date_name"/></li>
+              <li class="active"><span t-field="blog_post.name"/></li>
+          </ol>
+      </div><div class="col-sm-3">
+        <t t-call="website.publish_management">
+            <t t-set="object" t-value="blog_post"/>
+            <t t-set="publish_edit" t-value="True"/>
+            <li>
+                <form class="duplicate hidden" action="/blogpost/duplicate">
+                    <input name="blog_post_id" t-att-value="blog_post.id"/>
+                </form>
+                <a href="#" class="duplicate" onclick="$(this).prev('form').submit()">Duplicate</a>
+            </li>
         </t>
-    </template>
+      </div>
+    </div>
 
-    <!-- Option: Right Column: tags -->
-    <template id="opt_blog_rc_tags" name="Tags"
-            inherit_option_id="website_blog.index" inherit_id="website_blog.index">
-        <xpath expr="//div[@id='blog_right_column']" position="inside">
-            <section class="mt32">
-            <h4>Tags</h4>
-            <ul class="nav nav-pills nav-stacked">
-                <t t-foreach="tags" t-as="tag_id">
-                <li t-att-class="tag and tag_id.id == tag.id and 'active' or None" style="display: inline-block;">
-                    <a t-href="/blog/#{ slug(category) }/tag/#{ slug(tag_id) }"><span t-field="tag_id.name"/></a>
-                </li>
-                </t>
-            </ul>
-            </section>
-        </xpath>
-    </template>
+    <div class="clearfix"/>
 
-    <!-- Option: Right Column: archives -->
-    <template id="opt_blog_rc_history" name="Archives"
-            inherit_option_id="website_blog.index" inherit_id="website_blog.index">
-        <xpath expr="//div[@id='blog_left_column']" position="attributes">
-            <attribute name="class">col-lg-8 col-sm-8</attribute>
-        </xpath>
-        <xpath expr="//div[@id='blog_right_column']" position="inside">
-            <section class="mt32">
-            <h4>Archives</h4>
-            <ul class="nav nav-pills nav-stacked">
-                <t t-foreach="nav_list" t-as="months">
-                <li t-att-class="months['date'] == date and 'active' or None">
-                    <a t-ignore="True" t-href="/blog/#{ slug(category) }/#{ tag and 'tag/%s/' % slug(tag) or '' }date/#{ months['date'] }"><t t-esc="months['create_date']"/><span class="pull-right badge" t-esc="months['create_date_count']"/></a>
-                </li>
-                </t>
-            </ul>
-            </section>
-        </xpath>
-    </template>
+    <h1 class="text-center" t-field="blog_post.name"/>
+    <p class="post-meta text-muted text-center" name="blog_post_data">
+        <span class="fa fa-calendar"> <span t-field="blog_post.create_date"/> &amp;nbsp;</span>
+        <span t-if="len(blog_post.message_ids) &gt; 0" class="fa fa-comment-o"> With
+            <a t-attf-href="#comments">
+                <t t-if="len(blog_post.message_ids) &lt;= 1" ><t t-esc="len(blog_post.message_ids)"/> comment</t>
+                <t t-if="len(blog_post.message_ids) > 1"><t t-esc="len(blog_post.message_ids)"/> comments</t>
+            </a>
+        </span>
+    </p>
 
-    <!-- Option: Right Column: about us -->
-    <template id="opt_blog_rc_about_us" name="About Us" priority="2"
-            inherit_option_id="website_blog.index" inherit_id="website_blog.index">
-        <xpath expr="//div[@id='blog_left_column']" position="attributes">
-            <attribute name="class">col-lg-8 col-sm-8</attribute>
-        </xpath>
-        <xpath expr="//div[@id='blog_right_column']" position="inside">
-            <section class="mt32">
-            <h4>About us</h4>
-            <p>
-                Write a small text here for when <b>new visitors</b> find your website
-                through your <b>blog entries</b>, referenced in Google.
-            </p>
-            <div>
-                <a href="/page/website.contactus"><button class="btn btn-primary">Contact us</button></a>
-            </div>
-            </section>
-        </xpath>
-    </template>
+    <div t-field="blog_post.content" class="mt16"/>
+    <hr class="mb32"/>
 
-    <!-- Option: Right Column: follow us -->
-    <template id="opt_blog_rc_follow_us" name="Follow us" priority="4"
-            inherit_option_id="website_blog.index" inherit_id="website_blog.index">
-        <xpath expr="//div[@id='blog_left_column']" position="attributes">
-            <attribute name="class">col-lg-8 col-sm-8</attribute>
-        </xpath>
-        <xpath expr="//div[@id='blog_right_column']" position="inside">
-            <section class="mt32">
-                <h4>Follow us<small t-if="category">: <t t-esc="category.name"/></small></h4>
-                <t t-if="category">
-                    <t t-call="website_mail.follow">
-                        <t t-set="email" t-value="user_id.email"/>
-                        <t t-set="object" t-value="category"/>
+    <a id="comments"/>
+    <ul class="media-list" id="comments-list">
+        <li t-foreach="blog_post.website_message_ids" t-as="message" class="media">
+            <div class="media-body">
+                <img class="media-object pull-left" t-att-src="'/website/image?model=res.partner&amp;field=image_small&amp;id='+str(message.author_id.id)" style="width: 50px; margin-right: 10px;"/>
+                <div class="media-body">
+                    <t t-call="website.publish_short">
+                        <t t-set="object" t-value="message"/>
                     </t>
-                </t>
-                <p class="text-muted mb0 mt16">
-                    Participate on our social stream.
-                </p>
-                <h2 class="mt4">
-                    <a t-att-href="website.social_facebook" t-if="website.social_facebook"><i class="fa fa-facebook-square"/></a>
-                    <a t-att-href="website.social_twitter" t-if="website.social_twitter"><i class="fa fa-twitter"/></a>
-                    <a t-att-href="website.social_linkedin" t-if="website.social_linkedin"><i class="fa fa-linkedin"/></a>
-                    <a t-att-href="website.social_youtube" t-if="website.social_youtube"><i class="fa fa-youtube-play"/></a>
-                    <a t-att-href="website.social_googleplus" t-if="website.social_googleplus"><i class="fa fa-google-plus-square"/></a>
-                    <a t-att-href="website.social_github" t-if="website.social_github"><i class="fa fa-github"/></a>
-                </h2>
-            </section>
-        </xpath>
-    </template>
+                    <h5 class="media-heading">
+                        <span t-field="message.author_id"/> <small>on <span t-field="message.date"/></small>
+                    </h5>
+                    <div t-field="message.body"/>
+                </div>
+            </div>
+        </li>
+    </ul>
+    </t>
+</template>
 
-    <!-- Option: Right Column: categories -->
-    <template id="opt_blog_rc_categories" name="Our Blogs" priority="6"
-            inherit_option_id="website_blog.index">
-        <xpath expr="//div[@id='blog_left_column']" position="attributes">
-            <attribute name="class">col-lg-8 col-sm-8</attribute>
-        </xpath>
-        <xpath expr="//div[@id='blog_right_column']" position="inside">
-            <section class="mt32 mb32">
-            <h4>Our Blogs</h4>
-            <ul class="nav nav-pills nav-stacked">
-                <t t-foreach="categories" t-as="nav_category">
-                    <li t-att-class="nav_category.id == category.id and 'active' or ''">
-                        <a t-href="/blog/#{ slug(nav_category) }">
-                            <span t-field="nav_category.name"/>
-                        </a>
-                    </li>
+<!-- Options: Blog Post: user can reply -->
+<template id="opt_blog_post_complete_comment" name="Allow Comments"
+        inherit_option_id="website_blog.blog_post_complete" inherit_id="website_blog.blog_post_complete"
+        groups="website_mail.group_comment">
+    <xpath expr="//ul[@id='comments-list']" position="after">
+        <section class="mb32 css_editable_mode_hidden">
+            <form id="comment" t-attf-action="/blogpost/#{blog_post.id}/comment"
+                    method="POST">
+                <img class="img pull-left img-rounded" t-att-src="'/website/image?model=res.partner&amp;field=image_small&amp;id='+str(user_id.partner_id.id)" style="width: 50px; margin-right: 10px;"/>
+                <div class="pull-left mb32" style="width: 75%%">
+                    <textarea rows="3" name="comment" class="form-control" placeholder="Write a comment..."></textarea>
+                    <button type="submit" class="btn btn-primary mt8">Post</button>
+                </div>
+            </form>
+        </section>
+        <div class="clearfix"/>
+    </xpath>
+</template>
+
+<!-- Options: Blog Post: hide author -->
+<template id="opt_blog_post_complete_author" name="Authors"
+        inherit_option_id="website_blog.blog_post_complete">
+    <xpath expr="//span[@class*='oe_date']" position="after">
+        <span class="fa fa-user"> By <span t-field="blog_post.create_uid"/> &amp;nbsp;</span>
+    </xpath>
+</template>
+
+<!-- Options: Blog Post: show category -->
+<template id="opt_blog_post_complete_category" name="Blog Category"
+        inherit_option_id="website_blog.blog_post_complete">
+    <xpath expr="//span[@class*='oe_date']" position="after">
+        <span class="fa fa-folder-open"> In <span t-field="blog_post.category_id"/> &amp;nbsp;</span>
+    </xpath>
+</template>
+
+<!-- Options: Blog Post: show tags -->
+<template id="opt_blog_post_complete_tags" name="Tags"
+        inherit_option_id="website_blog.blog_post_complete" inherit_id="website_blog.blog_post_complete">
+    <xpath expr="//p[@name='blog_post_data']" position="after">
+        <p class="post-meta text-muted text-center" t-if="len(blog_post.tag_ids)">
+            <span class="fa fa-tags"/>
+            <t t-foreach="blog_post.tag_ids" t-as="tag">
+                <a t-href="/blog/#{ slug(category) }/tag/#{ slug(tag) }" t-esc="tag.name"/> &amp;nbsp;
+            </t>
+        </p>
+    </xpath>
+</template>
+
+<!-- Page -->
+<template id="index" name="Blog Navigation">
+    <t t-call="website.layout">
+        <t t-set="head">
+            <link rel='stylesheet' href='/website_blog/static/src/css/website_blog.css'/>
+        </t>
+        <div id="wrap">
+            <div class="oe_structure"></div>
+            <div class="container mt16 js_website_blog">
+                <div class="row">
+                    <div class="col-lg-12 col-sm-12" id="blog_left_column">
+                        <t t-raw="0"/>
+                    </div>
+                    <div class="col-lg-3 col-lg-offset-1 col-sm-4" id="blog_right_column"/>
+                </div>
+            </div>
+            <div class="oe_structure"></div>
+        </div>
+    </t>
+</template>
+
+<!-- Option: Right Column: tags -->
+<template id="opt_blog_rc_tags" name="Tags"
+        inherit_option_id="website_blog.index" inherit_id="website_blog.index">
+    <xpath expr="//div[@id='blog_right_column']" position="inside">
+        <section class="mt32">
+        <h4>Tags</h4>
+        <ul class="nav nav-pills nav-stacked">
+            <t t-foreach="tags" t-as="tag_id">
+            <li t-att-class="tag and tag_id.id == tag.id and 'active' or None" style="display: inline-block;">
+                <a t-href="/blog/#{ slug(category) }/tag/#{ slug(tag_id) }"><span t-field="tag_id.name"/></a>
+            </li>
+            </t>
+        </ul>
+        </section>
+    </xpath>
+</template>
+
+<!-- Option: Right Column: archives -->
+<template id="opt_blog_rc_history" name="Archives"
+        inherit_option_id="website_blog.index" inherit_id="website_blog.index">
+    <xpath expr="//div[@id='blog_left_column']" position="attributes">
+        <attribute name="class">col-lg-8 col-sm-8</attribute>
+    </xpath>
+    <xpath expr="//div[@id='blog_right_column']" position="inside">
+        <section class="mt32">
+        <h4>Archives</h4>
+        <ul class="nav nav-pills nav-stacked">
+            <t t-foreach="nav_list" t-as="months">
+            <li t-att-class="months['date'] == date and 'active' or None">
+                <a t-ignore="True" t-href="/blog/#{ slug(category) }/#{ tag and 'tag/%s/' % slug(tag) or '' }date/#{ months['date'] }"><t t-esc="months['create_date']"/><span class="pull-right badge" t-esc="months['create_date_count']"/></a>
+            </li>
+            </t>
+        </ul>
+        </section>
+    </xpath>
+</template>
+
+<!-- Option: Right Column: about us -->
+<template id="opt_blog_rc_about_us" name="About Us" priority="2"
+        inherit_option_id="website_blog.index" inherit_id="website_blog.index">
+    <xpath expr="//div[@id='blog_left_column']" position="attributes">
+        <attribute name="class">col-lg-8 col-sm-8</attribute>
+    </xpath>
+    <xpath expr="//div[@id='blog_right_column']" position="inside">
+        <section class="mt32">
+        <h4>About us</h4>
+        <p>
+            Write a small text here for when <b>new visitors</b> find your website
+            through your <b>blog entries</b>, referenced in Google.
+        </p>
+        <div>
+            <a href="/page/website.contactus"><button class="btn btn-primary">Contact us</button></a>
+        </div>
+        </section>
+    </xpath>
+</template>
+
+<!-- Option: Right Column: follow us -->
+<template id="opt_blog_rc_follow_us" name="Follow us" priority="4"
+        inherit_option_id="website_blog.index" inherit_id="website_blog.index">
+    <xpath expr="//div[@id='blog_left_column']" position="attributes">
+        <attribute name="class">col-lg-8 col-sm-8</attribute>
+    </xpath>
+    <xpath expr="//div[@id='blog_right_column']" position="inside">
+        <section class="mt32">
+            <h4>Follow us<small t-if="category">: <t t-esc="category.name"/></small></h4>
+            <t t-if="category">
+                <t t-call="website_mail.follow">
+                    <t t-set="email" t-value="user_id.email"/>
+                    <t t-set="object" t-value="category"/>
                 </t>
-            </ul>
-            </section>
-        </xpath>
-    </template>
+            </t>
+            <p class="text-muted mb0 mt16">
+                Participate on our social stream.
+            </p>
+            <h2 class="mt4">
+                <a t-att-href="website.social_facebook" t-if="website.social_facebook"><i class="fa fa-facebook-square"/></a>
+                <a t-att-href="website.social_twitter" t-if="website.social_twitter"><i class="fa fa-twitter"/></a>
+                <a t-att-href="website.social_linkedin" t-if="website.social_linkedin"><i class="fa fa-linkedin"/></a>
+                <a t-att-href="website.social_youtube" t-if="website.social_youtube"><i class="fa fa-youtube-play"/></a>
+                <a t-att-href="website.social_googleplus" t-if="website.social_googleplus"><i class="fa fa-google-plus-square"/></a>
+                <a t-att-href="website.social_github" t-if="website.social_github"><i class="fa fa-github"/></a>
+            </h2>
+        </section>
+    </xpath>
+</template>
+
+<!-- Option: Right Column: categories -->
+<template id="opt_blog_rc_categories" name="Our Blogs" priority="6"
+        inherit_option_id="website_blog.index">
+    <xpath expr="//div[@id='blog_left_column']" position="attributes">
+        <attribute name="class">col-lg-8 col-sm-8</attribute>
+    </xpath>
+    <xpath expr="//div[@id='blog_right_column']" position="inside">
+        <section class="mt32 mb32">
+        <h4>Our Blogs</h4>
+        <ul class="nav nav-pills nav-stacked">
+            <t t-foreach="categories" t-as="nav_category">
+                <li t-att-class="nav_category.id == category.id and 'active' or ''">
+                    <a t-href="/blog/#{ slug(nav_category) }">
+                        <span t-field="nav_category.name"/>
+                    </a>
+                </li>
+            </t>
+        </ul>
+        </section>
+    </xpath>
+</template>
 
 </data>
 </openerp>
diff --git a/addons/website_crm/views/website_crm.xml b/addons/website_crm/views/website_crm.xml
index ed7d2b8c6a7..1ea1dad3869 100644
--- a/addons/website_crm/views/website_crm.xml
+++ b/addons/website_crm/views/website_crm.xml
@@ -1,91 +1,91 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+<data>
 
-        <template id="contactus_form" name="Contact Form" inherit_id="website.contactus" inherit_option_id="website.contactus">
-            <xpath expr="//div[@name='mail_button']" position="replace">
-                <form action="/crm/contactus" method="post" class="form-horizontal mt32" >
-                    <div t-attf-class="form-group #{error and 'contact_name' in error and 'has-error' or ''}">
-                        <label class="col-md-3 col-sm-4 control-label" for="contact_name">Your Name</label>
-                        <div class="col-md-7 col-sm-8">
-                            <input type="text" class="form-control" name="contact_name" required="True" t-attf-value="#{contact_name or ''}"/>
-                        </div>
-                    </div>
-                    <div t-attf-class="form-group #{error and 'phone' in error and 'has-error' or ''}">
-                        <label class="col-md-3 col-sm-4 control-label" for="phone">Phone Number</label>
-                        <div class="col-md-7 col-sm-8">
-                            <input type="text" class="form-control" name="phone" placeholder="e.g. (+32).81.81.37.00" t-attf-value="#{phone or ''}"/>
-                        </div>
-                    </div>
-                    <div name="email_from_container" t-attf-class="form-group #{error and 'email_from' in error and 'has-error' or ''}">
-                        <label class="col-md-3 col-sm-4 control-label" for="email_from">Email</label>
-                        <div class="col-md-7 col-sm-8">
-                            <input type="email" class="form-control" name="email_from" required="True" t-attf-value="#{email_from or ''}"/>
-                        </div>
-                    </div>
-                    <div t-attf-class="form-group #{error and 'name' in error and 'has-error' or ''}">
-                        <label class="col-md-3 col-sm-4 control-label" for="name">Subject</label>
-                        <div class="col-md-7 col-sm-8">
-                            <input type="text" class="form-control" name="name" t-attf-value="#{name or ''}"/>
-                        </div>
-                    </div>
-                    <div t-attf-class="form-group #{error and 'description' in error and 'has-error' or ''}">
-                        <label class="col-md-3 col-sm-4 control-label" for="description">Your Question</label>
-                        <div class="col-md-7 col-sm-8">
-                            <textarea  class="form-control" name="description" style="min-height: 120px" required="True" t-attf-value="#{description or ''}"/>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <div class="col-md-offset-3 col-sm-offset-4 col-sm-8 col-md-7">
-                            <button class="btn btn-primary btn-lg">Send</button>
-                        </div>
-                    </div>
-                </form>
-            </xpath>
-        </template>
-
-        <template id="contactus_form_company_name" name="Company Name" inherit_id="website_crm.contactus_form" inherit_option_id="website_crm.contactus_form">
-            <xpath expr="//div[@name='email_from_container']" position="after">
-                <div t-attf-class="form-group #{error and 'partner_name' in error and 'has-error' or ''}">
-                    <label class="col-md-3 col-sm-4 control-label" for="partner_name">Your Company</label>
-                    <div class="col-md-7 col-sm-8">
-                        <input type="text" class="form-control" name="partner_name" required="True" t-attf-value="#{partner_name or ''}"/>
-                    </div>
+<template id="contactus_form" name="Contact Form" inherit_id="website.contactus" inherit_option_id="website.contactus">
+    <xpath expr="//div[@name='mail_button']" position="replace">
+        <form action="/crm/contactus" method="post" class="form-horizontal mt32" >
+            <div t-attf-class="form-group #{error and 'contact_name' in error and 'has-error' or ''}">
+                <label class="col-md-3 col-sm-4 control-label" for="contact_name">Your Name</label>
+                <div class="col-md-7 col-sm-8">
+                    <input type="text" class="form-control" name="contact_name" required="True" t-attf-value="#{contact_name or ''}"/>
                 </div>
-            </xpath>
-        </template>
-
-        <template id="contactus_thanks" name="Contact us">
-            <t t-call="website.layout">
-              <div id="wrap">
-                <div class="oe_structure"/>
-                <div class="container">
-                    <div class="row">
-                        <div class="col-md-8">
-                            <div class="alert alert-success">
-                                Your message has been sent successfully.
-                                <button type="button" class="close" data-dismiss="alert">&amp;times;</button>
-                            </div>
-                            <h2>Thanks!</h2>
-                            <p>
-                                We will get back to you shortly.
-                            </p><p class="mt64">
-                                If you have an emergency, do not hesitate to contact us by phone:
-                            </p>
-                            <ul class="list-unstyled">
-                                <li><i class="fa fa-phone"></i> : <span t-field="res_company.phone"/></li>
-                                <li><i class="fa fa-envelope"></i> : <span t-field="res_company.email"/></li>
-                            </ul>
-                        </div>
-                        <div class="col-md-4">
-                            <t t-call="website.company_description"/>
-                        </div>
-                    </div>
+            </div>
+            <div t-attf-class="form-group #{error and 'phone' in error and 'has-error' or ''}">
+                <label class="col-md-3 col-sm-4 control-label" for="phone">Phone Number</label>
+                <div class="col-md-7 col-sm-8">
+                    <input type="text" class="form-control" name="phone" placeholder="e.g. (+32).81.81.37.00" t-attf-value="#{phone or ''}"/>
                 </div>
-                <div class="oe_structure"/>
-              </div>
-            </t>
-        </template>
+            </div>
+            <div name="email_from_container" t-attf-class="form-group #{error and 'email_from' in error and 'has-error' or ''}">
+                <label class="col-md-3 col-sm-4 control-label" for="email_from">Email</label>
+                <div class="col-md-7 col-sm-8">
+                    <input type="email" class="form-control" name="email_from" required="True" t-attf-value="#{email_from or ''}"/>
+                </div>
+            </div>
+            <div t-attf-class="form-group #{error and 'name' in error and 'has-error' or ''}">
+                <label class="col-md-3 col-sm-4 control-label" for="name">Subject</label>
+                <div class="col-md-7 col-sm-8">
+                    <input type="text" class="form-control" name="name" t-attf-value="#{name or ''}"/>
+                </div>
+            </div>
+            <div t-attf-class="form-group #{error and 'description' in error and 'has-error' or ''}">
+                <label class="col-md-3 col-sm-4 control-label" for="description">Your Question</label>
+                <div class="col-md-7 col-sm-8">
+                    <textarea  class="form-control" name="description" style="min-height: 120px" required="True" t-attf-value="#{description or ''}"/>
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="col-md-offset-3 col-sm-offset-4 col-sm-8 col-md-7">
+                    <button class="btn btn-primary btn-lg">Send</button>
+                </div>
+            </div>
+        </form>
+    </xpath>
+</template>
 
-     </data>
+<template id="contactus_form_company_name" name="Company Name" inherit_id="website_crm.contactus_form" inherit_option_id="website_crm.contactus_form">
+    <xpath expr="//div[@name='email_from_container']" position="after">
+        <div t-attf-class="form-group #{error and 'partner_name' in error and 'has-error' or ''}">
+            <label class="col-md-3 col-sm-4 control-label" for="partner_name">Your Company</label>
+            <div class="col-md-7 col-sm-8">
+                <input type="text" class="form-control" name="partner_name" required="True" t-attf-value="#{partner_name or ''}"/>
+            </div>
+        </div>
+    </xpath>
+</template>
+
+<template id="contactus_thanks" name="Contact us">
+    <t t-call="website.layout">
+      <div id="wrap">
+        <div class="oe_structure"/>
+        <div class="container">
+            <div class="row">
+                <div class="col-md-8">
+                    <div class="alert alert-success">
+                        Your message has been sent successfully.
+                        <button type="button" class="close" data-dismiss="alert">&amp;times;</button>
+                    </div>
+                    <h2>Thanks!</h2>
+                    <p>
+                        We will get back to you shortly.
+                    </p><p class="mt64">
+                        If you have an emergency, do not hesitate to contact us by phone:
+                    </p>
+                    <ul class="list-unstyled">
+                        <li><i class="fa fa-phone"></i> : <span t-field="res_company.phone"/></li>
+                        <li><i class="fa fa-envelope"></i> : <span t-field="res_company.email"/></li>
+                    </ul>
+                </div>
+                <div class="col-md-4">
+                    <t t-call="website.company_description"/>
+                </div>
+            </div>
+        </div>
+        <div class="oe_structure"/>
+      </div>
+    </t>
+</template>
+
+</data>
 </openerp>
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
index e4c03071454..6d2c7faca40 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
@@ -2,120 +2,119 @@
 <openerp>
 <data>
 
+<!-- Layout add nav and footer -->
+<template id="footer_custom" inherit_id="website.layout" name="Footer Partners Link">
+    <xpath expr="//footer//div[@name='info']/ul" position="inside">
+        <li><a href="/partners/">Resellers</a></li>
+    </xpath>
+</template>
 
-    <!-- Layout add nav and footer -->
-    <template id="footer_custom" inherit_id="website.layout" name="Footer Partners Link">
-        <xpath expr="//footer//div[@name='info']/ul" position="inside">
-            <li><a href="/partners/">Resellers</a></li>
-        </xpath>
-    </template>
+<!-- Page --> 
+<template id="layout" name="Partners Layout">
+    <t t-call="website.layout">
+        <t t-set="additional_title">Resellers</t>
+        <div id="wrap">
+            <div class="oe_structure"/>
+            <div class="container">
+                <div class="row">
+                    <t t-raw="ref_content" />
+                </div>
+            </div>
+            <div class="oe_structure"/>
+        </div>
+    </t>
+</template>
 
-    <!-- Page --> 
-    <template id="layout" name="Partners Layout">
-        <t t-call="website.layout">
-            <t t-set="additional_title">Resellers</t>
-            <div id="wrap">
-                <div class="oe_structure"/>
-                <div class="container">
-                    <div class="row">
-                        <t t-raw="ref_content" />
+<template id="index" name="Find Resellers">
+    <t t-call="website_crm_partner_assign.layout">
+        <t t-set="ref_content">
+            <div class="col-md-12">
+                <h1 class="text-center">
+                    Looking For a Local Store?
+                </h1><h2 class="text-center text-muted">
+                    Contact a reseller
+                </h2>
+            </div>
+            <div class="col-md-4" id="partner_left">
+                <h3>Resellers by Country</h3>
+                <ul class="nav nav-pills nav-stacked mt16">
+                    <t t-foreach="countries" t-as="country_dict">
+                        <t t-if="country_dict['country_id']">
+                            <li t-att-class="country_dict['country_id'][0] == current_country_id and 'active' or ''">
+                                <a t-href="/partners/country/#{ country_dict['country_id'][0] }">
+                                    <t t-esc="country_dict['country_id'][1]"/> <small>(<t t-esc="country_dict['country_id_count']"/>)</small>
+                                </a>
+                            </li>
+                        </t>
+                    </t>
+                </ul>
+            </div>
+            <div class="col-md-8" id="ref_content">
+                <div class='navbar'>
+                    <div>
+                        <t t-call="website.pager">
+                           <t t-set="classname">pull-left</t>
+                        </t>
+                        <form action="/partners/" method="get" class="navbar-search pull-right pagination form-inline">
+                            <div class="form-group">
+                                <input type="text" name="search" class="search-query col-md-2 mt4 form-control" placeholder="Search" t-att-value="name_search"/>
+                            </div>
+                            <div class="form-group">
+                                <select class="search-query col-md-2 mt4 form-control" name="grade" t-if="len(grades) > 1" onchange="submit()">
+                                    <t t-foreach="grades">
+                                        <t t-if="grade_id">
+                                            <option t-att-selected="searches.get('grade') == str(grade_id and grade_id[0]) and 'selected'" t-att-value="grade_id[0]">
+                                                <t t-esc="grade_id[1]"/> (<t t-esc="grade_id_count"/>)
+                                            </option>
+                                        </t>
+                                    </t>
+                                </select>
+                            </div>
+                        </form>
                     </div>
                 </div>
-                <div class="oe_structure"/>
+                <div>
+                    <t t-foreach="partners_data" t-as="partner_data">
+                        <t t-if="internal_gid != partner_data['grade_id'][1]">
+                            <h3 class="text-center">
+                                <span t-esc="partner_data['grade_id'][1]"/> Partners
+                                <t t-if="current_country"> in <t t-esc="current_country.name"/></t>
+                            </h3>
+                            <t t-set="internal_gid" t-value="partner_data['grade_id'][1]"/>
+                        </t>
+                        <div class="media thumbnail">
+                            <a class="pull-left" t-href="/partners/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/">
+                                <img class="media-object" t-attf-src="data:image/png;base64,#{partner_data['image_small']}"/>
+                            </a>
+                            <div class="media-body" style="min-height: 64px;">
+                                <a class="media-heading" t-href="/partners/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/"><t t-if="partner_data['parent_id']"><span t-esc="partner_data['parent_id'][1]"/></t> <span t-esc="partner_data['name']"/></a> - <span t-esc="partner_data['grade_id'][1]"/>
+                                <div t-esc="partner_data['website_short_description']"/>
+                            </div>
+                        </div>
+                    </t>
+                </div>
             </div>
         </t>
-    </template>
+    </t>
+</template>
 
-    <template id="index" name="Find Resellers">
-        <t t-call="website_crm_partner_assign.layout">
-            <t t-set="ref_content">
-                <div class="col-md-12">
-                    <h1 class="text-center">
-                        Looking For a Local Store?
-                    </h1><h2 class="text-center text-muted">
-                        Contact a reseller
-                    </h2>
-                </div>
-                <div class="col-md-4" id="partner_left">
-                    <h3>Resellers by Country</h3>
-                    <ul class="nav nav-pills nav-stacked mt16">
-                        <t t-foreach="countries" t-as="country_dict">
-                            <t t-if="country_dict['country_id']">
-                                <li t-att-class="country_dict['country_id'][0] == current_country_id and 'active' or ''">
-                                    <a t-href="/partners/country/#{ country_dict['country_id'][0] }">
-                                        <t t-esc="country_dict['country_id'][1]"/> <small>(<t t-esc="country_dict['country_id_count']"/>)</small>
-                                    </a>
-                                </li>
-                            </t>
-                        </t>
-                    </ul>
-                </div>
-                <div class="col-md-8" id="ref_content">
-                    <div class='navbar'>
-                        <div>
-                            <t t-call="website.pager">
-                               <t t-set="classname">pull-left</t>
-                            </t>
-                            <form action="/partners/" method="get" class="navbar-search pull-right pagination form-inline">
-                                <div class="form-group">
-                                    <input type="text" name="search" class="search-query col-md-2 mt4 form-control" placeholder="Search" t-att-value="name_search"/>
-                                </div>
-                                <div class="form-group">
-                                    <select class="search-query col-md-2 mt4 form-control" name="grade" t-if="len(grades) > 1" onchange="submit()">
-                                        <t t-foreach="grades">
-                                            <t t-if="grade_id">
-                                                <option t-att-selected="searches.get('grade') == str(grade_id and grade_id[0]) and 'selected'" t-att-value="grade_id[0]">
-                                                    <t t-esc="grade_id[1]"/> (<t t-esc="grade_id_count"/>)
-                                                </option>
-                                            </t>
-                                        </t>
-                                    </select>
-                                </div>
-                            </form>
-                        </div>
-                    </div>
-                    <div>
-                        <t t-foreach="partners_data" t-as="partner_data">
-                            <t t-if="internal_gid != partner_data['grade_id'][1]">
-                                <h3 class="text-center">
-                                    <span t-esc="partner_data['grade_id'][1]"/> Partners
-                                    <t t-if="current_country"> in <t t-esc="current_country.name"/></t>
-                                </h3>
-                                <t t-set="internal_gid" t-value="partner_data['grade_id'][1]"/>
-                            </t>
-                            <div class="media thumbnail">
-                                <a class="pull-left" t-href="/partners/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/">
-                                    <img class="media-object" t-attf-src="data:image/png;base64,#{partner_data['image_small']}"/>
-                                </a>
-                                <div class="media-body" style="min-height: 64px;">
-                                    <a class="media-heading" t-href="/partners/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/"><t t-if="partner_data['parent_id']"><span t-esc="partner_data['parent_id'][1]"/></t> <span t-esc="partner_data['name']"/></a> - <span t-esc="partner_data['grade_id'][1]"/>
-                                    <div t-esc="partner_data['website_short_description']"/>
-                                </div>
-                            </div>
-                        </t>
-                    </div>
-                </div>
-            </t>
+<template id="ref_country" inherit_id="website_crm_partner_assign.index" inherit_option_id="website_crm_partner_assign.index" name="Left World Map">
+    <xpath expr="//div[@id='partner_left']//ul" position="after">
+        <h3>World Map</h3>
+        <ul class="nav">
+            <iframe t-attf-src="/google_map/?width=320&amp;height=240&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/partners/"
+                style="width:320px; height:260px; border:0; padding:0; margin:0;"></iframe>
+        </ul>
+    </xpath>
+</template>
+
+<template id="partner" name="Partner Detail">
+    <t t-call="website_crm_partner_assign.layout">
+        <t t-set="ref_content">
+            <t t-call="website_partner.partner_detail"/>
         </t>
-    </template>
+    </t>
+</template>
 
-    <template id="ref_country" inherit_id="website_crm_partner_assign.index" inherit_option_id="website_crm_partner_assign.index" name="Left World Map">
-        <xpath expr="//div[@id='partner_left']//ul" position="after">
-            <h3>World Map</h3>
-            <ul class="nav">
-                <iframe t-attf-src="/google_map/?width=320&amp;height=240&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/partners/"
-                    style="width:320px; height:260px; border:0; padding:0; margin:0;"></iframe>
-            </ul>
-        </xpath>
-    </template>
-
-    <template id="partner" name="Partner Detail">
-        <t t-call="website_crm_partner_assign.layout">
-            <t t-set="ref_content">
-                <t t-call="website_partner.partner_detail"/>
-            </t>
-        </t>
-    </template>
-
- </data>
+</data>
 </openerp>
diff --git a/addons/website_customer/views/website_customer.xml b/addons/website_customer/views/website_customer.xml
index 9b874016d8f..5996d8c1141 100644
--- a/addons/website_customer/views/website_customer.xml
+++ b/addons/website_customer/views/website_customer.xml
@@ -2,203 +2,203 @@
 <openerp>
 <data>
 
-    <!-- Layout add nav and footer -->
-    <template id="footer_custom" inherit_id="website.layout" name="Footer Customer References Link">
-        <xpath expr="//footer//div[@name='info']/ul" position="inside">
-            <li><a href="/customers/">Our References</a></li>
-        </xpath>
-    </template>
+<!-- Layout add nav and footer -->
+<template id="footer_custom" inherit_id="website.layout" name="Footer Customer References Link">
+    <xpath expr="//footer//div[@name='info']/ul" position="inside">
+        <li><a href="/customers/">Our References</a></li>
+    </xpath>
+</template>
 
-    <template id="index" name="Our References">
-        <t t-call="website.layout">
-            <div id="wrap">
-                <div class="oe_structure">
-                    <section data-snippet-id="title">
-                        <h1 class="text-center">
-                            Our References
-                        </h1><h2 class="text-center text-muted">
-                            Trusted by millions worldwide
-                        </h2>
-                    </section>
-                </div>
-                <div class="container">
-                    <div class="row">
-                        <div class="col-md-3" id="ref_left_column">
-                        </div>
-                        <div class="col-md-9" id="ref_content">
-                            <div class='navbar mb0'>
-                                <t t-call="website.pager">
-                                   <t t-set="classname" t-value="'pull-left'"/>
-                                </t>
-                                <form action="/customers/" method="get" class="navbar-search pull-right pagination form-inline">
-                                    <div class="form-group">
-                                        <input type="text" name="search" class="search-query form-control"
-                                            placeholder="Search" t-att-value="post.get('search', '')"/>
-                                    </div>
-                                </form>
-                            </div>
-
-                            <div class="row">
-                                <t t-foreach="partners_data" t-as="partner_data" class="media">
-                                    <div class="col-md-2">
-                                        <a t-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/">
-                                            <img class="img img-thumbnail" t-attf-src="data:image/png;base64,#{partner_data.get('image')}"/>
-                                        </a>
-                                    </div><div class="col-md-10">
-                                        <h4>
-                                            <a t-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/" t-esc="partner_data.get('name')"/>
-                                        </h4>
-                                        <div t-raw="partner_data.get('website_short_description')"/>
-                                    </div>
-                                    <div class="clearfix mb8"/>
-                                </t>
-                            </div>
-                        </div>
-
-                    </div>
-                </div>
-                <div class="oe_structure"/>
-            </div>
-        </t>
-    </template>
-
-    <!-- Option: left column: World Map -->
-    <template id="opt_country" inherit_option_id="website_customer.index" name="Show Map">
-        <xpath expr="//div[@id='ref_left_column']" position="inside">
-
-            <iframe t-attf-src="/google_map/?partner_ids=#{ google_map_partner_ids }&amp;partner_url=/customers/&amp;output=embed/"
-                style="width:100%; border:0; padding:0; margin:0;"></iframe>
-        </xpath>
-    </template>
-
-    <template id="opt_country_list" inherit_id="website_customer.index" inherit_option_id="website_customer.index" name="Filter on Countries">
-        <xpath expr="//div[@id='ref_left_column']" position="inside">
-
-            <ul class="nav nav-pills nav-stacked mt16 mb32">
-                <t t-foreach="countries" t-as="country_dict">
-                    <t t-if="country_dict['country_id']">
-                        <li t-att-class="country_dict['country_id'][0] == current_country_id and 'active' or ''">
-                            <a t-href="/customers/country/#{ slug(country_dict['country_id']) }/">
-                                <span class="badge pull-right" t-esc="country_dict['country_id_count']"/>
-                                <t t-esc="country_dict['country_id'][1]"/>
-                            </a>
-                        </li>
-                    </t>
-                </t>
-            </ul>
-
-        </xpath>
-    </template>
-
-    <template id="details" name="Customer Detail">
-      <t t-call="website.layout">
+<template id="index" name="Our References">
+    <t t-call="website.layout">
         <div id="wrap">
-            <div class="oe_structure"/>
-            <div class="container mt16">
+            <div class="oe_structure">
+                <section data-snippet-id="title">
+                    <h1 class="text-center">
+                        Our References
+                    </h1><h2 class="text-center text-muted">
+                        Trusted by millions worldwide
+                    </h2>
+                </section>
+            </div>
+            <div class="container">
                 <div class="row">
-                    <div class="col-md-5">
-                        <ol class="breadcrumb">
-                            <li><a href="/customers">Our References</a></li>
-                            <li class="active"><span t-esc="partner_data.get('name')"/></li>
-                        </ol>
+                    <div class="col-md-3" id="ref_left_column">
                     </div>
-                    <t t-call="website_partner.partner_detail">
-                        <t t-set="left_column">
-                            <div id="left_column"></div>
-                        </t>
-                        <t t-set="right_column">
-                            <div id="right_column"></div>
-                        </t>
-                    </t>
+                    <div class="col-md-9" id="ref_content">
+                        <div class='navbar mb0'>
+                            <t t-call="website.pager">
+                               <t t-set="classname" t-value="'pull-left'"/>
+                            </t>
+                            <form action="/customers/" method="get" class="navbar-search pull-right pagination form-inline">
+                                <div class="form-group">
+                                    <input type="text" name="search" class="search-query form-control"
+                                        placeholder="Search" t-att-value="post.get('search', '')"/>
+                                </div>
+                            </form>
+                        </div>
+
+                        <div class="row">
+                            <t t-foreach="partners_data" t-as="partner_data" class="media">
+                                <div class="col-md-2">
+                                    <a t-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/">
+                                        <img class="img img-thumbnail" t-attf-src="data:image/png;base64,#{partner_data.get('image')}"/>
+                                    </a>
+                                </div><div class="col-md-10">
+                                    <h4>
+                                        <a t-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/" t-esc="partner_data.get('name')"/>
+                                    </h4>
+                                    <div t-raw="partner_data.get('website_short_description')"/>
+                                </div>
+                                <div class="clearfix mb8"/>
+                            </t>
+                        </div>
+                    </div>
+
                 </div>
             </div>
             <div class="oe_structure"/>
         </div>
-      </t>
-    </template>
+    </t>
+</template>
 
-    <template id="customer_contact" inherit_id="website_customer.details" inherit_option_id="website_customer.details" name="Customer Contacts">
-        <xpath expr="//div[@id='left_column']" position="inside">
+<!-- Option: left column: World Map -->
+<template id="opt_country" inherit_option_id="website_customer.index" name="Show Map">
+    <xpath expr="//div[@id='ref_left_column']" position="inside">
+
+        <iframe t-attf-src="/google_map/?partner_ids=#{ google_map_partner_ids }&amp;partner_url=/customers/&amp;output=embed/"
+            style="width:100%; border:0; padding:0; margin:0;"></iframe>
+    </xpath>
+</template>
+
+<template id="opt_country_list" inherit_id="website_customer.index" inherit_option_id="website_customer.index" name="Filter on Countries">
+    <xpath expr="//div[@id='ref_left_column']" position="inside">
+
+        <ul class="nav nav-pills nav-stacked mt16 mb32">
+            <t t-foreach="countries" t-as="country_dict">
+                <t t-if="country_dict['country_id']">
+                    <li t-att-class="country_dict['country_id'][0] == current_country_id and 'active' or ''">
+                        <a t-href="/customers/country/#{ slug(country_dict['country_id']) }/">
+                            <span class="badge pull-right" t-esc="country_dict['country_id_count']"/>
+                            <t t-esc="country_dict['country_id'][1]"/>
+                        </a>
+                    </li>
+                </t>
+            </t>
+        </ul>
+
+    </xpath>
+</template>
+
+<template id="details" name="Customer Detail">
+  <t t-call="website.layout">
+    <div id="wrap">
+        <div class="oe_structure"/>
+        <div class="container mt16">
+            <div class="row">
+                <div class="col-md-5">
+                    <ol class="breadcrumb">
+                        <li><a href="/customers">Our References</a></li>
+                        <li class="active"><span t-esc="partner_data.get('name')"/></li>
+                    </ol>
+                </div>
+                <t t-call="website_partner.partner_detail">
+                    <t t-set="left_column">
+                        <div id="left_column"></div>
+                    </t>
+                    <t t-set="right_column">
+                        <div id="right_column"></div>
+                    </t>
+                </t>
+            </div>
+        </div>
+        <div class="oe_structure"/>
+    </div>
+  </t>
+</template>
+
+<template id="customer_contact" inherit_id="website_customer.details" inherit_option_id="website_customer.details" name="Customer Contacts">
+    <xpath expr="//div[@id='left_column']" position="inside">
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <h4>Customer Reference</h4>
+            </div>
+            <div class="panel-body">
+                <div class="text-center">
+                    <img class="img img-shadow" t-attf-src="data:image/png;base64,#{partner_data.get('image_medium')}"/>
+                </div>
+                <address class="mt16 mb8">
+                    <strong t-esc="partner_data.get('name')"/>
+                    <t t-if="partner_data.get('commercial_partner_id')">
+                        <p t-raw="'&lt;br/&gt;'.join(partner_data.get('commercial_partner_id')[1].split('\n')[1:])"/>
+                    </t>
+                    <div t-if="partner_data.get('phone')">
+                        <span class="fa fa-phone"/> <span t-esc="partner_data.get('phone')"/>
+                    </div>
+                    <div t-if="partner_data.get('email')">
+                        <span class="fa fa-envelope"/>
+                        <a t-att-href="'mailto:'+partner_data.get('email')">
+                          <span t-esc="partner_data.get('email')"/>
+                        </a>
+                    </div>
+                </address>
+            </div>
+        </div>
+    </xpath>
+</template>
+
+<template id="partner_assign" inherit_option_id="website_customer.details" inherit_id="website_customer.details" name="Implemented By">
+    <xpath expr="//div[@id='left_column']" position="inside">
+        <t t-if="assigned_partner_data">
             <div class="panel panel-default">
                 <div class="panel-heading">
-                    <h4>Customer Reference</h4>
+                    <h4>Implemented By</h4>
                 </div>
                 <div class="panel-body">
                     <div class="text-center">
-                        <img class="img img-shadow" t-attf-src="data:image/png;base64,#{partner_data.get('image_medium')}"/>
+                    <img class="img img-shadow" t-attf-src="data:image/png;base64,#{assigned_partner_data.get('image_medium')}"/>
                     </div>
                     <address class="mt16 mb8">
-                        <strong t-esc="partner_data.get('name')"/>
-                        <t t-if="partner_data.get('commercial_partner_id')">
-                            <p t-raw="'&lt;br/&gt;'.join(partner_data.get('commercial_partner_id')[1].split('\n')[1:])"/>
-                        </t>
-                        <div t-if="partner_data.get('phone')">
-                            <span class="fa fa-phone"/> <span t-esc="partner_data.get('phone')"/>
+                        <strong t-esc="assigned_partner_data.get('name')"/>
+                        <div t-if="assigned_partner_data.get('phone')">
+                            <span class="fa fa-phone"/> <span t-esc="assigned_partner_data.get('phone')"/>
                         </div>
-                        <div t-if="partner_data.get('email')">
+                        <div t-if="assigned_partner_data.get('email')">
                             <span class="fa fa-envelope"/>
-                            <a t-att-href="'mailto:'+partner_data.get('email')">
-                              <span t-esc="partner_data.get('email')"/>
+                            <a t-att-href="'mailto:'+assigned_partner_data.get('email')">
+                              <span t-esc="assigned_partner_data.get('email')"/>
                             </a>
                         </div>
                     </address>
+                    <div>
+                        <a t-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/#references/" t-if="implemented_partner_ids">
+                            <t t-esc="len(implemented_partner_ids)"/> references
+                        </a>
+                    </div>
                 </div>
             </div>
-        </xpath>
-    </template>
+        </t>
+    </xpath>
+</template>
 
-    <template id="partner_assign" inherit_option_id="website_customer.details" inherit_id="website_customer.details" name="Implemented By">
-        <xpath expr="//div[@id='left_column']" position="inside">
-            <t t-if="assigned_partner_data">
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <h4>Implemented By</h4>
-                    </div>
-                    <div class="panel-body">
-                        <div class="text-center">
-                        <img class="img img-shadow" t-attf-src="data:image/png;base64,#{assigned_partner_data.get('image_medium')}"/>
-                        </div>
-                        <address class="mt16 mb8">
-                            <strong t-esc="assigned_partner_data.get('name')"/>
-                            <div t-if="assigned_partner_data.get('phone')">
-                                <span class="fa fa-phone"/> <span t-esc="assigned_partner_data.get('phone')"/>
-                            </div>
-                            <div t-if="assigned_partner_data.get('email')">
-                                <span class="fa fa-envelope"/>
-                                <a t-att-href="'mailto:'+assigned_partner_data.get('email')">
-                                  <span t-esc="assigned_partner_data.get('email')"/>
-                                </a>
-                            </div>
-                        </address>
-                        <div>
-                            <a t-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/#references/" t-if="implemented_partner_ids">
-                                <t t-esc="len(implemented_partner_ids)"/> references
-                            </a>
-                        </div>
-                    </div>
-                </div>
-            </t>
-        </xpath>
-    </template>
-
-    <template id="references" inherit_id="website_customer.details" name="Partner References">
-        <xpath expr="//div[@id='right_column']" position="inside">
-            <t t-if="implemented_partners_data">
-                <h3 id="references">References</h3>
-                <div t-foreach="implemented_partners_data" t-as="partner_data" class="media thumbnail">
-                    <a class="pull-left" t-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/">
-                        <img class="media-object" t-attf-src="data:image/png;base64,#{partner_data.get('image_small')}"/>
+<template id="references" inherit_id="website_customer.details" name="Partner References">
+    <xpath expr="//div[@id='right_column']" position="inside">
+        <t t-if="implemented_partners_data">
+            <h3 id="references">References</h3>
+            <div t-foreach="implemented_partners_data" t-as="partner_data" class="media thumbnail">
+                <a class="pull-left" t-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/">
+                    <img class="media-object" t-attf-src="data:image/png;base64,#{partner_data.get('image_small')}"/>
+                </a>
+                <div class="media-body" style="min-height: 64px;">
+                    <a class="media-heading" t-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/">
+                        <t t-if="partner_data.get('parent_id')"><span t-esc="partner_data.get('parent_id')[1]"/></t> <span t-esc="partner_data.get('name')"/>
                     </a>
-                    <div class="media-body" style="min-height: 64px;">
-                        <a class="media-heading" t-href="/customers/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/">
-                            <t t-if="partner_data.get('parent_id')"><span t-esc="partner_data.get('parent_id')[1]"/></t> <span t-esc="partner_data.get('name')"/>
-                        </a>
-                        <div t-if="partner_data.get('website_short_description')" t-raw="partner_data.get('website_short_description')"/>
-                    </div>
+                    <div t-if="partner_data.get('website_short_description')" t-raw="partner_data.get('website_short_description')"/>
                 </div>
-            </t>
-        </xpath>
-    </template>
+            </div>
+        </t>
+    </xpath>
+</template>
 
- </data>
+</data>
 </openerp>
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 4adba2d1ed5..2dfb5041c8e 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -2,395 +2,395 @@
 <openerp>
 <data>
 
-    <template id="editor_head" inherit_id="website.editor_head" name="Event Editor" groups="base.group_website_designer">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/website_event/static/src/js/website_event.editor.js"></script>
-            <script type="text/javascript" src="/website_event/static/src/js/website.tour.event.js"></script>
-        </xpath>
-    </template>
+<template id="editor_head" inherit_id="website.editor_head" name="Event Editor" groups="base.group_website_designer">
+    <xpath expr="//script[last()]" position="after">
+        <script type="text/javascript" src="/website_event/static/src/js/website_event.editor.js"></script>
+        <script type="text/javascript" src="/website_event/static/src/js/website.tour.event.js"></script>
+    </xpath>
+</template>
 
-    <!-- Layout add nav and footer -->
-    <template id="header_footer_custom" inherit_id="website.layout" name="Footer Events Link">
-        <xpath expr="//footer//ul[@name='products']" position="inside">
-            <li><a href="/event">Events</a></li>
-        </xpath>
-    </template>
+<!-- Layout add nav and footer -->
+<template id="header_footer_custom" inherit_id="website.layout" name="Footer Events Link">
+    <xpath expr="//footer//ul[@name='products']" position="inside">
+        <li><a href="/event">Events</a></li>
+    </xpath>
+</template>
 
-    <!-- Page -->
-    <template id="index" name="Events">
-        <t t-call="website.layout">
-          <div id="wrap">
-            <div class="oe_structure"/>
-            <div class="container">
-                <div class="row mt8">
-                    <div class="col-sm-5">
-                        <ol class="breadcrumb mb0">
-                            <li class="active">
-                                Our Events
-                            </li>
-                        </ol>
-                    </div><div class="col-sm-7">
-                        <t t-call="website.pager" >
-                            <t t-set="classname">pull-right</t>
-                        </t>
-                    </div>
-                </div>
-                <h3 class="text-center text-muted">
-                    <t t-esc="current_date or ''"/><span t-if="current_type"><t t-if="current_date">,</t>
-                      <t t-esc="current_type.name"/></span><span t-if="current_country"><t t-if="current_type or current_date">,</t>
-                      <t t-esc="current_country.name"/>
-                    </span>
-                </h3>
-                <div class="row mt32 mb32">
-                    <div class="col-md-9" id="middle_column">
-                        <t t-if="not event_ids">
-                            <p t-if="current_date or current_country or current_type">
-                                No event found in this category, check <a href="/event">all events</a>.
-                            </p>
-                            <p t-if="(current_date is None) and (current_country is None) and (current_type is None)">
-                                No events are planned for now on.
-                            </p>
-                        </t>
-                        <ul class="media-list">
-                            <li t-foreach="event_ids" t-as="event" class="media">
-                                <div class="media-body">
-                                    <t t-if="event.event_ticket_ids">
-                                        <span t-if="not event.register_avail" class="label label-danger pull-right">Sold Out</span>
-                                        <span t-if="event.register_avail and event.register_avail &lt;= ((event.register_max or 0) / 4)" class="label pull-right label-info">
-                                            Only <t t-esc="event.register_avail"/> Remaining
-                                        </span>
-                                    </t>
-                                    <h4 class="media-heading">
-                                        <a t-href="/event/#{ slug(event) }/#{(not event.menu_id) and 'register/' or ''}"><span t-field="event.name"> </span></a>
-                                        <small t-if="not event.website_published" class="label label-danger">not published</small>
-                                    </h4>
-                                    <div>
-                                        <t t-if="event.organizer_id">
-                                            Organized by: <span t-field="event.organizer_id"> </span>
-                                        </t>
-                                    </div>
-                                    <div>
-                                        <i class="fa fa-clock-o"></i> <span t-field="event.date_begin"> </span> <i>to</i> <span t-field="event.date_end"> </span>
-                                    </div>
-                                    <div t-if="event.country_id">
-                                        <i class="fa fa-map-marker"></i> <span t-field="event.city"/>, <span t-field="event.country_id"/>
-                                    </div>
-                                    <div class="text-muted">
-                                        <i class="fa fa-tag"></i> <span t-field="event.type"/>
-                                    </div>
-                                </div>
-                            </li>
-                        </ul>
-                    </div>
-                    <div class="col-md-3 oe_structure" id="right_column">
-                    </div>
-                </div>
-            </div>
-            <div class="oe_structure"/>
-          </div>
-        </t>
-    </template>
-
-    <template id="event_right_photos" inherit_id="website_event.index" inherit_option_id="website_event.index" name="Photos">
-        <xpath expr="//div[@id='right_column']" position="inside">
-            <div class="row">
-                <div class="col-md-12 mb16">
-                    <div class="oe_demo">
-                        <img src="/website_event/static/src/img/openerp_enterprise_of_the_year.png" class="img-rounded"/>
-                        <div class="text-center"><a href="/event">Photos of Past Events</a></div>
-                    </div>
-                </div>
-                <div class="col-md-12 mb16">
-                    <div class="oe_demo">
-                        <img src="/website_event/static/src/img/training.jpg" class="img-rounded"/>
-                        <div class="text-center"><a href="/event">Our Trainings</a></div>
-                    </div>
-                </div>
-            </div>
-        </xpath>
-    </template>
-
-    <template id="event_right_quotes" inherit_id="website_event.index" inherit_option_id="website_event.index" name="Quotes">
-        <xpath expr="//div[@id='right_column']" position="inside">
-            <div class="row">
-                <div class="col-md-12 mb16">
-                    <blockquote class="oe_snippet_body">
-                        <p>
-                            Write here a quote from one of your attendees.
-                            It gives confidence in your
-                            events.
-                        </p>
-                        <small>Author</small>
-                    </blockquote>
-                </div>
-            </div>
-        </xpath>
-    </template>
-
-    <template id="event_left_column" inherit_option_id="website_event.index" name="Filters">
-        <xpath expr="//div[@id='middle_column']" position="attributes">
-            <attribute name="class">col-md-6</attribute>
-        </xpath>
-        <xpath expr="//div[@id='middle_column']" position="before">
-            <div class="col-md-3 css_noprint" id="left_column">
-                <ul class="nav nav-pills nav-stacked">
-                    <t t-foreach="dates" t-as="date">
-                        <li t-att-class="searches.get('date') == date[0] and 'active' or ''" t-if="date[3] or (date[0] in ('old','all'))">
-                            <a t-href="/event/#{ search_path }&amp;date=#{ date[0] }"><t t-esc="date[1]"/>
-                                <span t-if="date[3]" class="badge pull-right"><t t-esc="date[3]"/></span>
-                            </a>
+<!-- Page -->
+<template id="index" name="Events">
+    <t t-call="website.layout">
+      <div id="wrap">
+        <div class="oe_structure"/>
+        <div class="container">
+            <div class="row mt8">
+                <div class="col-sm-5">
+                    <ol class="breadcrumb mb0">
+                        <li class="active">
+                            Our Events
                         </li>
+                    </ol>
+                </div><div class="col-sm-7">
+                    <t t-call="website.pager" >
+                        <t t-set="classname">pull-right</t>
                     </t>
-                </ul>
+                </div>
             </div>
-        </xpath>
-    </template>
-    <template id="event_category" inherit_id="website_event.event_left_column" inherit_option_id="website_event.event_left_column" name="Filter by Category">
-        <xpath expr="//div[@id='left_column']" position="inside">
-            <ul class="nav nav-pills nav-stacked mt32">
-                <t t-foreach="types">
-                    <li t-if="type" t-att-class="searches.get('type') == str(type and type[0]) and 'active' or ''">
-                        <a t-href="/event/#{ search_path }&amp;type=#{ type[0] }"><t t-esc="type[1]"/>
-                            <span class="badge pull-right"><t t-esc="type_count"/></span>
-                        </a>
-                    </li>
-                </t>
-            </ul>
-        </xpath>
-    </template>
-    <template id="event_location" inherit_id="website_event.event_left_column" inherit_option_id="website_event.event_left_column" name="Filter by Country">
-        <xpath expr="//div[@id='left_column']" position="inside">
-            <ul class="nav nav-pills nav-stacked mt32">
-                <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-href="/event/#{ search_path }&amp;country=#{ country_id[0] }"><t t-esc="country_id[1]"/>
-                            <span class="badge pull-right"><t t-esc="country_id_count"/></span>
-                        </a>
-                    </li>
-                </t>
-            </ul>
-        </xpath>
-    </template>
+            <h3 class="text-center text-muted">
+                <t t-esc="current_date or ''"/><span t-if="current_type"><t t-if="current_date">,</t>
+                  <t t-esc="current_type.name"/></span><span t-if="current_country"><t t-if="current_type or current_date">,</t>
+                  <t t-esc="current_country.name"/>
+                </span>
+            </h3>
+            <div class="row mt32 mb32">
+                <div class="col-md-9" id="middle_column">
+                    <t t-if="not event_ids">
+                        <p t-if="current_date or current_country or current_type">
+                            No event found in this category, check <a href="/event">all events</a>.
+                        </p>
+                        <p t-if="(current_date is None) and (current_country is None) and (current_type is None)">
+                            No events are planned for now on.
+                        </p>
+                    </t>
+                    <ul class="media-list">
+                        <li t-foreach="event_ids" t-as="event" class="media">
+                            <div class="media-body">
+                                <t t-if="event.event_ticket_ids">
+                                    <span t-if="not event.register_avail" class="label label-danger pull-right">Sold Out</span>
+                                    <span t-if="event.register_avail and event.register_avail &lt;= ((event.register_max or 0) / 4)" class="label pull-right label-info">
+                                        Only <t t-esc="event.register_avail"/> Remaining
+                                    </span>
+                                </t>
+                                <h4 class="media-heading">
+                                    <a t-href="/event/#{ slug(event) }/#{(not event.menu_id) and 'register/' or ''}"><span t-field="event.name"> </span></a>
+                                    <small t-if="not event.website_published" class="label label-danger">not published</small>
+                                </h4>
+                                <div>
+                                    <t t-if="event.organizer_id">
+                                        Organized by: <span t-field="event.organizer_id"> </span>
+                                    </t>
+                                </div>
+                                <div>
+                                    <i class="fa fa-clock-o"></i> <span t-field="event.date_begin"> </span> <i>to</i> <span t-field="event.date_end"> </span>
+                                </div>
+                                <div t-if="event.country_id">
+                                    <i class="fa fa-map-marker"></i> <span t-field="event.city"/>, <span t-field="event.country_id"/>
+                                </div>
+                                <div class="text-muted">
+                                    <i class="fa fa-tag"></i> <span t-field="event.type"/>
+                                </div>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+                <div class="col-md-3 oe_structure" id="right_column">
+                </div>
+            </div>
+        </div>
+        <div class="oe_structure"/>
+      </div>
+    </t>
+</template>
 
-    <template id="layout">
-        <t t-call="website.layout">
-          <div id="wrap">
-            <div class="oe_structure"/>
-            <div class="container">
-                <div class="row mt8">
-                    <div class="col-sm-7" id="event_menu">
-                        <ol class="breadcrumb mb0" t-if="not event.menu_id">
-                            <li><a href="/event">All Events</a></li>
-                            <li t-if="event.type">
-                                <a t-href="/event?type=#{event.type.id}" t-esc="event.type.name"/>
-                            </li>
-                            <li t-if="event.country_id">
-                                <a t-href="/event?country=#{event.country_id.id}" t-esc="event.country_id.name"/>
-                            </li>
-                            <li class="active">
-                                <span t-field="event.name"/>
-                            </li>
-                        </ol>
-                        <ol class="breadcrumb mb0" id="event_menu" t-if="event.menu_id">
-                            <t t-foreach="event.menu_id.child_id" t-as="submenu">
-                                <t t-call="website.submenu"/>
-                            </t>
-                        </ol>
-                    </div>
-                    <div class="col-sm-5">
+<template id="event_right_photos" inherit_id="website_event.index" inherit_option_id="website_event.index" name="Photos">
+    <xpath expr="//div[@id='right_column']" position="inside">
+        <div class="row">
+            <div class="col-md-12 mb16">
+                <div class="oe_demo">
+                    <img src="/website_event/static/src/img/openerp_enterprise_of_the_year.png" class="img-rounded"/>
+                    <div class="text-center"><a href="/event">Photos of Past Events</a></div>
+                </div>
+            </div>
+            <div class="col-md-12 mb16">
+                <div class="oe_demo">
+                    <img src="/website_event/static/src/img/training.jpg" class="img-rounded"/>
+                    <div class="text-center"><a href="/event">Our Trainings</a></div>
+                </div>
+            </div>
+        </div>
+    </xpath>
+</template>
+
+<template id="event_right_quotes" inherit_id="website_event.index" inherit_option_id="website_event.index" name="Quotes">
+    <xpath expr="//div[@id='right_column']" position="inside">
+        <div class="row">
+            <div class="col-md-12 mb16">
+                <blockquote class="oe_snippet_body">
+                    <p>
+                        Write here a quote from one of your attendees.
+                        It gives confidence in your
+                        events.
+                    </p>
+                    <small>Author</small>
+                </blockquote>
+            </div>
+        </div>
+    </xpath>
+</template>
+
+<template id="event_left_column" inherit_option_id="website_event.index" name="Filters">
+    <xpath expr="//div[@id='middle_column']" position="attributes">
+        <attribute name="class">col-md-6</attribute>
+    </xpath>
+    <xpath expr="//div[@id='middle_column']" position="before">
+        <div class="col-md-3 css_noprint" id="left_column">
+            <ul class="nav nav-pills nav-stacked">
+                <t t-foreach="dates" t-as="date">
+                    <li t-att-class="searches.get('date') == date[0] and 'active' or ''" t-if="date[3] or (date[0] in ('old','all'))">
+                        <a t-href="/event/#{ search_path }&amp;date=#{ date[0] }"><t t-esc="date[1]"/>
+                            <span t-if="date[3]" class="badge pull-right"><t t-esc="date[3]"/></span>
+                        </a>
+                    </li>
+                </t>
+            </ul>
+        </div>
+    </xpath>
+</template>
+<template id="event_category" inherit_id="website_event.event_left_column" inherit_option_id="website_event.event_left_column" name="Filter by Category">
+    <xpath expr="//div[@id='left_column']" position="inside">
+        <ul class="nav nav-pills nav-stacked mt32">
+            <t t-foreach="types">
+                <li t-if="type" t-att-class="searches.get('type') == str(type and type[0]) and 'active' or ''">
+                    <a t-href="/event/#{ search_path }&amp;type=#{ type[0] }"><t t-esc="type[1]"/>
+                        <span class="badge pull-right"><t t-esc="type_count"/></span>
+                    </a>
+                </li>
+            </t>
+        </ul>
+    </xpath>
+</template>
+<template id="event_location" inherit_id="website_event.event_left_column" inherit_option_id="website_event.event_left_column" name="Filter by Country">
+    <xpath expr="//div[@id='left_column']" position="inside">
+        <ul class="nav nav-pills nav-stacked mt32">
+            <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-href="/event/#{ search_path }&amp;country=#{ country_id[0] }"><t t-esc="country_id[1]"/>
+                        <span class="badge pull-right"><t t-esc="country_id_count"/></span>
+                    </a>
+                </li>
+            </t>
+        </ul>
+    </xpath>
+</template>
+
+<template id="layout">
+    <t t-call="website.layout">
+      <div id="wrap">
+        <div class="oe_structure"/>
+        <div class="container">
+            <div class="row mt8">
+                <div class="col-sm-7" id="event_menu">
+                    <ol class="breadcrumb mb0" t-if="not event.menu_id">
+                        <li><a href="/event">All Events</a></li>
+                        <li t-if="event.type">
+                            <a t-href="/event?type=#{event.type.id}" t-esc="event.type.name"/>
+                        </li>
+                        <li t-if="event.country_id">
+                            <a t-href="/event?country=#{event.country_id.id}" t-esc="event.country_id.name"/>
+                        </li>
+                        <li class="active">
+                            <span t-field="event.name"/>
+                        </li>
+                    </ol>
+                    <ol class="breadcrumb mb0" id="event_menu" t-if="event.menu_id">
+                        <t t-foreach="event.menu_id.child_id" t-as="submenu">
+                            <t t-call="website.submenu"/>
+                        </t>
+                    </ol>
+                </div>
+                <div class="col-sm-5">
+                    <t t-call="website.publish_management">
+                        <t t-set="object" t-value="event"/>
+                        <t t-set="publish_edit" t-value="True"/>
+                        <t t-set="publish_controller">/event/publish</t>
+                    </t>
+                </div>
+            </div>
+        </div>
+        <t t-raw="0"/>
+        <div class="oe_structure"/>
+      </div>
+    </t>
+</template>
+
+<template id="template_location">
+    <t t-call="website_event.layout">
+        <section class="container" data-snippet-id="title">
+            <h1 class="text-center">Event Location</h1>
+        </section>
+        <div class="oe_structure oe_empty"/>
+    </t>
+</template>
+
+<template id="template_intro">
+    <t t-call="website_event.layout">
+        <section class="container" data-snippet-id="title">
+            <h1 class="text-center">Event Introduction</h1>
+        </section>
+        <div class="oe_structure oe_empty"/>
+    </t>
+</template>
+
+<template id="event_details">
+    <t t-call="website_event.layout">
+        <div class="container">
+            <h1 class="text-center" t-field="event.name"></h1>
+            <h4 class="text-center text-muted">
+                <i class="fa fa-clock-o"></i> <span t-field="event.date_begin"/> to
+                <span t-field="event.date_end"/>
+            </h4>
+            <h4 t-if="event.city and event.country_id" class="text-center text-muted">
+                <i class="fa fa-map-marker"/>
+                <span t-field="event.city"/>,
+                <span t-field="event.country_id"/>
+            </h4>
+            <div class="row mt32 mb32">
+                <t t-raw="0"/>
+            </div>
+        </div>
+    </t>
+</template>
+
+<template id="404">
+    <t t-call="website.layout">
+        <div id="wrap">
+            <div class="oe_structure oe_empty">
+                <div class="container">
+                    <h1 class="mt32">Event not found!</h1>
+                    <p>Sorry, the requested event is not available anymore.</p>
+                    <p><a t-href="/event/">Return to the event list.</a></p>
+                </div>
+            </div>
+        </div>
+    </t>
+</template>
+
+<template id="event_description_full">
+    <t t-call="website_event.event_details">
+        <div class="col-md-8">
+            <form t-action="/event/add_cart?event_id=#{ event.id }" method="post" t-if="event.event_ticket_ids">
+                <table class="table table-striped">
+                    <thead>
+                        <tr>
+                            <th>Ticket Type</th>
+                            <th style="min-width: 100px">Sales End</th>
+                            <th style="min-width: 100px">Price</th>
+                            <th></th>
+                            <th>Quantity</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr t-foreach="event.event_ticket_ids" t-as="ticket">
+                            <td>
+                                <div t-field="ticket.name"/>
+                                <div><small t-field="ticket.product_id.description_sale"/></div>
+                            </td>
+                            <td><span t-field="ticket.deadline"/></td>
+                            <td>
+                                <t t-if="ticket.price or editable"><span t-field="ticket.price" t-field-options='{
+                                       "widget": "monetary",
+                                       "display_currency": "website.pricelist_id.currency_id"
+                                  }'/>
+                                </t>
+                                <t t-if="not ticket.price and not editable">
+                                    <span>Free</span>
+                                </t>
+                            </td>
+                            <td>
+                                <span t-if="ticket.register_max and ((ticket.register_current or 0)*100 / ticket.register_max)&gt;75" class="text-muted">
+                                    <t t-esc="ticket.register_max - ticket.register_current"/> <span>left</span>
+                                </span>
+                            </td>
+                            <td>
+                                <select t-if="ticket.register_avail" t-attf-name="ticket-#{ ticket.id }" class="form-control">
+                                    <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">Sold Out</span>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+                <button type="submit" class="btn btn-primary btn-lg pull-right" t-if="event.register_avail">Order Now</button>
+                <div class="clearfix"/>
+                <hr/>
+            </form>
+            <div t-field="event.description"></div>
+            <div class="clearfix"/>
+            <ul class="media-list" id="comment">
+                <li t-foreach="event.website_message_ids" t-as="comment" class="media">
+                    <div class="media-body">
                         <t t-call="website.publish_management">
-                            <t t-set="object" t-value="event"/>
+                            <t t-set="object" t-value="comment"/>
                             <t t-set="publish_edit" t-value="True"/>
                             <t t-set="publish_controller">/event/publish</t>
                         </t>
+                        <t t-raw="comment.body"/>
+                        <small class="pull-right muted text-right">
+                            <div t-field="comment.author_id"/>
+                            <div t-field="comment.date"/>
+                        </small>
                     </div>
+                </li>
+            </ul>
+        </div>
+        <div class="col-md-4 css_noprint">
+            <div class="clearfix"/>
+
+            <div class="panel panel-default" t-if="event.address_id">
+                <div class="panel-heading">
+                    <h4>Where</h4>
                 </div>
-            </div>
-            <t t-raw="0"/>
-            <div class="oe_structure"/>
-          </div>
-        </t>
-    </template>
-
-    <template id="template_location">
-        <t t-call="website_event.layout">
-            <section class="container" data-snippet-id="title">
-                <h1 class="text-center">Event Location</h1>
-            </section>
-            <div class="oe_structure oe_empty"/>
-        </t>
-    </template>
-
-    <template id="template_intro">
-        <t t-call="website_event.layout">
-            <section class="container" data-snippet-id="title">
-                <h1 class="text-center">Event Introduction</h1>
-            </section>
-            <div class="oe_structure oe_empty"/>
-        </t>
-    </template>
-
-    <template id="event_details">
-        <t t-call="website_event.layout">
-            <div class="container">
-                <h1 class="text-center" t-field="event.name"></h1>
-                <h4 class="text-center text-muted">
-                    <i class="fa fa-clock-o"></i> <span t-field="event.date_begin"/> to
-                    <span t-field="event.date_end"/>
-                </h4>
-                <h4 t-if="event.city and event.country_id" class="text-center text-muted">
-                    <i class="fa fa-map-marker"/>
-                    <span t-field="event.city"/>,
-                    <span t-field="event.country_id"/>
-                </h4>
-                <div class="row mt32 mb32">
-                    <t t-raw="0"/>
-                </div>
-            </div>
-        </t>
-    </template>
-
-    <template id="404">
-        <t t-call="website.layout">
-            <div id="wrap">
-                <div class="oe_structure oe_empty">
-                    <div class="container">
-                        <h1 class="mt32">Event not found!</h1>
-                        <p>Sorry, the requested event is not available anymore.</p>
-                        <p><a t-href="/event/">Return to the event list.</a></p>
-                    </div>
-                </div>
-            </div>
-        </t>
-    </template>
-
-    <template id="event_description_full">
-        <t t-call="website_event.event_details">
-            <div class="col-md-8">
-                <form t-action="/event/add_cart?event_id=#{ event.id }" method="post" t-if="event.event_ticket_ids">
-                    <table class="table table-striped">
-                        <thead>
-                            <tr>
-                                <th>Ticket Type</th>
-                                <th style="min-width: 100px">Sales End</th>
-                                <th style="min-width: 100px">Price</th>
-                                <th></th>
-                                <th>Quantity</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <tr t-foreach="event.event_ticket_ids" t-as="ticket">
-                                <td>
-                                    <div t-field="ticket.name"/>
-                                    <div><small t-field="ticket.product_id.description_sale"/></div>
-                                </td>
-                                <td><span t-field="ticket.deadline"/></td>
-                                <td>
-                                    <t t-if="ticket.price or editable"><span t-field="ticket.price" t-field-options='{
-                                           "widget": "monetary",
-                                           "display_currency": "website.pricelist_id.currency_id"
-                                      }'/>
-                                    </t>
-                                    <t t-if="not ticket.price and not editable">
-                                        <span>Free</span>
-                                    </t>
-                                </td>
-                                <td>
-                                    <span t-if="ticket.register_max and ((ticket.register_current or 0)*100 / ticket.register_max)&gt;75" class="text-muted">
-                                        <t t-esc="ticket.register_max - ticket.register_current"/> <span>left</span>
-                                    </span>
-                                </td>
-                                <td>
-                                    <select t-if="ticket.register_avail" t-attf-name="ticket-#{ ticket.id }" class="form-control">
-                                        <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">Sold Out</span>
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <button type="submit" class="btn btn-primary btn-lg pull-right" t-if="event.register_avail">Order Now</button>
-                    <div class="clearfix"/>
-                    <hr/>
-                </form>
-                <div t-field="event.description"></div>
-                <div class="clearfix"/>
-                <ul class="media-list" id="comment">
-                    <li t-foreach="event.website_message_ids" t-as="comment" class="media">
-                        <div class="media-body">
-                            <t t-call="website.publish_management">
-                                <t t-set="object" t-value="comment"/>
-                                <t t-set="publish_edit" t-value="True"/>
-                                <t t-set="publish_controller">/event/publish</t>
-                            </t>
-                            <t t-raw="comment.body"/>
-                            <small class="pull-right muted text-right">
-                                <div t-field="comment.author_id"/>
-                                <div t-field="comment.date"/>
-                            </small>
-                        </div>
-                    </li>
-                </ul>
-            </div>
-            <div class="col-md-4 css_noprint">
-                <div class="clearfix"/>
-
-                <div class="panel panel-default" t-if="event.address_id">
-                    <div class="panel-heading">
-                        <h4>Where</h4>
-                    </div>
-                    <div class="panel-body">
-                        <a t-att-href="event.google_map_link()" target="_BLANK">
-                            <img t-att-src="event.google_map_img()" width="100%%"/>
-                        </a>
-                        <div class="mt16 mb8" t-field="event.address_id" t-field-options='{
-                            "widget": "contact",
-                            "fields": ["address", "phone", "mobile", "fax", "email"]
-                            }'/>
-                    </div>
-                </div>
-
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <h4>When</h4>
-                    </div>
-                    <div class="panel-body">
-                        <i class="fa fa-clock-o"></i> <span t-field="event.date_begin"> </span><br/>
-                        <i class="fa fa-clock-o"></i> <span t-field="event.date_end"> </span>
-                    </div>
-                </div>
-
-                <div class="panel panel-default" t-if="event.organizer_id">
-                    <div class="panel-heading">
-                        <h4>Organizer</h4>
-                    </div>
-                    <div class="panel-body" t-field="event.organizer_id" t-field-options='{
+                <div class="panel-body">
+                    <a t-att-href="event.google_map_link()" target="_BLANK">
+                        <img t-att-src="event.google_map_img()" width="100%%"/>
+                    </a>
+                    <div class="mt16 mb8" t-field="event.address_id" t-field-options='{
                         "widget": "contact",
-                        "fields": ["name", "phone", "mobile", "fax", "email"]
+                        "fields": ["address", "phone", "mobile", "fax", "email"]
                         }'/>
                 </div>
+            </div>
 
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <h4>Social Stream</h4>
-                    </div>
-                    <div class="panel-body">
-                        <t t-call="website_mail.follow"><t t-set="object" t-value="event"/></t>
-                        <div t-if="event.twitter_hashtag" class="mt16">
-                            <p><strong>Participate on Twitter</strong></p>
-                            <p class="text-muted">
-                                Find out what others are seeing and
-                                saying about this event, and join the
-                                conversation.
-                            </p>
-                            <p><strong>Use this tag:
-                                <a t-att-href="'http://twitter.com/search?q=#'+event.twitter_hashtag" class="label label-primary">#<span t-field="event.twitter_hashtag"/></a>
-                            </strong></p>
-                        </div>
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <h4>When</h4>
+                </div>
+                <div class="panel-body">
+                    <i class="fa fa-clock-o"></i> <span t-field="event.date_begin"> </span><br/>
+                    <i class="fa fa-clock-o"></i> <span t-field="event.date_end"> </span>
+                </div>
+            </div>
+
+            <div class="panel panel-default" t-if="event.organizer_id">
+                <div class="panel-heading">
+                    <h4>Organizer</h4>
+                </div>
+                <div class="panel-body" t-field="event.organizer_id" t-field-options='{
+                    "widget": "contact",
+                    "fields": ["name", "phone", "mobile", "fax", "email"]
+                    }'/>
+            </div>
+
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <h4>Social Stream</h4>
+                </div>
+                <div class="panel-body">
+                    <t t-call="website_mail.follow"><t t-set="object" t-value="event"/></t>
+                    <div t-if="event.twitter_hashtag" class="mt16">
+                        <p><strong>Participate on Twitter</strong></p>
+                        <p class="text-muted">
+                            Find out what others are seeing and
+                            saying about this event, and join the
+                            conversation.
+                        </p>
+                        <p><strong>Use this tag:
+                            <a t-att-href="'http://twitter.com/search?q=#'+event.twitter_hashtag" class="label label-primary">#<span t-field="event.twitter_hashtag"/></a>
+                        </strong></p>
                     </div>
                 </div>
             </div>
-        </t>
-    </template>
+        </div>
+    </t>
+</template>
 </data>
 </openerp>
diff --git a/addons/website_event_track/views/website_event.xml b/addons/website_event_track/views/website_event.xml
index 034826b1946..c067a11db64 100644
--- a/addons/website_event_track/views/website_event.xml
+++ b/addons/website_event_track/views/website_event.xml
@@ -2,285 +2,285 @@
 <openerp>
 <data>
 
-    <template id="event_home">
-        <t t-call="website.layout">
-          <div id="wrap">
-            <div class="oe_structure"/>
-            <div class="container">
-                <div class="row">
-                    <div class="col-sm-5">
-                        <h1 t-field="event.name" class="mt16"></h1>
+<template id="event_home">
+    <t t-call="website.layout">
+      <div id="wrap">
+        <div class="oe_structure"/>
+        <div class="container">
+            <div class="row">
+                <div class="col-sm-5">
+                    <h1 t-field="event.name" class="mt16"></h1>
+                </div>
+                <div class="col-sm-2">
+                    <div class="mt16">
+                        <t t-call="website.publish_management">
+                            <t t-set="object" t-value="event"/>
+                            <t t-set="publish_edit" t-value="True"/>
+                            <t t-set="publish_controller">/event/publish</t>
+                        </t>
                     </div>
-                    <div class="col-sm-2">
-                        <div class="mt16">
-                            <t t-call="website.publish_management">
-                                <t t-set="object" t-value="event"/>
-                                <t t-set="publish_edit" t-value="True"/>
-                                <t t-set="publish_controller">/event/publish</t>
+                </div>
+                <div class="col-sm-5">
+                    <ul class="nav nav-pills pull-right mt16">
+                        <li class="active"><a href="#">Event</a></li>
+                        <li><a href="#">Agenda</a></li>
+                        <li><a href="#">Location</a></li>
+                        <li><a href="#">Registration</a></li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+        <div class="oe_structure"/>
+      </div>
+    </t>
+</template>
+
+<template name="Sponsors" id="event_sponsor" inherit_option_id="website_event.layout" inherit_id="website_event.layout">
+    <xpath expr="//t[@t-call='website.layout']" position="inside">
+        <t t-set="head">
+            <link rel='stylesheet' href='/website_event_track/static/src/css/website_event_track.css'/>
+            <t t-raw="head or ''"/>
+        </t>
+    </xpath>
+    <xpath expr="//div[@id='wrap']" position="inside">
+        <div class="container mt32 mb16" t-if="event.sponsor_ids">
+            <section data-snippet-id="title">
+                <h2 class="text-center mb32">Our Sponsors</h2>
+            </section>
+            <div class="row">
+                <div t-attf-class="col-md-#{(len(event.sponsor_ids) > 6) and 2 or (12/ len(event.sponsor_ids))} text-center" t-foreach="event.sponsor_ids" t-as="sponsor">
+                    <a t-href="#{sponsor.partner_id and ('partners/%s/' % sponsor.partner_id.id) or '#'}" style="position: relative; display: inline-block;">
+                        <span t-field="sponsor.partner_id.image"
+                            t-field-options='{"widget": "image", "class": "shadow"}'/>
+                        <div class="ribbon-wrapper">
+                            <div t-field="sponsor.sponsor_type_id" t-attf-class="ribbon ribbon_#{sponsor.sponsor_type_id.name}"/>
+                        </div>
+                    </a>
+                </div>
+            </div>
+        </div>
+    </xpath>
+</template>
+
+<template id="tracks">
+    <t t-call="website_event.event_details">
+        <div class="col-md-3 css_noprint">
+
+            <ul class="nav nav-pills nav-stacked">
+                <li t-att-class="'' if searches.get('tag') else 'active'"><a t-href="/event/#{ slug(event) }/track/">All</a></li>
+                <t t-foreach="tags" t-as="tag">
+                    <li t-att-class="searches.get('tag') == tag.id and 'active' or ''">
+                        <a t-href="/event/#{ slug(event) }/track/tag/#{ slug(tag) }">
+                            <t t-esc="tag.name"/>
+                        </a>
+                    </li>
+                </t>
+            </ul>
+        </div>
+        <div class="col-md-9">
+
+            <ul class="media-list">
+                <li t-foreach="tracks" t-as="track" class="media">
+                    <div class="media-body">
+                        <h4 class="media-heading">
+                            <a t-href="/event/#{ slug(event) }/track/#{ slug(track) }"><span t-field="track.name"> </span></a>
+                            <span t-field="track.date"/>
+                            <!-- <small t-if="not track.website_published" class="label label-danger">not published</small> -->
+                        </h4>
+                        <div><span t-esc="html2text(track.description)[0:400]"/>...</div>
+                        <div>
+                            <t t-foreach="track.tag_ids" t-as="tag_id">
+                                <span class="label label-default" t-field="tag_id.name"/>
                             </t>
                         </div>
                     </div>
-                    <div class="col-sm-5">
-                        <ul class="nav nav-pills pull-right mt16">
-                            <li class="active"><a href="#">Event</a></li>
-                            <li><a href="#">Agenda</a></li>
-                            <li><a href="#">Location</a></li>
-                            <li><a href="#">Registration</a></li>
-                        </ul>
-                    </div>
+                </li>
+            </ul>
+        </div>
+    </t>
+</template>
+
+
+<template id="track_view">
+    <t t-call="website_event.event_details">
+        <div class="col-md-8">
+            <h2 t-field="track.name"/>
+            <div t-field="track.description"/>
+        </div>
+        <div class="col-md-4">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <h4>Informations</h4>
                 </div>
-            </div>
-            <div class="oe_structure"/>
-          </div>
-        </t>
-    </template>
-
-    <template name="Sponsors" id="event_sponsor" inherit_option_id="website_event.layout" inherit_id="website_event.layout">
-        <xpath expr="//t[@t-call='website.layout']" position="inside">
-            <t t-set="head">
-                <link rel='stylesheet' href='/website_event_track/static/src/css/website_event_track.css'/>
-                <t t-raw="head or ''"/>
-            </t>
-        </xpath>
-        <xpath expr="//div[@id='wrap']" position="inside">
-            <div class="container mt32 mb16" t-if="event.sponsor_ids">
-                <section data-snippet-id="title">
-                    <h2 class="text-center mb32">Our Sponsors</h2>
-                </section>
-                <div class="row">
-                    <div t-attf-class="col-md-#{(len(event.sponsor_ids) > 6) and 2 or (12/ len(event.sponsor_ids))} text-center" t-foreach="event.sponsor_ids" t-as="sponsor">
-                        <a t-href="#{sponsor.partner_id and ('partners/%s/' % sponsor.partner_id.id) or '#'}" style="position: relative; display: inline-block;">
-                            <span t-field="sponsor.partner_id.image"
-                                t-field-options='{"widget": "image", "class": "shadow"}'/>
-                            <div class="ribbon-wrapper">
-                                <div t-field="sponsor.sponsor_type_id" t-attf-class="ribbon ribbon_#{sponsor.sponsor_type_id.name}"/>
-                            </div>
-                        </a>
-                    </div>
-                </div>
-            </div>
-        </xpath>
-    </template>
-
-    <template id="tracks">
-        <t t-call="website_event.event_details">
-            <div class="col-md-3 css_noprint">
-
-                <ul class="nav nav-pills nav-stacked">
-                    <li t-att-class="'' if searches.get('tag') else 'active'"><a t-href="/event/#{ slug(event) }/track/">All</a></li>
-                    <t t-foreach="tags" t-as="tag">
-                        <li t-att-class="searches.get('tag') == tag.id and 'active' or ''">
-                            <a t-href="/event/#{ slug(event) }/track/tag/#{ slug(tag) }">
-                                <t t-esc="tag.name"/>
-                            </a>
-                        </li>
+                <div class="panel-body">
+                    <t t-foreach="track.tag_ids" t-as="tag_id">
+                        <span class="label label-default" t-field="tag_id.name"/>
                     </t>
-                </ul>
-            </div>
-            <div class="col-md-9">
-
-                <ul class="media-list">
-                    <li t-foreach="tracks" t-as="track" class="media">
-                        <div class="media-body">
-                            <h4 class="media-heading">
-                                <a t-href="/event/#{ slug(event) }/track/#{ slug(track) }"><span t-field="track.name"> </span></a>
-                                <span t-field="track.date"/>
-                                <!-- <small t-if="not track.website_published" class="label label-danger">not published</small> -->
-                            </h4>
-                            <div><span t-esc="html2text(track.description)[0:400]"/>...</div>
-                            <div>
-                                <t t-foreach="track.tag_ids" t-as="tag_id">
-                                    <span class="label label-default" t-field="tag_id.name"/>
-                                </t>
-                            </div>
-                        </div>
-                    </li>
-                </ul>
-            </div>
-        </t>
-    </template>
-
-
-    <template id="track_view">
-        <t t-call="website_event.event_details">
-            <div class="col-md-8">
-                <h2 t-field="track.name"/>
-                <div t-field="track.description"/>
-            </div>
-            <div class="col-md-4">
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <h4>Informations</h4>
-                    </div>
-                    <div class="panel-body">
-                        <t t-foreach="track.tag_ids" t-as="tag_id">
-                            <span class="label label-default" t-field="tag_id.name"/>
-                        </t>
-                    </div>
-                    <div class="panel-body">
-                        <b>Responsible</b><br/>
-                        <span t-field="track.user_id"/><br/>
-                        <b>Speakers</b><br/>
-                        <span t-field="track.speaker_ids"/><br/>
-                        <b>Date</b><br/>
-                        <span t-field="track.date"/><br/>
-                        <b>Duration</b><br/>
-                        <span t-field="track.duration"/><br/>
-                        <b>Location</b><br/>
-                        <span t-field="track.location_id"/><br/>
-                        <b>Stage</b><br/>
-                        <span t-field="track.stage_id"/><br/>
-                    </div>
+                </div>
+                <div class="panel-body">
+                    <b>Responsible</b><br/>
+                    <span t-field="track.user_id"/><br/>
+                    <b>Speakers</b><br/>
+                    <span t-field="track.speaker_ids"/><br/>
+                    <b>Date</b><br/>
+                    <span t-field="track.date"/><br/>
+                    <b>Duration</b><br/>
+                    <span t-field="track.duration"/><br/>
+                    <b>Location</b><br/>
+                    <span t-field="track.location_id"/><br/>
+                    <b>Stage</b><br/>
+                    <span t-field="track.stage_id"/><br/>
                 </div>
             </div>
-        </t>
-    </template>
+        </div>
+    </t>
+</template>
 
 
-    <template id="event_track_proposal">
-        <t t-call="website_event.layout">
-            <div class="oe_structure"/>
-            <div class="container">
-                <section data-snippet-id="title">
-                    <h1 class="text-center mb0">Call for Proposals</h1>
-                    <h2 class="text-center text-muted mb32" t-esc="event.name"></h2>
-                </section>
-                <section id="forms" t-if="not event.show_track_proposal">
-                    <h1>Proposals are closed!</h1>
-                    <p>
-                        This event does not accept proposals.
-                    </p>
-                </section>
-                <section class="row">
-                    <div class="col-md-7">
-                        <div class="oe_structure">
-                            <section data-snippet-id="text">
-                                <h3 class="page-header mt16">
-                                    Introduction
-                                </h3>
-                                <p>
-                                    We will accept a broad range of
-                                    presentations, from reports on academic and
-                                    commercial projects to tutorials and case
-                                    studies. As long as the presentation is
-                                    interesting and potentially useful to the
-                                    audience, it will be considered for
-                                    inclusion in the programme.
-                                </p>
-                            </section>
-                            <section data-snippet-id="text">
-                                <h3 class="page-header">Application</h3>
-                                <p>
-                                    Fill this form to propose your talk.
+<template id="event_track_proposal">
+    <t t-call="website_event.layout">
+        <div class="oe_structure"/>
+        <div class="container">
+            <section data-snippet-id="title">
+                <h1 class="text-center mb0">Call for Proposals</h1>
+                <h2 class="text-center text-muted mb32" t-esc="event.name"></h2>
+            </section>
+            <section id="forms" t-if="not event.show_track_proposal">
+                <h1>Proposals are closed!</h1>
+                <p>
+                    This event does not accept proposals.
+                </p>
+            </section>
+            <section class="row">
+                <div class="col-md-7">
+                    <div class="oe_structure">
+                        <section data-snippet-id="text">
+                            <h3 class="page-header mt16">
+                                Introduction
+                            </h3>
+                            <p>
+                                We will accept a broad range of
+                                presentations, from reports on academic and
+                                commercial projects to tutorials and case
+                                studies. As long as the presentation is
+                                interesting and potentially useful to the
+                                audience, it will be considered for
+                                inclusion in the programme.
+                            </p>
+                        </section>
+                        <section data-snippet-id="text">
+                            <h3 class="page-header">Application</h3>
+                            <p>
+                                Fill this form to propose your talk.
 
-                                </p>
-                            </section>
-                        </div>
-                        <section id="forms" t-if="event.show_track_proposal">
-                            <form class="form-horizontal mt32" action="/event/#{event.id}/track_proposal/success" method="post" enctype="multipart/form-data">
-                                <div class="form-group">
-                                    <label class="col-md-3 col-sm-4 control-label" for="partner_name">Speaker Name</label>
-                                    <div class="col-md-7 col-sm-8">
-                                        <input type="text" class="form-control" name="partner_name" required="True" />
-                                    </div>
+                            </p>
+                        </section>
+                    </div>
+                    <section id="forms" t-if="event.show_track_proposal">
+                        <form class="form-horizontal mt32" action="/event/#{event.id}/track_proposal/success" method="post" enctype="multipart/form-data">
+                            <div class="form-group">
+                                <label class="col-md-3 col-sm-4 control-label" for="partner_name">Speaker Name</label>
+                                <div class="col-md-7 col-sm-8">
+                                    <input type="text" class="form-control" name="partner_name" required="True" />
                                 </div>
-                                <div class="form-group">
-                                    <label class="col-md-3 col-sm-4 control-label" for="email_from">Your Email</label>
-                                    <div class="col-md-7 col-sm-8">
-                                        <input type="email" class="form-control" name="email_from" required="True" />
-                                    </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-md-3 col-sm-4 control-label" for="email_from">Your Email</label>
+                                <div class="col-md-7 col-sm-8">
+                                    <input type="email" class="form-control" name="email_from" required="True" />
                                 </div>
-                                <div class="form-group">
-                                    <label class="col-md-3 col-sm-4 control-label" for="phone">Your Phone</label>
-                                    <div class="col-md-7 col-sm-8">
-                                        <input type="text" class="form-control" name="phone" required="True" />
-                                    </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-md-3 col-sm-4 control-label" for="phone">Your Phone</label>
+                                <div class="col-md-7 col-sm-8">
+                                    <input type="text" class="form-control" name="phone" required="True" />
                                 </div>
-                                <div class="form-group">
-                                    <label class="col-md-3 col-sm-4 control-label" for="phone">Tags</label>
-                                    <div class="col-md-7 col-sm-8">
-                                        <div class="row">
-                                            <div class="col-sm-4" t-foreach="event.allowed_track_tag_ids" t-as="tag">
-                                                <input type="checkbox" t-att-value="tag.id" name="tags"/>
-                                                <t t-esc="tag.name"/>
-                                            </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-md-3 col-sm-4 control-label" for="phone">Tags</label>
+                                <div class="col-md-7 col-sm-8">
+                                    <div class="row">
+                                        <div class="col-sm-4" t-foreach="event.allowed_track_tag_ids" t-as="tag">
+                                            <input type="checkbox" t-att-value="tag.id" name="tags"/>
+                                            <t t-esc="tag.name"/>
                                         </div>
                                     </div>
                                 </div>
-                                <div class="form-group">
-                                    <label class="col-md-3 col-sm-4 control-label" for="phone">Speaker Biography</label>
-                                    <div class="col-md-7 col-sm-8">
-                                        <textarea  class="form-control" name="biography" style="min-height: 120px"/>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label class="col-md-3 col-sm-4 control-label" for="description">Talk Introduction</label>
-                                    <div class="col-md-7 col-sm-8">
-                                        <textarea  class="form-control" name="description" style="min-height: 120px"/>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <div class="col-md-offset-3 col-sm-offset-4 col-sm-8 col-md-7">
-                                        <button type="submit" class="btn btn-primary">Submit Proposal</button>
-                                    </div>
-                                </div>
-                            </form>
-                        </section>
-                        <div class="oe_structure"/>
-                    </div><div class="col-md-4 col-md-offset-1">
-                        <div class="panel panel-default">
-                            <div class="panel-heading">
-                                <h4>Talks Types</h4>
                             </div>
-                            <div class="panel-body">
-                                <ul class="list-unstyled">
-                                    <li>
-                                        <strong>Regular Talks</strong>. These are standard talks with slides,
-                                        alocated in slots of 30 minutes.
-                                    </li><li>
-                                        <strong>Lightning Talks</strong>. These are 10 minutes talks on many
-                                        different topics. Most topics are accepted in lightning talks.
-                                    </li>
-                                </ul>
+                            <div class="form-group">
+                                <label class="col-md-3 col-sm-4 control-label" for="phone">Speaker Biography</label>
+                                <div class="col-md-7 col-sm-8">
+                                    <textarea  class="form-control" name="biography" style="min-height: 120px"/>
+                                </div>
                             </div>
+                            <div class="form-group">
+                                <label class="col-md-3 col-sm-4 control-label" for="description">Talk Introduction</label>
+                                <div class="col-md-7 col-sm-8">
+                                    <textarea  class="form-control" name="description" style="min-height: 120px"/>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <div class="col-md-offset-3 col-sm-offset-4 col-sm-8 col-md-7">
+                                    <button type="submit" class="btn btn-primary">Submit Proposal</button>
+                                </div>
+                            </div>
+                        </form>
+                    </section>
+                    <div class="oe_structure"/>
+                </div><div class="col-md-4 col-md-offset-1">
+                    <div class="panel panel-default">
+                        <div class="panel-heading">
+                            <h4>Talks Types</h4>
                         </div>
-
-
-                        <div class="panel panel-default">
-                            <div class="panel-heading">
-                                <h4>Submission Agreement</h4>
-                            </div>
-                            <div class="panel-body">
-                                <p>
-                                We require speakers to accept an agreement in which they commit to:
-                                </p>
-                                <ul class="list-unstyled">
-                                    <li>
-                                        Timely release of presentation material (slides),
-                                        for publishing on our website.
-                                    </li><li>
-                                        Allow video and audio recording of their
-                                        presentation, for publishing on our website.
-                                    </li>
-                                </ul>
-                            </div>
+                        <div class="panel-body">
+                            <ul class="list-unstyled">
+                                <li>
+                                    <strong>Regular Talks</strong>. These are standard talks with slides,
+                                    alocated in slots of 30 minutes.
+                                </li><li>
+                                    <strong>Lightning Talks</strong>. These are 10 minutes talks on many
+                                    different topics. Most topics are accepted in lightning talks.
+                                </li>
+                            </ul>
                         </div>
                     </div>
-                </section>
-
-            </div>
-            <div class="oe_structure"/>
-        </t>
-    </template>
 
 
-    <template id="event_track_proposal_success">
-        <t t-call="website_event.event_details">
-            <div class="col-md-8">
-                Thanks
-            </div>
-            <div class="col-md-4"></div>
-        </t>
-    </template>
- </data>
+                    <div class="panel panel-default">
+                        <div class="panel-heading">
+                            <h4>Submission Agreement</h4>
+                        </div>
+                        <div class="panel-body">
+                            <p>
+                            We require speakers to accept an agreement in which they commit to:
+                            </p>
+                            <ul class="list-unstyled">
+                                <li>
+                                    Timely release of presentation material (slides),
+                                    for publishing on our website.
+                                </li><li>
+                                    Allow video and audio recording of their
+                                    presentation, for publishing on our website.
+                                </li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+            </section>
+
+        </div>
+        <div class="oe_structure"/>
+    </t>
+</template>
+
+
+<template id="event_track_proposal_success">
+    <t t-call="website_event.event_details">
+        <div class="col-md-8">
+            Thanks
+        </div>
+        <div class="col-md-4"></div>
+    </t>
+</template>
+</data>
 </openerp>
diff --git a/addons/website_hr/views/website_hr.xml b/addons/website_hr/views/website_hr.xml
index c54a4f3ddc7..357328c8349 100644
--- a/addons/website_hr/views/website_hr.xml
+++ b/addons/website_hr/views/website_hr.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
-    <!-- Page --> 
- 
-    <template id="aboutus" inherit_id="website.aboutus" inherit_option_id="website.aboutus" name="Our Team">
-        <xpath expr="//div[@class='oe_structure']" position="after">
-            <section class="container">
-                <div class="col-sm-12 text-center" t-if="len(employee_ids)">
-                    <h2>Our Team</h2>
+<!-- Page --> 
+
+<template id="aboutus" inherit_id="website.aboutus" inherit_option_id="website.aboutus" name="Our Team">
+    <xpath expr="//div[@class='oe_structure']" position="after">
+        <section class="container">
+            <div class="col-sm-12 text-center" t-if="len(employee_ids)">
+                <h2>Our Team</h2>
+            </div>
+            <div t-foreach="employee_ids" t-as="employee" class="col-sm-3 col-lg-2 mt16 text-center colsize">
+                <t t-call="website.publish_management"><t t-set="object" t-value="employee"/></t>
+                <div class="clearfix"/>
+                <img t-att-src="employee.img('image_medium')" class="img shadow img-rounded"/>
+                <div class="mt8">
+                    <strong t-field="employee.name"></strong>
                 </div>
-                <div t-foreach="employee_ids" t-as="employee" class="col-sm-3 col-lg-2 mt16 text-center colsize">
-                    <t t-call="website.publish_management"><t t-set="object" t-value="employee"/></t>
-                    <div class="clearfix"/>
-                    <img t-att-src="employee.img('image_medium')" class="img shadow img-rounded"/>
-                    <div class="mt8">
-                        <strong t-field="employee.name"></strong>
-                    </div>
-                    <div t-field="employee.job_id"/>
-                    <div t-field="employee.public_info" class="text-muted mt16"/>
-                </div>
-            </section>
-        </xpath>
-    </template>
+                <div t-field="employee.job_id"/>
+                <div t-field="employee.public_info" class="text-muted mt16"/>
+            </div>
+        </section>
+    </xpath>
+</template>
 
  </data>
 </openerp>
diff --git a/addons/website_hr_recruitment/views/website_hr_recruitment.xml b/addons/website_hr_recruitment/views/website_hr_recruitment.xml
index 836a5aea2a5..e1a4bc2bec5 100644
--- a/addons/website_hr_recruitment/views/website_hr_recruitment.xml
+++ b/addons/website_hr_recruitment/views/website_hr_recruitment.xml
@@ -1,264 +1,264 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-        <record id="website_mail_jobs" model="mail.group">
-            <field name="name">Jobs</field>
-            <field name="public">public</field>
-            <field name="description">Job Posts on your website</field>
-        </record>
+<data>
+<record id="website_mail_jobs" model="mail.group">
+    <field name="name">Jobs</field>
+    <field name="public">public</field>
+    <field name="description">Job Posts on your website</field>
+</record>
 
-        <template id="editor_head" inherit_id="website.editor_head" name="Jobs Editor" groups="base.group_website_designer">
-            <xpath expr="//script[last()]" position="after">
-                <script type="text/javascript" src="/website_hr_recruitment/static/src/js/website_hr_recruitment.editor.js"></script>
-            </xpath>
-        </template>
+<template id="editor_head" inherit_id="website.editor_head" name="Jobs Editor" groups="base.group_website_designer">
+    <xpath expr="//script[last()]" position="after">
+        <script type="text/javascript" src="/website_hr_recruitment/static/src/js/website_hr_recruitment.editor.js"></script>
+    </xpath>
+</template>
 
-        <template id="job_footer_custom" inherit_id="website.layout" name="Footer Job Link">
-            <xpath expr="//footer//div[@name='info']/ul" position="inside">
-            <li><a href="/jobs">Jobs</a></li>
-            </xpath>
-        </template>
+<template id="job_footer_custom" inherit_id="website.layout" name="Footer Job Link">
+    <xpath expr="//footer//div[@name='info']/ul" position="inside">
+    <li><a href="/jobs">Jobs</a></li>
+    </xpath>
+</template>
 
-        <template id="index" name="Jobs">
-            <t t-call="website.layout">
-                <div id="wrap">
-                    <div class="oe_structure">
-                        <section data-snippet-id="text-block" class="mb32">
-                            <div class="container">
-                                <div class="row">
-                                    <div class="col-md-12 text-center mb16" data-snippet-id="colmd">
-                                        <h2>Our Job Offers</h2>
-                                        <h3 class="text-muted">Join us and help disrupt the enterprise market!</h3>
-                                    </div>
-                                    <div class="col-md-12" data-snippet-id="colmd">
-                                        <p>
-                                            With a small team of smart people, we released the most
-                                            disruptive enterprise management software in the world.
-                                            OpenERP is fully open source, super easy, full featured
-                                            (3000+ apps) and its online offer is 3 times cheaper than
-                                            traditional competitors like SAP and Ms Dynamics.
-                                        </p>
-                                        <p>
-                                            Join us, we offer you an extraordinary chance to learn, to
-                                            develop and to be part of an exciting experience and
-                                            team.
-                                        </p>
-                                    </div>
-                                </div>
-                            </div>
-                        </section>
-                    </div>
-
-                    <div class="container oe_website_jobs">
+<template id="index" name="Jobs">
+    <t t-call="website.layout">
+        <div id="wrap">
+            <div class="oe_structure">
+                <section data-snippet-id="text-block" class="mb32">
+                    <div class="container">
                         <div class="row">
-                            <div class="col-md-1" id="jobs_grid_left">
-
+                            <div class="col-md-12 text-center mb16" data-snippet-id="colmd">
+                                <h2>Our Job Offers</h2>
+                                <h3 class="text-muted">Join us and help disrupt the enterprise market!</h3>
                             </div>
-                            <div class="col-md-9" id="jobs_grid">
-                                <ul class="media-list">
-                                    <li t-foreach="jobs" t-as="job" class="media">
-                                        <div class="media-body" t-att-data-publish="job.website_published and 'on' or 'off'">
-                                            <h3 class="media-heading">
-                                                <a t-href="/job/detail/#{ slug(job) }/">
-                                                    <span t-field="job.name"/>
-                                                </a>
-                                                <small t-if="job.no_of_recruitment &gt; 1">
-                                                    <t t-esc="job.no_of_recruitment"/> open positions
-                                                </small>
-                                            </h3>
-
-                                            <span t-field="job.address_id" t-field-options='{
-                                                "widget": "contact",
-                                                "fields": ["address"],
-                                                "no_tag_br": true
-                                                }'/>
-                                            <span t-if="not job.website_published" class="label label-danger">not published</span>
-                                            <div class="text-muted">
-                                                <i class="fa fa-clock-o"/> <span t-field="job.write_date"/>
-                                            </div>
-                                        </div>
-                                    </li>
-                                </ul>
+                            <div class="col-md-12" data-snippet-id="colmd">
+                                <p>
+                                    With a small team of smart people, we released the most
+                                    disruptive enterprise management software in the world.
+                                    OpenERP is fully open source, super easy, full featured
+                                    (3000+ apps) and its online offer is 3 times cheaper than
+                                    traditional competitors like SAP and Ms Dynamics.
+                                </p>
+                                <p>
+                                    Join us, we offer you an extraordinary chance to learn, to
+                                    develop and to be part of an exciting experience and
+                                    team.
+                                </p>
                             </div>
                         </div>
                     </div>
-                </div>
-            </t>
-        </template>
-
-        <template id="detail">
-            <t t-call="website.layout">
-            <t t-set="additional_title">Job Detail</t>
-            <div id="wrap">
-                <div class="oe_structure"/>
-
-                <section class="container mt8">
-                    <div class="row">
-                      <div class="col-sm-5">
-                          <ol class="breadcrumb mb0">
-                              <li><a href="/jobs">Our Jobs</a></li>
-                              <li class="active"><span t-field="job.name"></span></li>
-                          </ol>
-                      </div><div class="col-sm-7">
-                          <t t-call="website.publish_management">
-                              <t t-set="object" t-value="job"/>
-                              <t t-set="publish_edit" t-value="True"/>
-                              <t t-set="publish_controller">/job/publish</t>
-                          </t>
-                      </div>
-                    </div>
                 </section>
+            </div>
 
-                <div class="oe_structure" style="clear:both;">
-                    <h1 class="text-center" t-field="job.name"/>
-                    <h5 class="text-center" t-field="job.address_id" t-field-options='{
-                        "widget": "contact",
-                        "fields": ["address"],
-                        "no_tag_br": true
-                        }'/>
-                    <h5 class="text-center text-muted">
-                        <i class="fa fa-clock-o"/> <span t-field="job.write_date"/>
-                    </h5>
+            <div class="container oe_website_jobs">
+                <div class="row">
+                    <div class="col-md-1" id="jobs_grid_left">
+
+                    </div>
+                    <div class="col-md-9" id="jobs_grid">
+                        <ul class="media-list">
+                            <li t-foreach="jobs" t-as="job" class="media">
+                                <div class="media-body" t-att-data-publish="job.website_published and 'on' or 'off'">
+                                    <h3 class="media-heading">
+                                        <a t-href="/job/detail/#{ slug(job) }/">
+                                            <span t-field="job.name"/>
+                                        </a>
+                                        <small t-if="job.no_of_recruitment &gt; 1">
+                                            <t t-esc="job.no_of_recruitment"/> open positions
+                                        </small>
+                                    </h3>
+
+                                    <span t-field="job.address_id" t-field-options='{
+                                        "widget": "contact",
+                                        "fields": ["address"],
+                                        "no_tag_br": true
+                                        }'/>
+                                    <span t-if="not job.website_published" class="label label-danger">not published</span>
+                                    <div class="text-muted">
+                                        <i class="fa fa-clock-o"/> <span t-field="job.write_date"/>
+                                    </div>
+                                </div>
+                            </li>
+                        </ul>
+                    </div>
                 </div>
-                <div t-field="job.website_description"/>
+            </div>
+        </div>
+    </t>
+</template>
 
-                <div class="oe_structure">
-                    <section data-snippet-id="cta" class="mt16 mb16">
-                        <div class="container">
-                            <div class="row">
-                                <div class="col-md-12 text-center mt16 mb16">
-                                    <a t-href="/job/apply/?job=#{ job.id }" class="btn btn-primary btn-lg">Apply</a>
+<template id="detail">
+    <t t-call="website.layout">
+    <t t-set="additional_title">Job Detail</t>
+    <div id="wrap">
+        <div class="oe_structure"/>
+
+        <section class="container mt8">
+            <div class="row">
+              <div class="col-sm-5">
+                  <ol class="breadcrumb mb0">
+                      <li><a href="/jobs">Our Jobs</a></li>
+                      <li class="active"><span t-field="job.name"></span></li>
+                  </ol>
+              </div><div class="col-sm-7">
+                  <t t-call="website.publish_management">
+                      <t t-set="object" t-value="job"/>
+                      <t t-set="publish_edit" t-value="True"/>
+                      <t t-set="publish_controller">/job/publish</t>
+                  </t>
+              </div>
+            </div>
+        </section>
+
+        <div class="oe_structure" style="clear:both;">
+            <h1 class="text-center" t-field="job.name"/>
+            <h5 class="text-center" t-field="job.address_id" t-field-options='{
+                "widget": "contact",
+                "fields": ["address"],
+                "no_tag_br": true
+                }'/>
+            <h5 class="text-center text-muted">
+                <i class="fa fa-clock-o"/> <span t-field="job.write_date"/>
+            </h5>
+        </div>
+        <div t-field="job.website_description"/>
+
+        <div class="oe_structure">
+            <section data-snippet-id="cta" class="mt16 mb16">
+                <div class="container">
+                    <div class="row">
+                        <div class="col-md-12 text-center mt16 mb16">
+                            <a t-href="/job/apply/?job=#{ job.id }" class="btn btn-primary btn-lg">Apply</a>
+                        </div>
+                    </div>
+                </div>
+            </section>
+        </div>
+    </div>
+    </t>
+</template>
+
+<template id="applyjobpost">
+    <t t-call="website.layout">
+        <t t-set="additional_title">Apply Job</t>
+        <div id="wrap">
+            <div class="container">
+                <h1 class="text-center">
+                    Job Application Form
+                </h1>
+                <h2 t-if="job" class="text-center text-muted">
+                    <span t-field="job.name"/>
+                </h2>
+
+                <div class="row">
+                    <section id="forms">
+                        <!-- TODO Multilingual form action support ? -->
+                        <form class="form-horizontal mt32" action="/job/success" method="post" enctype="multipart/form-data">
+                            <input type="hidden" t-att-value="job and job.department_id.id or False" name="department_id"/>
+                            <input type="hidden" t-att-value="job and job.id or False" name="job_id"/>
+                            <div class="form-group">
+                                <label class="col-md-3 col-sm-4 control-label" for="partner_name">Your Name</label>
+                                <div class="col-md-7 col-sm-8">
+                                    <input type="text" class="form-control" name="partner_name" required="True" />
                                 </div>
                             </div>
-                        </div>
+                            <div class="form-group">
+                                <label class="col-md-3 col-sm-4 control-label" for="email_from">Your Email</label>
+                                <div class="col-md-7 col-sm-8">
+                                    <input type="email" class="form-control" name="email_from" required="True" />
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-md-3 col-sm-4 control-label" for="phone">Your Phone</label>
+                                <div class="col-md-7 col-sm-8">
+                                    <input type="text" class="form-control" name="phone" required="True" />
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-md-3 col-sm-4 control-label" for="description">Short Introduction</label>
+                                <div class="col-md-7 col-sm-8">
+                                    <textarea  class="form-control" name="description" style="min-height: 120px"/>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-md-3 col-sm-4 control-label" for="ufile">Resume</label>
+                                <div class="col-md-7 col-sm-8">
+                                    <input class="input-file" id="fileInput" type="file" name="ufile"/>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <div class="col-md-offset-3 col-sm-offset-4 col-sm-8 col-md-7">
+                                    <button type="submit" class="btn btn-primary">Submit</button>
+                                </div>
+                            </div>
+                        </form>
                     </section>
                 </div>
             </div>
-            </t>
-        </template>
+        </div>
+    </t>
+</template>
 
-        <template id="applyjobpost">
-            <t t-call="website.layout">
-                <t t-set="additional_title">Apply Job</t>
-                <div id="wrap">
+<template id="thankyou">
+    <t t-call="website.layout">
+        <div id="wrap">
+            <div class="oe_structure">
+                <div class="container">
+                    <h1>Thank you!</h1>
+                    <p>
+                        Your job application has been successfully registered,
+                        we will get back to you soon.
+                    </p>
+                </div>
+                <section data-snippet-id="cta" class="oe_dark">
                     <div class="container">
-                        <h1 class="text-center">
-                            Job Application Form
-                        </h1>
-                        <h2 t-if="job" class="text-center text-muted">
-                            <span t-field="job.name"/>
-                        </h2>
-
                         <div class="row">
-                            <section id="forms">
-                                <!-- TODO Multilingual form action support ? -->
-                                <form class="form-horizontal mt32" action="/job/success" method="post" enctype="multipart/form-data">
-                                    <input type="hidden" t-att-value="job and job.department_id.id or False" name="department_id"/>
-                                    <input type="hidden" t-att-value="job and job.id or False" name="job_id"/>
-                                    <div class="form-group">
-                                        <label class="col-md-3 col-sm-4 control-label" for="partner_name">Your Name</label>
-                                        <div class="col-md-7 col-sm-8">
-                                            <input type="text" class="form-control" name="partner_name" required="True" />
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label class="col-md-3 col-sm-4 control-label" for="email_from">Your Email</label>
-                                        <div class="col-md-7 col-sm-8">
-                                            <input type="email" class="form-control" name="email_from" required="True" />
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label class="col-md-3 col-sm-4 control-label" for="phone">Your Phone</label>
-                                        <div class="col-md-7 col-sm-8">
-                                            <input type="text" class="form-control" name="phone" required="True" />
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label class="col-md-3 col-sm-4 control-label" for="description">Short Introduction</label>
-                                        <div class="col-md-7 col-sm-8">
-                                            <textarea  class="form-control" name="description" style="min-height: 120px"/>
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label class="col-md-3 col-sm-4 control-label" for="ufile">Resume</label>
-                                        <div class="col-md-7 col-sm-8">
-                                            <input class="input-file" id="fileInput" type="file" name="ufile"/>
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <div class="col-md-offset-3 col-sm-offset-4 col-sm-8 col-md-7">
-                                            <button type="submit" class="btn btn-primary">Submit</button>
-                                        </div>
-                                    </div>
-                                </form>
-                            </section>
-                        </div>
-                    </div>
-                </div>
-            </t>
-        </template>
-
-        <template id="thankyou">
-            <t t-call="website.layout">
-                <div id="wrap">
-                    <div class="oe_structure">
-                        <div class="container">
-                            <h1>Thank you!</h1>
-                            <p>
-                                Your job application has been successfully registered,
-                                we will get back to you soon.
-                            </p>
-                        </div>
-                        <section data-snippet-id="cta" class="oe_dark">
-                            <div class="container">
-                                <div class="row">
-                                    <div class="col-md-12 text-center mt16 mb16">
-                                        <a href="/" class="btn btn-primary btn-lg">Continue To Our Website</a>
-                                    </div>
-                                </div>
+                            <div class="col-md-12 text-center mt16 mb16">
+                                <a href="/" class="btn btn-primary btn-lg">Continue To Our Website</a>
                             </div>
-                        </section>
+                        </div>
                     </div>
-                </div>
+                </section>
+            </div>
+        </div>
+    </t>
+</template>
+
+<template id="job_departments" inherit_option_id="website_hr_recruitment.index" name="Filter on Departments">
+    <xpath expr="//div[@id='jobs_grid_left']" position="inside">
+        <ul class="nav nav-pills nav-stacked mb32">
+            <li t-att-class=" '' if active else 'active' "><a href="/jobs">All Departments</a></li>
+            <t t-foreach="departments" t-as="department">
+                <li t-att-class="department.id == active and 'active' or ''">
+                <a t-href="/jobs/department/#{ slug(department) }/" ><span t-field="department.name"/></a>
+                </li>
             </t>
-        </template>
+        </ul>
+    </xpath>
+    <xpath expr="//div[@id='jobs_grid_left']" position="attributes">
+        <attribute name="class">col-md-3</attribute>
+    </xpath>
+</template>
 
-        <template id="job_departments" inherit_option_id="website_hr_recruitment.index" name="Filter on Departments">
-            <xpath expr="//div[@id='jobs_grid_left']" position="inside">
-                <ul class="nav nav-pills nav-stacked mb32">
-                    <li t-att-class=" '' if active else 'active' "><a href="/jobs">All Departments</a></li>
-                    <t t-foreach="departments" t-as="department">
-                        <li t-att-class="department.id == active and 'active' or ''">
-                        <a t-href="/jobs/department/#{ slug(department) }/" ><span t-field="department.name"/></a>
-                        </li>
-                    </t>
-                </ul>
-            </xpath>
-            <xpath expr="//div[@id='jobs_grid_left']" position="attributes">
-                <attribute name="class">col-md-3</attribute>
-            </xpath>
-        </template>
-
-        <template id="job_offices" inherit_option_id="website_hr_recruitment.index" name="Filter on Offices">
-            <xpath expr="//div[@id='jobs_grid_left']" position="inside">
-                <ul class="nav nav-pills nav-stacked mb32">
-                    <li t-att-class=" '' if office else 'active' "><a href="/jobs">All Offices</a></li>
-                    <t t-foreach="offices" t-as="thisoffice">
-                        <li t-att-class="thisoffice.id == office and 'active' or ''">
-                            <a t-href="/jobs/office/#{ slug(thisoffice) }/" >
-                                <span t-field="thisoffice.city"/><t t-if="thisoffice.country_id">,
-                                    <span t-field="thisoffice.country_id.name"/>
-                                </t>
-                            </a>
-                        </li>
-                    </t>
-                </ul>
-            </xpath>
-            <xpath expr="//div[@id='jobs_grid_left']" position="attributes">
-                <attribute name="class">col-md-3</attribute>
-            </xpath>
-        </template>
+<template id="job_offices" inherit_option_id="website_hr_recruitment.index" name="Filter on Offices">
+    <xpath expr="//div[@id='jobs_grid_left']" position="inside">
+        <ul class="nav nav-pills nav-stacked mb32">
+            <li t-att-class=" '' if office else 'active' "><a href="/jobs">All Offices</a></li>
+            <t t-foreach="offices" t-as="thisoffice">
+                <li t-att-class="thisoffice.id == office and 'active' or ''">
+                    <a t-href="/jobs/office/#{ slug(thisoffice) }/" >
+                        <span t-field="thisoffice.city"/><t t-if="thisoffice.country_id">,
+                            <span t-field="thisoffice.country_id.name"/>
+                        </t>
+                    </a>
+                </li>
+            </t>
+        </ul>
+    </xpath>
+    <xpath expr="//div[@id='jobs_grid_left']" position="attributes">
+        <attribute name="class">col-md-3</attribute>
+    </xpath>
+</template>
 
 
-    </data>
+</data>
 </openerp>
diff --git a/addons/website_mail/views/website_mail.xml b/addons/website_mail/views/website_mail.xml
index 39aa076caa0..2a2253794f3 100644
--- a/addons/website_mail/views/website_mail.xml
+++ b/addons/website_mail/views/website_mail.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+<data>
 
-        <template id="follow">
-            <div class="input-group js_follow" t-att-data-id="object.id"
-                       t-att-data-object="object._name"
-                       t-att-data-follow="object.id and object.message_is_follower and 'on' or 'off'">
-                <input
-                       type="email" name="email"
-                       class="js_follow_email form-control"
-                       t-att-value="email or ''"
-                       placeholder="your email..."/>
-                <span class="input-group-btn">
-                    <button href="#"
-                       t-attf-class="btn btn-#{object.message_is_follower and 'default' or 'primary'} js_follow_btn">
-                       <t t-if="object.message_is_follower">Unsubscribe</t>
-                       <t t-if="not object.message_is_follower">Subscribe</t>
-                    </button>
-                </span>
-            </div>
-        </template>
+<template id="follow">
+    <div class="input-group js_follow" t-att-data-id="object.id"
+              t-att-data-object="object._name"
+              t-att-data-follow="object.id and object.message_is_follower and 'on' or 'off'">
+        <input
+              type="email" name="email"
+              class="js_follow_email form-control"
+              t-att-value="email or ''"
+              placeholder="your email..."/>
+        <span class="input-group-btn">
+            <button href="#"
+                t-attf-class="btn btn-#{object.message_is_follower and 'default' or 'primary'} js_follow_btn">
+              <t t-if="object.message_is_follower">Unsubscribe</t>
+              <t t-if="not object.message_is_follower">Subscribe</t>
+            </button>
+        </span>
+    </div>
+</template>
 
-        <template id="head" inherit_id="website.layout" name="Mail customization">
-            <xpath expr="//head" position="inside">
-                <script type="text/javascript" src="/website_mail/static/src/js/website_mail.js"></script>
-            </xpath>
-        </template>
+<template id="head" inherit_id="website.layout" name="Mail customization">
+    <xpath expr="//head" position="inside">
+        <script type="text/javascript" src="/website_mail/static/src/js/website_mail.js"></script>
+    </xpath>
+</template>
 
-    </data>
+</data>
 </openerp>
diff --git a/addons/website_membership/views/website_membership.xml b/addons/website_membership/views/website_membership.xml
index 01457eb2128..6f6ce8a2b6c 100644
--- a/addons/website_membership/views/website_membership.xml
+++ b/addons/website_membership/views/website_membership.xml
@@ -1,128 +1,128 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+<data>
 
-    <!-- Layout add nav and footer -->
-    <template id="footer_custom" inherit_id="website.layout" name="Footer Associations Link">
-        <xpath expr="//footer//div[@name='info']/ul" position="inside">
-            <li><a href="/members/">Members</a></li>
-        </xpath>
-    </template>
+<!-- Layout add nav and footer -->
+<template id="footer_custom" inherit_id="website.layout" name="Footer Associations Link">
+    <xpath expr="//footer//div[@name='info']/ul" position="inside">
+        <li><a href="/members/">Members</a></li>
+    </xpath>
+</template>
 
-    <template id="index" name="Members">
-        <t t-call="website.layout">
-            <t t-set="additional_title">Members</t>
-            <div id="wrap">
-                <div class="oe_structure">
-                    <section data-snippet-id="title">
-                        <div class="container">
-                            <div class="row">
-                                <div class="col-md-12">
-                                    <h1 class="text-center">Our Members Directory</h1>
-                                    <h3 class="text-muted text-center">Find a business partner</h3>
-                                </div>
+<template id="index" name="Members">
+    <t t-call="website.layout">
+        <t t-set="additional_title">Members</t>
+        <div id="wrap">
+            <div class="oe_structure">
+                <section data-snippet-id="title">
+                    <div class="container">
+                        <div class="row">
+                            <div class="col-md-12">
+                                <h1 class="text-center">Our Members Directory</h1>
+                                <h3 class="text-muted text-center">Find a business partner</h3>
                             </div>
                         </div>
-                    </section>
-                </div>
-                <div class="container">
-                    <div class="row">
-
-                <div class="col-md-4" id="left_column">
-                    <ul class="nav nav-pills nav-stacked mt16">
-                        <li class="nav-header"><h3>Associations</h3></li>
-                        <li t-att-class="'' if membership else 'active'"><a href="/members/">All</a></li>
-                        <t t-foreach="memberships" t-as="membership_id">
-                            <li t-att-class="membership and membership_id.id == membership.id and 'active' or ''">
-                                <a t-href="/members/association/#{ membership_id.id }"><t t-esc="membership_id.name"/></a>
-                            </li>
-                        </t>
-                    </ul>
-                </div>
-                <div class="col-md-8" id="ref_content">
-                    <div class='navbar'>
-                        <t t-call="website.pager">
-                           <t t-set="classname">pull-left</t>
-                        </t>
-                        <form action="/members/" method="get" class="navbar-search pull-right pagination form-inline">
-                            <div class="form-group">
-                                <input type="text" name="name" class="search-query col-md-2 mt4 form-control" placeholder="Search" t-att-value="post.get('name', '')"/>
-                            </div>
-                        </form>
                     </div>
-                    <div>
-                        <t t-if="not membership_lines">
-                            <p>No result found.</p>
-                        </t>
-                        <t t-foreach="membership_lines" t-as="membership_line_id">
-                            <t t-if="current_membership_id != membership_line_id.membership_id.id">
-                                <t t-set="current_membership_id" t-value="membership_line_id.membership_id.id"/>
-                                <h3 class="text-center"><span t-field="membership_line_id.membership_id"/></h3>
-                            </t>
-                            <t t-set="partner_data" t-value="partners_data[membership_line_id.partner.id]"/>
-                            <div class="media">
-                                <a class="pull-left" t-href="/members/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/">
-                                    <img class="media-object" t-attf-src="data:image/png;base64,#{partner_data.get('image_small')}"/>
-                                </a>
-                                <div class="media-body" style="min-height: 64px;">
-                                    <a class="media-heading" t-href="/members/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/"><t t-if="partner_data.get('parent_id')"><span t-esc="partner_data.get('parent_id')[1]"/></t> <span t-esc="partner_data.get('name')"/></a>
-                                    <div t-raw="partner_data.get('website_short_description')"/>
-                                </div>
-                            </div>
-                        </t>
-                    </div>
-                </div>
-
-                    </div>
-                </div>
-                <div class="oe_structure"/>
+                </section>
             </div>
-        </t>
-    </template>
+            <div class="container">
+                <div class="row">
 
-    <template id="opt_index_country" name="Location"
-            inherit_option_id="website_membership.index" inherit_id="website_membership.index">
-        <xpath expr="//div[@id='left_column']/ul[last()]" position="after">
-            <ul class="nav nav-pills nav-stacked mt16">
-                <li class="nav-header"><h3>Location</h3></li>
-                <t t-foreach="countries">
-                    <li t-if="country_id" t-att-class="post.get('country_id', '0') == str(country_id and country_id[0]) and 'active' or ''">
-                        <a t-href="/members/#{ search }&amp;country_id=#{ country_id[0] }"><t t-esc="country_id[1]"/>
-                            <span class="badge pull-right"><t t-esc="country_id_count"/></span>
-                        </a>
-                    </li>
-                </t>
-            </ul>
-        </xpath>
-    </template>
-
-    <!-- Option: index: Left Google Map -->
-    <template id="opt_index_google_map" name="Left World Map"
-            inherit_option_id="website_membership.index" inherit_id="website_membership.index">
-        <xpath expr="//div[@id='left_column']/ul[1]" position="before">
-            <ul class="nav nav-pills nav-stacked mt16">
-                <li class="nav-header"><h3>World Map</h3></li>
-                <ul class="nav">
-                    <iframe t-attf-src="/google_map/?width=320&amp;height=240&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/members/"
-                        style="width:320px; height:260px; border:0; padding:0; margin:0;"></iframe>
+            <div class="col-md-4" id="left_column">
+                <ul class="nav nav-pills nav-stacked mt16">
+                    <li class="nav-header"><h3>Associations</h3></li>
+                    <li t-att-class="'' if membership else 'active'"><a href="/members/">All</a></li>
+                    <t t-foreach="memberships" t-as="membership_id">
+                        <li t-att-class="membership and membership_id.id == membership.id and 'active' or ''">
+                            <a t-href="/members/association/#{ membership_id.id }"><t t-esc="membership_id.name"/></a>
+                        </li>
+                    </t>
                 </ul>
-            </ul>
-        </xpath>
-    </template>
-
-    <template id="partner" name="Members">
-        <t t-call="website.layout">
-            <div id="wrap">
-                <div class="oe_structure"/>
-                <div class="container">
-                    <div class="row">
-                        <t t-call="website_partner.partner_detail"/>
-                    </div>
-                </div>
-                <div class="oe_structure"/>
             </div>
-        </t>
-    </template>
+            <div class="col-md-8" id="ref_content">
+                <div class='navbar'>
+                    <t t-call="website.pager">
+                       <t t-set="classname">pull-left</t>
+                    </t>
+                    <form action="/members/" method="get" class="navbar-search pull-right pagination form-inline">
+                        <div class="form-group">
+                            <input type="text" name="name" class="search-query col-md-2 mt4 form-control" placeholder="Search" t-att-value="post.get('name', '')"/>
+                        </div>
+                    </form>
+                </div>
+                <div>
+                    <t t-if="not membership_lines">
+                        <p>No result found.</p>
+                    </t>
+                    <t t-foreach="membership_lines" t-as="membership_line_id">
+                        <t t-if="current_membership_id != membership_line_id.membership_id.id">
+                            <t t-set="current_membership_id" t-value="membership_line_id.membership_id.id"/>
+                            <h3 class="text-center"><span t-field="membership_line_id.membership_id"/></h3>
+                        </t>
+                        <t t-set="partner_data" t-value="partners_data[membership_line_id.partner.id]"/>
+                        <div class="media">
+                            <a class="pull-left" t-href="/members/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/">
+                                <img class="media-object" t-attf-src="data:image/png;base64,#{partner_data.get('image_small')}"/>
+                            </a>
+                            <div class="media-body" style="min-height: 64px;">
+                                <a class="media-heading" t-href="/members/#{ slug([partner_data.get('id'), partner_data.get('name')]) }/"><t t-if="partner_data.get('parent_id')"><span t-esc="partner_data.get('parent_id')[1]"/></t> <span t-esc="partner_data.get('name')"/></a>
+                                <div t-raw="partner_data.get('website_short_description')"/>
+                            </div>
+                        </div>
+                    </t>
+                </div>
+            </div>
 
- </data>
+                </div>
+            </div>
+            <div class="oe_structure"/>
+        </div>
+    </t>
+</template>
+
+<template id="opt_index_country" name="Location"
+        inherit_option_id="website_membership.index" inherit_id="website_membership.index">
+    <xpath expr="//div[@id='left_column']/ul[last()]" position="after">
+        <ul class="nav nav-pills nav-stacked mt16">
+            <li class="nav-header"><h3>Location</h3></li>
+            <t t-foreach="countries">
+                <li t-if="country_id" t-att-class="post.get('country_id', '0') == str(country_id and country_id[0]) and 'active' or ''">
+                    <a t-href="/members/#{ search }&amp;country_id=#{ country_id[0] }"><t t-esc="country_id[1]"/>
+                        <span class="badge pull-right"><t t-esc="country_id_count"/></span>
+                    </a>
+                </li>
+            </t>
+        </ul>
+    </xpath>
+</template>
+
+<!-- Option: index: Left Google Map -->
+<template id="opt_index_google_map" name="Left World Map"
+        inherit_option_id="website_membership.index" inherit_id="website_membership.index">
+    <xpath expr="//div[@id='left_column']/ul[1]" position="before">
+        <ul class="nav nav-pills nav-stacked mt16">
+            <li class="nav-header"><h3>World Map</h3></li>
+            <ul class="nav">
+                <iframe t-attf-src="/google_map/?width=320&amp;height=240&amp;partner_ids=#{ google_map_partner_ids }&amp;partner_url=/members/"
+                    style="width:320px; height:260px; border:0; padding:0; margin:0;"></iframe>
+            </ul>
+        </ul>
+    </xpath>
+</template>
+
+<template id="partner" name="Members">
+    <t t-call="website.layout">
+        <div id="wrap">
+            <div class="oe_structure"/>
+            <div class="container">
+                <div class="row">
+                    <t t-call="website_partner.partner_detail"/>
+                </div>
+            </div>
+            <div class="oe_structure"/>
+        </div>
+    </t>
+</template>
+
+</data>
 </openerp>
diff --git a/addons/website_partner/views/website_partner_view.xml b/addons/website_partner/views/website_partner_view.xml
index 96bab75506f..9e337783c83 100644
--- a/addons/website_partner/views/website_partner_view.xml
+++ b/addons/website_partner/views/website_partner_view.xml
@@ -1,69 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+<data>
 
-        <template id="partner_detail" name="Partner Details (Complex Template for Access Right)">
-            <t t-if="partner" t-call="website.publish_management">
-                <t t-set="object" t-value="partner"/>
-                <t t-set="publish_edit" t-value="True"/>
-            </t>
-            <t t-if="partner"><h1 class="col-md-12 text-center" t-field="partner.name"/></t>
-            <t t-if="not partner"><h1 class="col-md-12 text-center" t-esc="partner_data.get('name_get')[1]"/></t>
-            <div class="col-md-4">
-                <div class="text-center">
-                    <t t-if="partner"><img t-att-src="partner.img('image')"/></t>
-                    <t t-if="not partner"><img t-attf-src="data:image/png;base64,#{partner_data.get('image')}"/></t>
-                </div>
-                <address>
-                    <table style="margin: auto;" class="well">
-                        <colgroup>
-                            <col width="100"/>
-                            <col/>
-                        </colgroup>
-                        <tbody>
-                            <t t-if="partner">
-                                <t t-set="address" t-value="'&lt;br/&gt;'.join(partner.name_get()[0][1].split('\n')[1:])"/>
-                                <tr t-if="address or editable"><th class="texttop">Address</th><td class="span2" t-raw="address"/></tr>
-                            </t>
-                            <tr t-if="not partner and partner_data.get('address')"><th class="texttop">Address</th><td class="span2" t-raw="partner_data.get('address')"/></tr>
-
-                            <tr t-if="partner and (partner.website or editable)"><th>Website</th><td class="span2">
-                                <t t-if="partner.website"><span t-field="partner.website"/></t></td></tr>
-                            <tr t-if="partner_data.get('website')"><th>Website</th><td class="span2"><span t-esc="partner_data.get('website')"/></td></tr>
-
-                            <tr t-if="partner and (partner.phone or editable)"><th>Phone</th><td class="span2">
-                                <t t-if="partner.phone"><span t-field="partner.phone"/></t></td></tr>
-                            <tr t-if="partner_data.get('phone')"><th>Phone</th><td class="span2"><span t-esc="partner_data.get('phone')"/></td></tr>
-
-                            <tr t-if="partner and (partner.mobile or editable)"><th>Tel</th><td class="span2">
-                                <t t-if="partner.mobile"><span t-field="partner.mobile"/></t></td></tr>
-                            <tr t-if="partner_data.get('mobile')"><th>Tel</th><td class="span2"><span t-esc="partner_data.get('mobile')"/></td></tr>
-
-                            <tr t-if="partner and (partner.fax or editable)"><th>Fax</th><td class="span2">
-                                <t t-if="partner.fax"><span t-field="partner.fax"/></t></td></tr>
-                            <tr t-if="partner_data.get('fax')"><th>Fax</th><td class="span2"><span t-esc="partner_data.get('fax')"/></td></tr>
-
-                            <tr t-if="partner and (partner.email or editable)"><th>Email</th><td class="span2">
-                                <t t-if="partner.email"><span t-field="partner.email"/></t></td></tr>
-                            <tr t-if="partner_data.get('email')"><th>Email</th><td class="span2"><span t-esc="partner_data.get('email')"/></td></tr>
-                        </tbody>
-                    </table>
-                </address>
-                <t t-raw="left_column or ''"/>
-            </div>
-            <div class="col-md-8 mt32">
-                <t t-if="partner">
-                    <div t-field="partner.website_description"/>
-                    <t groups="base.group_website_publisher">
-                        <h2 class="css_non_editable_mode_hidden">Short Description for List View</h2>
-                        <div class="css_non_editable_mode_hidden" t-field="partner.website_short_description"/>
+<template id="partner_detail" name="Partner Details (Complex Template for Access Right)">
+    <t t-if="partner" t-call="website.publish_management">
+        <t t-set="object" t-value="partner"/>
+        <t t-set="publish_edit" t-value="True"/>
+    </t>
+    <t t-if="partner"><h1 class="col-md-12 text-center" t-field="partner.name"/></t>
+    <t t-if="not partner"><h1 class="col-md-12 text-center" t-esc="partner_data.get('name_get')[1]"/></t>
+    <div class="col-md-4">
+        <div class="text-center">
+            <t t-if="partner"><img t-att-src="partner.img('image')"/></t>
+            <t t-if="not partner"><img t-attf-src="data:image/png;base64,#{partner_data.get('image')}"/></t>
+        </div>
+        <address>
+            <table style="margin: auto;" class="well">
+                <colgroup>
+                    <col width="100"/>
+                    <col/>
+                </colgroup>
+                <tbody>
+                    <t t-if="partner">
+                        <t t-set="address" t-value="'&lt;br/&gt;'.join(partner.name_get()[0][1].split('\n')[1:])"/>
+                        <tr t-if="address or editable"><th class="texttop">Address</th><td class="span2" t-raw="address"/></tr>
                     </t>
-                </t>
-                <t t-if="not partner">
-                    <div class="col-md-8 mt32" t-raw="partner_data.get('website_description')"/>
-                </t>
-                <t t-raw="right_column or ''"/>
-            </div>
-        </template>
+                    <tr t-if="not partner and partner_data.get('address')"><th class="texttop">Address</th><td class="span2" t-raw="partner_data.get('address')"/></tr>
+
+                    <tr t-if="partner and (partner.website or editable)"><th>Website</th><td class="span2">
+                        <t t-if="partner.website"><span t-field="partner.website"/></t></td></tr>
+                    <tr t-if="partner_data.get('website')"><th>Website</th><td class="span2"><span t-esc="partner_data.get('website')"/></td></tr>
+
+                    <tr t-if="partner and (partner.phone or editable)"><th>Phone</th><td class="span2">
+                        <t t-if="partner.phone"><span t-field="partner.phone"/></t></td></tr>
+                    <tr t-if="partner_data.get('phone')"><th>Phone</th><td class="span2"><span t-esc="partner_data.get('phone')"/></td></tr>
+
+                    <tr t-if="partner and (partner.mobile or editable)"><th>Tel</th><td class="span2">
+                        <t t-if="partner.mobile"><span t-field="partner.mobile"/></t></td></tr>
+                    <tr t-if="partner_data.get('mobile')"><th>Tel</th><td class="span2"><span t-esc="partner_data.get('mobile')"/></td></tr>
+
+                    <tr t-if="partner and (partner.fax or editable)"><th>Fax</th><td class="span2">
+                        <t t-if="partner.fax"><span t-field="partner.fax"/></t></td></tr>
+                    <tr t-if="partner_data.get('fax')"><th>Fax</th><td class="span2"><span t-esc="partner_data.get('fax')"/></td></tr>
+
+                    <tr t-if="partner and (partner.email or editable)"><th>Email</th><td class="span2">
+                        <t t-if="partner.email"><span t-field="partner.email"/></t></td></tr>
+                    <tr t-if="partner_data.get('email')"><th>Email</th><td class="span2"><span t-esc="partner_data.get('email')"/></td></tr>
+                </tbody>
+            </table>
+        </address>
+        <t t-raw="left_column or ''"/>
+    </div>
+    <div class="col-md-8 mt32">
+        <t t-if="partner">
+            <div t-field="partner.website_description"/>
+            <t groups="base.group_website_publisher">
+                <h2 class="css_non_editable_mode_hidden">Short Description for List View</h2>
+                <div class="css_non_editable_mode_hidden" t-field="partner.website_short_description"/>
+            </t>
+        </t>
+        <t t-if="not partner">
+            <div class="col-md-8 mt32" t-raw="partner_data.get('website_description')"/>
+        </t>
+        <t t-raw="right_column or ''"/>
+    </div>
+</template>
 </data>
 </openerp>
diff --git a/addons/website_payment/views/website_payment_templates.xml b/addons/website_payment/views/website_payment_templates.xml
index a7be06b7117..2c7c08748b7 100644
--- a/addons/website_payment/views/website_payment_templates.xml
+++ b/addons/website_payment/views/website_payment_templates.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <!-- Page -->
-    <data>
-        <template id="cc_form" name="Paypal (Test)" page="True">
-            <div class="row">
-                <h3>Paypal payment: server 2 server</h3>
-                <form class="form-horizontal col-sm-4 oe_cc" role="form">
-                    <div class="form-group col-sm-8">
-                        <label class="control-label" for="cc_number">Card number</label>
-                        <input type="tel" id="cc_number" class="form-control"/>
-                        <div class="card_placeholder"></div>
-                        <div class="visa"></div>
-                    </div>
-                    <div class="form-group col-sm-4">
-                        <label class="control-label" for="cc_cvc">Card code</label>
-                        <input type="text" id="cc_cvc" class="form-control" maxlength="4" palceholder="CVC"/>
-                    </div>
-                    <div class="form-group col-sm-7">
-                        <label class="control-label" for="cc_holder_name">Holder Name</label>
-                        <input type="text" id="cc_hoder_name" class="form-control"/>
-                    </div>
-                    <div class="form-group col-sm-5">
-                        <label class="control-label" for="cc_expires_mm">Expires</label>
-                        <input type="text" id="cc_expiry" class="form-control" maxlength="7" placeholder="MM / YY"/>
-                    </div>
-                </form>
+<!-- Page -->
+<data>
+<template id="cc_form" name="Paypal (Test)" page="True">
+    <div class="row">
+        <h3>Paypal payment: server 2 server</h3>
+        <form class="form-horizontal col-sm-4 oe_cc" role="form">
+            <div class="form-group col-sm-8">
+                <label class="control-label" for="cc_number">Card number</label>
+                <input type="tel" id="cc_number" class="form-control"/>
+                <div class="card_placeholder"></div>
+                <div class="visa"></div>
             </div>
-        </template>
-    </data>
+            <div class="form-group col-sm-4">
+                <label class="control-label" for="cc_cvc">Card code</label>
+                <input type="text" id="cc_cvc" class="form-control" maxlength="4" palceholder="CVC"/>
+            </div>
+            <div class="form-group col-sm-7">
+                <label class="control-label" for="cc_holder_name">Holder Name</label>
+                <input type="text" id="cc_hoder_name" class="form-control"/>
+            </div>
+            <div class="form-group col-sm-5">
+                <label class="control-label" for="cc_expires_mm">Expires</label>
+                <input type="text" id="cc_expiry" class="form-control" maxlength="7" placeholder="MM / YY"/>
+            </div>
+        </form>
+    </div>
+</template>
+</data>
 </openerp>
diff --git a/addons/website_project/views/website_project.xml b/addons/website_project/views/website_project.xml
index 88e048c8979..0b7b8d9e95c 100644
--- a/addons/website_project/views/website_project.xml
+++ b/addons/website_project/views/website_project.xml
@@ -1,66 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+<data>
 
-        <!-- Layout add nav and footer -->
-        <template id="footer_custom" inherit_id="website.layout" name="Footer Project's Links">
-            <xpath expr="//footer//ul[@name='products']" position="inside">
-                <li t-foreach="website_project_ids" t-as="project"><a t-href="/project/#{ project.id }/" t-field="project.name"/></li>
-            </xpath>
-        </template>
+<!-- Layout add nav and footer -->
+<template id="footer_custom" inherit_id="website.layout" name="Footer Project's Links">
+    <xpath expr="//footer//ul[@name='products']" position="inside">
+        <li t-foreach="website_project_ids" t-as="project"><a t-href="/project/#{ project.id }/" t-field="project.name"/></li>
+    </xpath>
+</template>
 
-        <!-- Task --> 
-        <template id="task" name="Task">
-            <t t-call="website.layout">
-                <t t-set="additional_title">Task</t>
-                <div id="wrap">
-                    <div class="oe_structure"/>
-                    <div class="container">
-                        <h4 t-field="task.name"/>
-                    </div>
-                    <div class="oe_structure"/>
-              </div>
-            </t>
-        </template>
-
-        <!-- Project --> 
-        <template id="task_kanban_card" name="TaskKanban">
-            <div class="thumbnail">
-                <a t-href="/project/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="fa fa-clock-o"></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>
+<!-- Task --> 
+<template id="task" name="Task">
+    <t t-call="website.layout">
+        <t t-set="additional_title">Task</t>
+        <div id="wrap">
+            <div class="oe_structure"/>
+            <div class="container">
+                <h4 t-field="task.name"/>
             </div>
-        </template>
-        <template id="index" name="Project">
-            <t t-call="website.layout">
-                <t t-set="additional_title">Project</t>
-                <div id="wrap">
-                    <div class="oe_structure"/>
-                    <div class="container">
-                        <h4 t-field="project.name"/>
-                        <t t-call="website.kanban">
-                            <t t-set="model">project.task</t>
-                            <t t-set="domain" t-value="[('project_id', '=', project.id)]"/>
-                            <t t-set="column">stage_id</t>
-                            <t t-set="template">website_project.task_kanban_card</t>
-                            <t t-set="step">10</t>
-                            <t t-set="scope">3</t>
-                        </t>
-                    </div>
-                    <div class="oe_structure"/>
-              </div>
-            </t>
-        </template>
+            <div class="oe_structure"/>
+      </div>
+    </t>
+</template>
 
-    </data>
+<!-- Project --> 
+<template id="task_kanban_card" name="TaskKanban">
+    <div class="thumbnail">
+        <a t-href="/project/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="fa fa-clock-o"></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>
+    </div>
+</template>
+<template id="index" name="Project">
+    <t t-call="website.layout">
+        <t t-set="additional_title">Project</t>
+        <div id="wrap">
+            <div class="oe_structure"/>
+            <div class="container">
+                <h4 t-field="project.name"/>
+                <t t-call="website.kanban">
+                    <t t-set="model">project.task</t>
+                    <t t-set="domain" t-value="[('project_id', '=', project.id)]"/>
+                    <t t-set="column">stage_id</t>
+                    <t t-set="template">website_project.task_kanban_card</t>
+                    <t t-set="step">10</t>
+                    <t t-set="scope">3</t>
+                </t>
+            </div>
+            <div class="oe_structure"/>
+      </div>
+    </t>
+</template>
+
+</data>
 </openerp>
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 95afde8e829..8a0bbd4ac47 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -2,989 +2,988 @@
 <openerp>
 <data>
 
-    <!-- Layout add nav and footer -->
+<!-- Layout add nav and footer -->
 
+<template id="editor_head" inherit_id="website.editor_head" name="Shop Editor" groups="base.group_website_designer">
+  <xpath expr="//script[last()]" position="after">
+      <script type="text/javascript" src="/website_sale/static/src/js/website_sale.editor.js"></script>
+      <script type="text/javascript" src="/website_sale/static/src/js/website.tour.shop.js"></script>
+  </xpath>
+</template>
 
-    <template id="editor_head" inherit_id="website.editor_head" name="Shop Editor" groups="base.group_website_designer">
-        <xpath expr="//script[last()]" position="after">
-            <script type="text/javascript" src="/website_sale/static/src/js/website_sale.editor.js"></script>
-            <script type="text/javascript" src="/website_sale/static/src/js/website.tour.shop.js"></script>
-        </xpath>
-    </template>
-
-    <template id="header" inherit_id="website.layout" name="Header Shop My Cart Link">
-        <xpath expr="//header//ul[@id='top_menu']/li" position="before">
-            <li t-att-class="(not website_sale_order or not website_sale_order.get_total_quantity()) and 'hidden' or ''">
-                <a href="/shop/mycart/">
-                    <i class="fa fa-shopping-cart"></i>
-                    My cart <sup t-attf-class="my_cart_quantity label label-primary"
-                                  t-esc="website_sale_order and website_sale_order.get_total_quantity() or ''"/>
-                </a>
-            </li>
-        </xpath>
-    </template>
-
-    <!-- List of categories -->
-
-    <template id="categories_recursive" name="Category list">
-        <li t-att-class="str(category.id) == search.get('category') and 'active' or ''">
-            <a t-href="/shop/category/#{ category.id }/" t-field="category.name"></a>
-            <ul t-if="category.child_id" class="nav nav-pills nav-stacked nav-hierarchy">
-                <t t-foreach="category.child_id" t-as="category">
-                    <t t-call="website_sale.categories_recursive"/>
-                </t>
-            </ul>
-        </li>
-    </template>
-
-    <!-- Product list -->
-
-    <template id="search" name="Search hidden fields">
-        <input type="hidden" name="category" t-att-value="search.get('category') or ''"/>
-        <input type="hidden" name="filters" t-att-value="search.get('filters') or ''"/>
-        <div class="input-group">
-          <input type="text" name="search" class="search-query form-control" placeholder="Search..." t-att-value="search.get('search') or ''"/>
-          <span class="input-group-btn">
-            <button class="btn btn-default" type="submit"><i class="fa fa-search"/></button>
-          </span>
-        </div>
-    </template>
-
-    <template id="products_cart" name="Shopping cart">
-      <div class="ribbon-wrapper">
-        <div class="ribbon">Promo</div>
-      </div>
-      <div class="oe_product_description">
-          <a t-href="/shop/product/#{ slug(product) }/" t-keep-query="category,search,filters">
-              <b t-field="product.name"/>
+<template id="header" inherit_id="website.layout" name="Header Shop My Cart Link">
+  <xpath expr="//header//ul[@id='top_menu']/li" position="before">
+      <li t-att-class="(not website_sale_order or not website_sale_order.get_total_quantity()) and 'hidden' or ''">
+          <a href="/shop/mycart/">
+              <i class="fa fa-shopping-cart"></i>
+              My cart <sup t-attf-class="my_cart_quantity label label-primary"
+                            t-esc="website_sale_order and website_sale_order.get_total_quantity() or ''"/>
           </a>
-      </div>
-      <div class="product_price" t-if="product.product_variant_ids">
-          <b>
-              <t t-if="product.product_variant_ids[0].lst_price != product.product_variant_ids[0].price">
-                <del class="text-danger"
-                  t-field="product.product_variant_ids[0].lst_price" t-field-options='{
-                       "widget": "monetary",
-                       "display_currency": "website.pricelist_id.currency_id"
-                  }'/>&amp;nbsp;
-              </t>
-              <span t-field="product.product_variant_ids[0].price"  t-field-options='{
-                   "widget": "monetary",
-                   "display_currency": "website.pricelist_id.currency_id"
-               }'/>
-          </b>
-      </div>
-      <div class="oe_product_image text-center">
-          <a t-href="/shop/product/#{ product.id }/" t-keep-query="category,search,filters">
-              <span t-field="product.image" t-field-options='{"widget": "image"}'/>
-          </a>
-      </div>
-    </template>
+      </li>
+  </xpath>
+</template>
 
-    <template id="products" name="Products">
-        <t t-call="website.layout">
-            <t t-set="head">
-                <script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js"></script>
-                <link rel='stylesheet' href="/web/static/lib/jquery.ui/css/smoothness/jquery-ui-1.9.1.custom.css"/>
-                <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
-                <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
-                <t t-raw="head or ''"/>
-            </t>
-            <t t-set="additional_title">Shop</t>
-            <div id="wrap">
-              <div class="oe_structure"/>
-              <div class="container oe_website_sale">
-                <div class="products_pager">
-                  <div>
-                    <form action="/shop/" method="get" class="pagination form-inline col-md-3">
-                        <t t-call="website_sale.search" />
-                    </form>
-                    <t t-call="website.pager"/>
-                  </div>
+<!-- List of categories -->
+
+<template id="categories_recursive" name="Category list">
+  <li t-att-class="str(category.id) == search.get('category') and 'active' or ''">
+      <a t-href="/shop/category/#{ category.id }/" t-field="category.name"></a>
+      <ul t-if="category.child_id" class="nav nav-pills nav-stacked nav-hierarchy">
+          <t t-foreach="category.child_id" t-as="category">
+              <t t-call="website_sale.categories_recursive"/>
+          </t>
+      </ul>
+  </li>
+</template>
+
+<!-- Product list -->
+
+<template id="search" name="Search hidden fields">
+  <input type="hidden" name="category" t-att-value="search.get('category') or ''"/>
+  <input type="hidden" name="filters" t-att-value="search.get('filters') or ''"/>
+  <div class="input-group">
+    <input type="text" name="search" class="search-query form-control" placeholder="Search..." t-att-value="search.get('search') or ''"/>
+    <span class="input-group-btn">
+      <button class="btn btn-default" type="submit"><i class="fa fa-search"/></button>
+    </span>
+  </div>
+</template>
+
+<template id="products_cart" name="Shopping cart">
+<div class="ribbon-wrapper">
+  <div class="ribbon">Promo</div>
+</div>
+<div class="oe_product_description">
+    <a t-href="/shop/product/#{ slug(product) }/" t-keep-query="category,search,filters">
+        <b t-field="product.name"/>
+    </a>
+</div>
+<div class="product_price" t-if="product.product_variant_ids">
+    <b>
+        <t t-if="product.product_variant_ids[0].lst_price != product.product_variant_ids[0].price">
+          <del class="text-danger"
+            t-field="product.product_variant_ids[0].lst_price" t-field-options='{
+                 "widget": "monetary",
+                 "display_currency": "website.pricelist_id.currency_id"
+            }'/>&amp;nbsp;
+        </t>
+        <span t-field="product.product_variant_ids[0].price"  t-field-options='{
+             "widget": "monetary",
+             "display_currency": "website.pricelist_id.currency_id"
+         }'/>
+    </b>
+</div>
+<div class="oe_product_image text-center">
+    <a t-href="/shop/product/#{ product.id }/" t-keep-query="category,search,filters">
+        <span t-field="product.image" t-field-options='{"widget": "image"}'/>
+    </a>
+</div>
+</template>
+
+<template id="products" name="Products">
+  <t t-call="website.layout">
+      <t t-set="head">
+          <script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js"></script>
+          <link rel='stylesheet' href="/web/static/lib/jquery.ui/css/smoothness/jquery-ui-1.9.1.custom.css"/>
+          <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
+          <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
+          <t t-raw="head or ''"/>
+      </t>
+      <t t-set="additional_title">Shop</t>
+      <div id="wrap">
+        <div class="oe_structure"/>
+        <div class="container oe_website_sale">
+          <div class="products_pager">
+            <div>
+              <form action="/shop/" method="get" class="pagination form-inline col-md-3">
+                  <t t-call="website_sale.search" />
+              </form>
+              <t t-call="website.pager"/>
+            </div>
+          </div>
+          <div class='style_default row'>
+            <div class="hidden" id="products_grid_before"></div>
+            <div class="col-md-12" id="products_grid">
+              <table width="100%">
+                <tbody>
+                  <tr>
+                    <td t-foreach="range(0,rows)" t-as="row" t-attf-width="#{100/rows}%"></td>
+                  </tr>
+                  <tr t-foreach="bins" t-as="tr_product">
+                    <t t-foreach="tr_product" t-as="td_product">
+                      <t t-if="td_product">
+                      <t t-set="product" t-value="td_product['product']"/>
+                      <td t-att-colspan="td_product['x']"
+                          t-att-rowspan="td_product['y']"
+                          t-attf-class="oe_product oe-height-#{td_product['y']*2} #{ td_product['class'] }">
+
+                          <div class="oe_product_cart" t-att-data-publish="product.website_published and 'on' or 'off'">
+
+                            <div class="css_options" t-ignore="true" groups="base.group_website_publisher">
+                              <div t-attf-class="dropdown js_options" t-att-data-id="product.id">
+                                <a class="btn btn-default" t-att-id="'dopprod-%s' % product.id" role="button" data-toggle="dropdown">Options <span class="caret"></span></a>
+                                <ul class="dropdown-menu" role="menu" t-att-aria-labelledby="'dopprod-%s' % product.id">
+                                  <li class='dropdown-submenu'>
+                                    <a tabindex="-1" href="#">Size</a>
+                                    <ul class="dropdown-menu" name="size">
+                                      <li><a href="#">
+                                        <table>
+                                          <tr>
+                                            <td class="selected"></td>
+                                            <td t-att-class="product.website_size_x > 1 and 'selected'"></td>
+                                            <td t-att-class="product.website_size_x > 2 and 'selected'"></td>
+                                            <td t-att-class="product.website_size_x > 3 and 'selected'"></td>
+                                          </tr>
+                                          <tr>
+                                            <td t-att-class="product.website_size_y > 1 and 'selected'"></td>
+                                            <td t-att-class="product.website_size_y > 1 and product.website_size_x > 1 and 'selected'"></td>
+                                            <td t-att-class="product.website_size_y > 1 and product.website_size_x > 2 and 'selected'"></td>
+                                            <td t-att-class="product.website_size_y > 1 and product.website_size_x > 3 and 'selected'"></td>
+                                          </tr>
+                                          <tr>
+                                            <td t-att-class="product.website_size_y > 2 and 'selected'"></td>
+                                            <td t-att-class="product.website_size_y > 2 and product.website_size_x > 1 and 'selected'"></td>
+                                            <td t-att-class="product.website_size_y > 2 and product.website_size_x > 2 and 'selected'"></td>
+                                            <td t-att-class="product.website_size_y > 2 and product.website_size_x > 3 and 'selected'"></td>
+                                          </tr>
+                                          <tr>
+                                            <td t-att-class="product.website_size_y > 3 and 'selected'"></td>
+                                            <td t-att-class="product.website_size_y > 3 and product.website_size_x > 1 and 'selected'"></td>
+                                            <td t-att-class="product.website_size_y > 3 and product.website_size_x > 2 and 'selected'"></td>
+                                            <td t-att-class="product.website_size_y > 3 and product.website_size_x > 3 and 'selected'"></td>
+                                          </tr>
+                                        </table>
+                                      </a></li>
+                                    </ul>
+                                  </li>
+                                  <li class='dropdown-submenu'>
+                                    <a tabindex="-1" href="#">Styles</a>
+                                    <ul class="dropdown-menu" name="style">
+                                      <t t-foreach="styles" t-as="style">
+                                        <li t-att-class="style_in_product(style, product) and 'active' or ''"><a href="#" t-att-data-id="style.id" t-att-data-class="style.html_class"><t t-esc="style.name"/></a></li>
+                                      </t>
+                                    </ul>
+                                  </li>
+                                </ul>
+                              </div>
+                            </div>
+
+                            <t t-call="website_sale.products_cart"/>
+                          </div>
+
+                      </td>
+                      </t>
+                      <td t-if="td_product == None"/>
+                    </t>
+                  </tr>
+                </tbody>
+              </table>
+              <t t-if="not bins">
+                <div class="text-center text-muted">
+                  <h3>No product found</h3>
+                  <t groups="base.group_website_publisher">
+                    <p>Click on "Content" to define a new product or "Help" for more informations.</p>
+                    <p>In the backend's product form contains information to simplify the sale process: price, notes in the quotation, accounting data, procurement methods, etc.</p>
+                  </t>
                 </div>
-                <div class='style_default row'>
-                  <div class="hidden" id="products_grid_before"></div>
-                  <div class="col-md-12" id="products_grid">
-                    <table width="100%">
+              </t>
+            </div>
+          </div>
+          <div class="products_pager">
+              <t t-call="website.pager"/>
+          </div>
+        </div>
+        <div class="oe_structure mb32"/>
+      </div>
+  </t>
+</template>
+
+<!-- Product Description-->
+
+<template id="product_description" inherit_option_id="website_sale.products_cart" name="Product Description">
+  <xpath expr="//div[@class='oe_product_description']" position="inside">
+      <p class="text-muted oe_subdescription">
+          <span t-field="product.description_sale"/>
+      </p>
+  </xpath>
+</template>
+
+<!-- Add to cart button-->
+
+<template id="add_to_basket" inherit_option_id="website_sale.products_cart" name="Add to Cart">
+  <xpath expr="//div[@class='product_price']" position="inside">
+      <a t-href="/shop/add_cart/#{ product.product_variant_ids[0].id }/" class="js_add_cart_json">
+          <span class="fa fa-shopping-cart"/>
+      </a>
+  </xpath>
+</template>
+
+<!-- List view of products -->
+
+<template id="list_view" inherit_option_id="website_sale.products" name="List View">
+  <xpath expr="//div[@id='products_grid']//table" position="replace">
+    <div class="row">
+      <t t-foreach="products" t-as="product">
+        <div class="col-md-12 oe_list_products oe-height-1">
+          <t t-call="website_sale.products_cart"/>
+        </div>
+      </t>
+    </div>
+  </xpath>
+</template>
+
+
+<!-- product -->
+<template id="404">
+  <t t-call="website.layout">
+      <div id="wrap">
+          <div class="oe_structure oe_empty">
+              <div class="container">
+                  <h1 class="mt32">Product not found!</h1>
+                  <p>Sorry, this product is not available anymore.</p>
+                  <p><a t-href="/shop/">Return to the product list.</a></p>
+              </div>
+          </div>
+      </div>
+  </t>
+</template>
+
+<template id="product" name="Product">
+  <t t-call="website.layout">
+      <t t-set="head">
+          <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
+          <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
+      </t>
+      <t t-set="additional_title" t-value="product.name"/>
+      <div id="wrap">
+
+        <section class="container mt8">
+          <div class="row">
+            <div class="col-sm-4">
+                <ol class="breadcrumb">
+                    <li><a href="/shop">Products</a></li>
+                    <li t-if="search.get('category')"><a t-href="/shop/" t-keep-query="category,search,filters"><span t-field="category.name"/></a></li>
+                    <li class="active"><span t-field="product.name"/></li>
+                </ol>
+            </div>
+            <div class="col-sm-3">
+              <form action="/shop/" method="get" class="pull-right">
+                  <t t-call="website_sale.search" />
+              </form>
+            </div>
+            <div class="col-sm-4">
+                <t t-call="website.publish_management">
+                  <t t-set="object" t-value="product"/>
+                  <t t-set="publish_edit" t-value="True"/>
+                  <li class='dropdown-submenu'>
+                      <a tabindex="-1" href="#">Promote</a>
+                      <ul class="dropdown-menu" name="sequence">
+                          <li><a href="#" class="js_go_to_top">Push to top</a></li>
+                          <li><a href="#" class="js_go_to_bottom">Push to bottom</a></li>
+                      </ul>
+                  </li>
+                </t>
+            </div>
+          </div>
+        </section>
+
+        <section class="container oe_website_sale" id="product_detail">
+          <div class="row">
+            <div class="col-sm-7 col-md-7 col-lg-7">
+                <span t-field="product.image" t-field-options='{"widget": "image", "class": "product_detail_img"}'/>
+            </div><div class="col-sm-5 col-md-5 col-lg-4 col-lg-offset-1">
+                <h1 t-field="product.name">Product Name</h1>
+
+                <form action="/shop/add_cart/" class="js_add_cart_json" method="POST">
+                    <input type="hidden" t-if="len(product.product_variant_ids) == 1" name="product_id" t-att-value="product.product_variant_ids[0].id"/>
+                    <t t-if="len(product.product_variant_ids) &gt; 1">
+                        <label label-default="label-default" class="radio" t-foreach="product.product_variant_ids" t-as="variant_id">
+                            <input type="radio" name="product_id" t-att-value="variant_id.id" t-att-checked="variant_id == product.product_variant_ids[0] or None"/>
+                            <t t-esc="variant_id.variants or ''">Standard</t>
+                            <span class="badge" t-if="variant_id.price_extra">
+                                <t t-esc="variant_id.price_extra > 0 and '+' or ''"/><span t-field="variant_id.price_extra" t-field-options='{
+                                             "widget": "monetary",
+                                             "display_currency": "website.pricelist_id.currency_id"
+                                         }'/>
+                            </span>
+                        </label>
+                        <br/>
+                    </t>
+
+                    <div class="product_price mt16" t-if="product.product_variant_ids">
+                        <h4>
+                            <t t-if="product.product_variant_ids[0].lst_price != product.product_variant_ids[0].price">
+                            <span class="text-danger" style="text-decoration: line-through;"
+                              t-field="product.product_variant_ids[0].lst_price"
+                              t-field-options='{
+                                 "widget": "monetary",
+                                 "display_currency": "website.pricelist_id.currency_id"
+                             }'/><br/>
+                            </t>
+                            <b class="oe_price"
+                              t-field="product.product_variant_ids[0].price"
+                              t-field-options='{
+                                 "widget": "monetary",
+                                 "display_currency": "website.pricelist_id.currency_id"
+                             }'/>
+                        </h4>
+                    </div>
+                    <button class="btn btn-primary btn-lg mt8">Add to Cart</button>
+                    <hr t-if="product.description_sale"/>
+                    <p t-field="product.description_sale" class="text-muted"/>
+                    <hr/>
+                    <p class="text-muted">
+                        30-day money-back guarantee<br/>
+                        Free Shipping in U.S.<br/>
+                        Buy now, get in 2 days
+                    </p>
+                </form>
+            </div>
+          </div>
+        </section>
+        <div t-field="product.website_description" class="oe_structure" id="product_full_description"/>
+      </div>
+  </t>
+</template>
+
+<template id="recommended_products" inherit_id="website_sale.product" inherit_option_id="website_sale.product" name="Recommended Products">
+  <xpath expr="//div[@id='product_full_description']" position="after">
+      <div class="container mt32" t-if="product.recommended_products()">
+          <h3>Customers who have bought this product also bought:</h3>
+          <div class='row mt16' style="margin-left: 15px !important;">
+          <t t-foreach="product.recommended_products()" t-as="product">
+              <div class='col-md-2 thumbnail' style='width: 170px; margin-right: 16px;'>
+                  <div class='mt16 text-center'>
+                      <span t-field="product.image_small"/>
+                      <h5>
+                          <a t-href="/shop/product/#{ slug(product) }/"
+                             style="display: block">
+                              <span t-field='product.name'
+                                    style="display: block"/>
+                          </a>
+                      </h5>
+                  </div>
+              </div>
+          </t>
+          </div>
+      </div>
+  </xpath>
+</template>
+
+<template id="product_attributes" inherit_option_id="website_sale.product" name="Product Attributes">
+<xpath expr="//p[@t-field='product.description_sale']" position="after">
+  <hr t-if="product.website_attribute_ids"/>
+  <p class="text-muted">
+    <t t-set="attr" t-value="None"/>
+    <t t-foreach="product.website_attribute_ids" t-as="attribute"><br t-if="attr and attribute.attribute_id.id != attr"/><t t-if="attribute.attribute_id.id != attr"><span t-field="attribute.attribute_id"/>: </t><t t-if="attribute.attribute_id.id == attr">, </t><t t-if="attribute.attribute_id.type == 'distinct'"><span t-field="attribute.value_id"/></t><t t-if="attribute.attribute_id.type == 'float'"><span t-field="attribute.value"/></t><t t-set="attr" t-value="attribute.attribute_id.id"/></t>
+  </p>
+</xpath>
+</template>
+
+<!-- Page Shop my cart -->
+
+<template id="mycart" name="Your Cart">
+  <t t-call="website.layout">
+      <t t-set="head">
+          <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
+          <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
+          <t t-raw="head or ''"/>
+      </t>
+      <div id="wrap">
+        <div class="container oe_website_sale">
+
+          <ul class="wizard pull-right">
+              <li class="text-primary">Review Order<span class="chevron"></span></li>
+              <li class="text-muted">Shipping &amp; Billing<span class="chevron"></span></li>
+              <li class="text-muted">Payment<span class="chevron"></span></li>
+              <li class="text-muted">Confirmation<span class="chevron"></span></li>
+          </ul>
+          <h1 class="mb32">Shopping Cart</h1>
+          <div class="row">
+              <div class="col-md-8 col-sm-9 oe_mycart">
+                  <div t-if="not website_sale_order or not website_sale_order.order_line" class="well well-lg">
+                      Your cart is empty!
+                  </div>
+                  <table class='table table-striped table-condensed' id="mycart_products" t-if="website_sale_order and website_sale_order.order_line">
+                      <colgroup>
+                          <col width="80"/>
+                          <col/>
+                          <col width="100"/>
+                          <col width="120"/>
+                      </colgroup>
+                      <thead>
+                          <tr>
+                              <th colspan="2">Product</th>
+                              <th>Price</th>
+                              <th>Quantity</th>
+                          </tr>
+                      </thead>
                       <tbody>
-                        <tr>
-                          <td t-foreach="range(0,rows)" t-as="row" t-attf-width="#{100/rows}%"></td>
-                        </tr>
-                        <tr t-foreach="bins" t-as="tr_product">
-                          <t t-foreach="tr_product" t-as="td_product">
-                            <t t-if="td_product">
-                            <t t-set="product" t-value="td_product['product']"/>
-                            <td t-att-colspan="td_product['x']"
-                                t-att-rowspan="td_product['y']"
-                                t-attf-class="oe_product oe-height-#{td_product['y']*2} #{ td_product['class'] }">
-
-                                <div class="oe_product_cart" t-att-data-publish="product.website_published and 'on' or 'off'">
-
-                                  <div class="css_options" t-ignore="true" groups="base.group_website_publisher">
-                                    <div t-attf-class="dropdown js_options" t-att-data-id="product.id">
-                                      <a class="btn btn-default" t-att-id="'dopprod-%s' % product.id" role="button" data-toggle="dropdown">Options <span class="caret"></span></a>
-                                      <ul class="dropdown-menu" role="menu" t-att-aria-labelledby="'dopprod-%s' % product.id">
-                                        <li class='dropdown-submenu'>
-                                          <a tabindex="-1" href="#">Size</a>
-                                          <ul class="dropdown-menu" name="size">
-                                            <li><a href="#">
-                                              <table>
-                                                <tr>
-                                                  <td class="selected"></td>
-                                                  <td t-att-class="product.website_size_x > 1 and 'selected'"></td>
-                                                  <td t-att-class="product.website_size_x > 2 and 'selected'"></td>
-                                                  <td t-att-class="product.website_size_x > 3 and 'selected'"></td>
-                                                </tr>
-                                                <tr>
-                                                  <td t-att-class="product.website_size_y > 1 and 'selected'"></td>
-                                                  <td t-att-class="product.website_size_y > 1 and product.website_size_x > 1 and 'selected'"></td>
-                                                  <td t-att-class="product.website_size_y > 1 and product.website_size_x > 2 and 'selected'"></td>
-                                                  <td t-att-class="product.website_size_y > 1 and product.website_size_x > 3 and 'selected'"></td>
-                                                </tr>
-                                                <tr>
-                                                  <td t-att-class="product.website_size_y > 2 and 'selected'"></td>
-                                                  <td t-att-class="product.website_size_y > 2 and product.website_size_x > 1 and 'selected'"></td>
-                                                  <td t-att-class="product.website_size_y > 2 and product.website_size_x > 2 and 'selected'"></td>
-                                                  <td t-att-class="product.website_size_y > 2 and product.website_size_x > 3 and 'selected'"></td>
-                                                </tr>
-                                                <tr>
-                                                  <td t-att-class="product.website_size_y > 3 and 'selected'"></td>
-                                                  <td t-att-class="product.website_size_y > 3 and product.website_size_x > 1 and 'selected'"></td>
-                                                  <td t-att-class="product.website_size_y > 3 and product.website_size_x > 2 and 'selected'"></td>
-                                                  <td t-att-class="product.website_size_y > 3 and product.website_size_x > 3 and 'selected'"></td>
-                                                </tr>
-                                              </table>
-                                            </a></li>
-                                          </ul>
-                                        </li>
-                                        <li class='dropdown-submenu'>
-                                          <a tabindex="-1" href="#">Styles</a>
-                                          <ul class="dropdown-menu" name="style">
-                                            <t t-foreach="styles" t-as="style">
-                                              <li t-att-class="style_in_product(style, product) and 'active' or ''"><a href="#" t-att-data-id="style.id" t-att-data-class="style.html_class"><t t-esc="style.name"/></a></li>
-                                            </t>
-                                          </ul>
-                                        </li>
-                                      </ul>
-                                    </div>
+                          <tr t-foreach="website_sale_order.order_line" t-as="line">
+                              <td colspan="2" t-if="not line.product_id.product_tmpl_id"></td>
+                              <td t-if="line.product_id.product_tmpl_id">
+                                  <span t-field="line.product_id.image_small"
+                                        t-field-options='{"widget": "image", "class": "img-rounded"}'/>
+                              </td>
+                              <td t-if="line.product_id.product_tmpl_id">
+                                  <div>
+                                      <a t-href="/shop/product/#{ slug(line.product_id.product_tmpl_id) }/">
+                                          <strong t-field="line.product_id.name"/>
+                                          <t t-if="line.product_id.variants">(<t t-esc="line.product_id.variants"/>)</t>
+                                      </a>
+                                  </div>
+                                  <div class="text-muted" t-field="line.product_id.description_sale"/>
+                              </td>
+                              <td class="text-center">
+                                 <del class="text-danger" t-if="line.product_id.lst_price &gt; line.price_unit">
+                                     <span t-field="line.product_id.lst_price" t-field-options='{
+                                         "widget": "monetary",
+                                         "display_currency": "website.pricelist_id.currency_id"
+                                     }'/>
+                                 </del>
+                                 <span t-field="line.price_unit" t-field-options='{
+                                     "widget": "monetary",
+                                     "display_currency": "website.pricelist_id.currency_id"
+                                 }'/>
+                              </td>
+                              <td>
+                                  <div class="input-group">
+                                      <span class="input-group-addon">
+                                          <a t-href="./change_cart/#{ line.id }/?remove=True" class="mb8 js_add_cart_json">
+                                              <i class="fa fa-minus-square"></i>
+                                          </a>
+                                      </span>
+                                      <input type="text" class="js_quantity form-control"
+                                          t-att-data-id="line.id" t-att-value="int(line.product_uom_qty)"/>
+                                      <span class="input-group-addon">
+                                          <a t-href="./change_cart/#{ line.id }/" class="mb8 float_left js_add_cart_json">
+                                              <i class="fa fa-plus-square"></i>
+                                          </a>
+                                      </span>
                                   </div>
 
-                                  <t t-call="website_sale.products_cart"/>
-                                </div>
-
-                            </td>
-                            </t>
-                            <td t-if="td_product == None"/>
-                          </t>
-                        </tr>
+                              </td>
+                          </tr>
                       </tbody>
-                    </table>
-                    <t t-if="not bins">
-                      <div class="text-center text-muted">
-                        <h3>No product found</h3>
-                        <t groups="base.group_website_publisher">
-                          <p>Click on "Content" to define a new product or "Help" for more informations.</p>
-                          <p>In the backend's product form contains information to simplify the sale process: price, notes in the quotation, accounting data, procurement methods, etc.</p>
-                        </t>
-                      </div>
-                    </t>
-                  </div>
-                </div>
-                <div class="products_pager">
-                    <t t-call="website.pager"/>
-                </div>
+                  </table>
+                  <table class='pull-right mb16' id="mycart_total" t-if="website_sale_order">
+                      <colgroup>
+                          <col width="100"/>
+                          <col width="120"/>
+                      </colgroup>
+                      <thead>
+                          <tr style="border-top: 1px solid #000">
+                              <th><h3>Total:</h3></th>
+                              <th class="text-right">
+                                <h3><t t-call="website_sale.total"/></h3>
+                              </th>
+                          </tr>
+                          <tr class="text-muted">
+                              <td><abbr title="Taxes may be updated after providing shipping address">Taxes:</abbr></td>
+                              <td class="text-right">
+                                  <span t-field="website_sale_order.amount_tax" t-field-options='{
+                                      "widget": "monetary",
+                                      "display_currency": "website.pricelist_id.currency_id"
+                                  }'/>
+                              </td>
+                          </tr>
+                      </thead>
+                  </table>
+                  <div class="clearfix"/>
+                  <a href="/shop" class="btn btn-default mb32"><span class="fa fa-long-arrow-left"/> Continue Shopping</a>
+                  <a t-if="website_sale_order and website_sale_order.order_line" href="/shop/checkout/" class="btn btn-primary pull-right mb32">Process Checkout <span class="fa fa-long-arrow-right"/></a>
+                  <div class="oe_structure"/>
               </div>
-              <div class="oe_structure mb32"/>
-            </div>
-        </t>
-    </template>
-
-    <!-- Product Description-->
-
-    <template id="product_description" inherit_option_id="website_sale.products_cart" name="Product Description">
-        <xpath expr="//div[@class='oe_product_description']" position="inside">
-            <p class="text-muted oe_subdescription">
-                <span t-field="product.description_sale"/>
-            </p>
-        </xpath>
-    </template>
-
-    <!-- Add to cart button-->
-
-    <template id="add_to_basket" inherit_option_id="website_sale.products_cart" name="Add to Cart">
-        <xpath expr="//div[@class='product_price']" position="inside">
-            <a t-href="/shop/add_cart/#{ product.product_variant_ids[0].id }/" class="js_add_cart_json">
-                <span class="fa fa-shopping-cart"/>
-            </a>
-        </xpath>
-    </template>
-
-    <!-- List view of products -->
-
-    <template id="list_view" inherit_option_id="website_sale.products" name="List View">
-        <xpath expr="//div[@id='products_grid']//table" position="replace">
-          <div class="row">
-            <t t-foreach="products" t-as="product">
-              <div class="col-md-12 oe_list_products oe-height-1">
-                <t t-call="website_sale.products_cart"/>
+              <div class="col-lg-3 col-lg-offset-1 col-sm-3 text-muted" id="right_column">
+                  <h4>Policies</h4>
+                  <ul class="list-unstyled mb32">
+                      <li>&#9745; 30-days money-back guarantee</li>
+                      <li>&#9745; Invoice sent by e-Mail</li>
+                  </ul>
+                  <h4>Secure Payment</h4>
+                  <ul class="list-unstyled mb32">
+                      <li>&#9745; 256 bit encryption</li>
+                      <li>&#9745; Processed by Ogone</li>
+                  </ul>
               </div>
-            </t>
           </div>
-        </xpath>
-    </template>
 
+        </div>
+        <div class="oe_structure"/>
+      </div>
+  </t>
+</template>
 
-    <!-- product -->
-    <template id="404">
-        <t t-call="website.layout">
-            <div id="wrap">
-                <div class="oe_structure oe_empty">
-                    <div class="container">
-                        <h1 class="mt32">Product not found!</h1>
-                        <p>Sorry, this product is not available anymore.</p>
-                        <p><a t-href="/shop/">Return to the product list.</a></p>
-                    </div>
-                </div>
-            </div>
-        </t>
-    </template>
+<!-- Page Shop -->
 
-    <template id="product" name="Product">
-        <t t-call="website.layout">
-            <t t-set="head">
-                <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
-                <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
-            </t>
-            <t t-set="additional_title" t-value="product.name"/>
-            <div id="wrap">
-
-              <section class="container mt8">
-                <div class="row">
-                  <div class="col-sm-4">
-                      <ol class="breadcrumb">
-                          <li><a href="/shop">Products</a></li>
-                          <li t-if="search.get('category')"><a t-href="/shop/" t-keep-query="category,search,filters"><span t-field="category.name"/></a></li>
-                          <li class="active"><span t-field="product.name"/></li>
-                      </ol>
-                  </div>
-                  <div class="col-sm-3">
-                    <form action="/shop/" method="get" class="pull-right">
-                        <t t-call="website_sale.search" />
-                    </form>
-                  </div>
-                  <div class="col-sm-4">
-                      <t t-call="website.publish_management">
-                        <t t-set="object" t-value="product"/>
-                        <t t-set="publish_edit" t-value="True"/>
-                        <li class='dropdown-submenu'>
-                            <a tabindex="-1" href="#">Promote</a>
-                            <ul class="dropdown-menu" name="sequence">
-                                <li><a href="#" class="js_go_to_top">Push to top</a></li>
-                                <li><a href="#" class="js_go_to_bottom">Push to bottom</a></li>
-                            </ul>
-                        </li>
-                      </t>
-                  </div>
-                </div>
-              </section>
-
-              <section class="container oe_website_sale" id="product_detail">
-                <div class="row">
-                  <div class="col-sm-7 col-md-7 col-lg-7">
-                      <span t-field="product.image" t-field-options='{"widget": "image", "class": "product_detail_img"}'/>
-                  </div><div class="col-sm-5 col-md-5 col-lg-4 col-lg-offset-1">
-                      <h1 t-field="product.name">Product Name</h1>
-
-                      <form action="/shop/add_cart/" class="js_add_cart_json" method="POST">
-                          <input type="hidden" t-if="len(product.product_variant_ids) == 1" name="product_id" t-att-value="product.product_variant_ids[0].id"/>
-                          <t t-if="len(product.product_variant_ids) &gt; 1">
-                              <label label-default="label-default" class="radio" t-foreach="product.product_variant_ids" t-as="variant_id">
-                                  <input type="radio" name="product_id" t-att-value="variant_id.id" t-att-checked="variant_id == product.product_variant_ids[0] or None"/>
-                                  <t t-esc="variant_id.variants or ''">Standard</t>
-                                  <span class="badge" t-if="variant_id.price_extra">
-                                      <t t-esc="variant_id.price_extra > 0 and '+' or ''"/><span t-field="variant_id.price_extra" t-field-options='{
-                                                   "widget": "monetary",
-                                                   "display_currency": "website.pricelist_id.currency_id"
-                                               }'/>
-                                  </span>
-                              </label>
-                              <br/>
-                          </t>
-
-                          <div class="product_price mt16" t-if="product.product_variant_ids">
-                              <h4>
-                                  <t t-if="product.product_variant_ids[0].lst_price != product.product_variant_ids[0].price">
-                                  <span class="text-danger" style="text-decoration: line-through;"
-                                    t-field="product.product_variant_ids[0].lst_price"
-                                    t-field-options='{
-                                       "widget": "monetary",
-                                       "display_currency": "website.pricelist_id.currency_id"
-                                   }'/><br/>
-                                  </t>
-                                  <b class="oe_price"
-                                    t-field="product.product_variant_ids[0].price"
-                                    t-field-options='{
-                                       "widget": "monetary",
-                                       "display_currency": "website.pricelist_id.currency_id"
-                                   }'/>
-                              </h4>
-                          </div>
-                          <button class="btn btn-primary btn-lg mt8">Add to Cart</button>
-                          <hr t-if="product.description_sale"/>
-                          <p t-field="product.description_sale" class="text-muted"/>
-                          <hr/>
-                          <p class="text-muted">
-                              30-day money-back guarantee<br/>
-                              Free Shipping in U.S.<br/>
-                              Buy now, get in 2 days
-                          </p>
-                      </form>
-                  </div>
-                </div>
-              </section>
-              <div t-field="product.website_description" class="oe_structure" id="product_full_description"/>
-            </div>
-        </t>
-    </template>
-
-    <template id="recommended_products" inherit_id="website_sale.product" inherit_option_id="website_sale.product" name="Recommended Products">
-        <xpath expr="//div[@id='product_full_description']" position="after">
-            <div class="container mt32" t-if="product.recommended_products()">
-                <h3>Customers who have bought this product also bought:</h3>
-                <div class='row mt16' style="margin-left: 15px !important;">
-                <t t-foreach="product.recommended_products()" t-as="product">
-                    <div class='col-md-2 thumbnail' style='width: 170px; margin-right: 16px;'>
-                        <div class='mt16 text-center'>
-                            <span t-field="product.image_small"/>
-                            <h5>
-                                <a t-href="/shop/product/#{ slug(product) }/"
-                                   style="display: block">
-                                    <span t-field='product.name'
-                                          style="display: block"/>
-                                </a>
-                            </h5>
-                        </div>
-                    </div>
-                </t>
-                </div>
-            </div>
-        </xpath>
-    </template>
-
-    <template id="product_attributes" inherit_option_id="website_sale.product" name="Product Attributes">
-      <xpath expr="//p[@t-field='product.description_sale']" position="after">
-        <hr t-if="product.website_attribute_ids"/>
-        <p class="text-muted">
-          <t t-set="attr" t-value="None"/>
-          <t t-foreach="product.website_attribute_ids" t-as="attribute"><br t-if="attr and attribute.attribute_id.id != attr"/><t t-if="attribute.attribute_id.id != attr"><span t-field="attribute.attribute_id"/>: </t><t t-if="attribute.attribute_id.id == attr">, </t><t t-if="attribute.attribute_id.type == 'distinct'"><span t-field="attribute.value_id"/></t><t t-if="attribute.attribute_id.type == 'float'"><span t-field="attribute.value"/></t><t t-set="attr" t-value="attribute.attribute_id.id"/></t>
-        </p>
-      </xpath>
-    </template>
-
-    <!-- Page Shop my cart -->
-
-    <template id="mycart" name="Your Cart">
-        <t t-call="website.layout">
-            <t t-set="head">
-                <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
-                <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
-                <t t-raw="head or ''"/>
-            </t>
-            <div id="wrap">
-              <div class="container oe_website_sale">
-
-                <ul class="wizard pull-right">
-                    <li class="text-primary">Review Order<span class="chevron"></span></li>
-                    <li class="text-muted">Shipping &amp; Billing<span class="chevron"></span></li>
-                    <li class="text-muted">Payment<span class="chevron"></span></li>
-                    <li class="text-muted">Confirmation<span class="chevron"></span></li>
-                </ul>
-                <h1 class="mb32">Shopping Cart</h1>
-                <div class="row">
-                    <div class="col-md-8 col-sm-9 oe_mycart">
-                        <div t-if="not website_sale_order or not website_sale_order.order_line" class="well well-lg">
-                            Your cart is empty!
-                        </div>
-                        <table class='table table-striped table-condensed' id="mycart_products" t-if="website_sale_order and website_sale_order.order_line">
-                            <colgroup>
-                                <col width="80"/>
-                                <col/>
-                                <col width="100"/>
-                                <col width="120"/>
-                            </colgroup>
-                            <thead>
-                                <tr>
-                                    <th colspan="2">Product</th>
-                                    <th>Price</th>
-                                    <th>Quantity</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <tr t-foreach="website_sale_order.order_line" t-as="line">
-                                    <td colspan="2" t-if="not line.product_id.product_tmpl_id"></td>
-                                    <td t-if="line.product_id.product_tmpl_id">
-                                        <span t-field="line.product_id.image_small"
-                                              t-field-options='{"widget": "image", "class": "img-rounded"}'/>
-                                    </td>
-                                    <td t-if="line.product_id.product_tmpl_id">
-                                        <div>
-                                            <a t-href="/shop/product/#{ slug(line.product_id.product_tmpl_id) }/">
-                                                <strong t-field="line.product_id.name"/>
-                                                <t t-if="line.product_id.variants">(<t t-esc="line.product_id.variants"/>)</t>
-                                            </a>
-                                        </div>
-                                        <div class="text-muted" t-field="line.product_id.description_sale"/>
-                                    </td>
-                                    <td class="text-center">
-                                       <del class="text-danger" t-if="line.product_id.lst_price &gt; line.price_unit">
-                                           <span t-field="line.product_id.lst_price" t-field-options='{
-                                               "widget": "monetary",
-                                               "display_currency": "website.pricelist_id.currency_id"
-                                           }'/>
-                                       </del>
-                                       <span t-field="line.price_unit" t-field-options='{
-                                           "widget": "monetary",
-                                           "display_currency": "website.pricelist_id.currency_id"
-                                       }'/>
-                                    </td>
-                                    <td>
-                                        <div class="input-group">
-                                            <span class="input-group-addon">
-                                                <a t-href="./change_cart/#{ line.id }/?remove=True" class="mb8 js_add_cart_json">
-                                                    <i class="fa fa-minus-square"></i>
-                                                </a>
-                                            </span>
-                                            <input type="text" class="js_quantity form-control"
-                                                t-att-data-id="line.id" t-att-value="int(line.product_uom_qty)"/>
-                                            <span class="input-group-addon">
-                                                <a t-href="./change_cart/#{ line.id }/" class="mb8 float_left js_add_cart_json">
-                                                    <i class="fa fa-plus-square"></i>
-                                                </a>
-                                            </span>
-                                        </div>
-
-                                    </td>
-                                </tr>
-                            </tbody>
-                        </table>
-                        <table class='pull-right mb16' id="mycart_total" t-if="website_sale_order">
-                            <colgroup>
-                                <col width="100"/>
-                                <col width="120"/>
-                            </colgroup>
-                            <thead>
-                                <tr style="border-top: 1px solid #000">
-                                    <th><h3>Total:</h3></th>
-                                    <th class="text-right">
-                                      <h3><t t-call="website_sale.total"/></h3>
-                                    </th>
-                                </tr>
-                                <tr class="text-muted">
-                                    <td><abbr title="Taxes may be updated after providing shipping address">Taxes:</abbr></td>
-                                    <td class="text-right">
-                                        <span t-field="website_sale_order.amount_tax" t-field-options='{
-                                            "widget": "monetary",
-                                            "display_currency": "website.pricelist_id.currency_id"
-                                        }'/>
-                                    </td>
-                                </tr>
-                            </thead>
-                        </table>
-                        <div class="clearfix"/>
-                        <a href="/shop" class="btn btn-default mb32"><span class="fa fa-long-arrow-left"/> Continue Shopping</a>
-                        <a t-if="website_sale_order and website_sale_order.order_line" href="/shop/checkout/" class="btn btn-primary pull-right mb32">Process Checkout <span class="fa fa-long-arrow-right"/></a>
-                        <div class="oe_structure"/>
-                    </div>
-                    <div class="col-lg-3 col-lg-offset-1 col-sm-3 text-muted" id="right_column">
-                        <h4>Policies</h4>
-                        <ul class="list-unstyled mb32">
-                            <li>&#9745; 30-days money-back guarantee</li>
-                            <li>&#9745; Invoice sent by e-Mail</li>
-                        </ul>
-                        <h4>Secure Payment</h4>
-                        <ul class="list-unstyled mb32">
-                            <li>&#9745; 256 bit encryption</li>
-                            <li>&#9745; Processed by Ogone</li>
-                        </ul>
-                    </div>
-                </div>
-
-              </div>
-              <div class="oe_structure"/>
-            </div>
-        </t>
-    </template>
-
-    <!-- Page Shop -->
-
-    <template id="products_categories" inherit_option_id="website_sale.products" name="Product Categories">
-        <xpath expr="//div[@id='products_grid_before']" position="inside">
-            <ul class="nav nav-pills nav-stacked mt16">
-                <li t-att-class=" '' if search.get('category') else 'active' "><a href="/shop/">All Products</a></li>
-                <t t-foreach="categories" t-as="category">
-                    <t t-call="website_sale.categories_recursive"/>
-                </t>
-            </ul>
-        </xpath>
-        <xpath expr="//div[@id='products_grid_before']" position="attributes">
-            <attribute name="class">col-md-3</attribute>
-        </xpath>
-        <xpath expr="//div[@id='products_grid']" position="attributes">
-            <attribute name="class">col-md-9</attribute>
-        </xpath>
-    </template>
-
-    <template id="products_attributes" inherit_option_id="website_sale.products" name="Product Filters and Attributes">
-        <xpath expr="//div[@id='products_grid_before']" position="inside">
-            <form t-action="/shop/filters/" method="post" t-keep-query="category,search">
-                <ul class="nav nav-pills nav-stacked mt16">
-                    <t t-set="attribute_ids" t-value="Ecommerce.get_attribute_ids()"/>
-                    <t t-foreach="attribute_ids" t-as="attribute_id">
-                      <t t-if="attribute_id.visible">
-                        <li t-if="attribute_id.value_ids and attribute_id.type == 'distinct'">
-                            <div t-field="attribute_id.name"/>
-                            <ul class="nav nav-pills nav-stacked">
-                                <t t-foreach="attribute_id.value_ids" t-as="value_id">
-                                    <li t-att-class="Ecommerce.has_search_filter(attribute_id.id, value_id.id) and 'active' or ''">
-                                        <label style="margin: 0 20px;">
-                                            <input type="checkbox" t-att-name="'att-%s-%s' % (attribute_id.id, value_id.id)"
-                                                t-att-checked="Ecommerce.has_search_filter(attribute_id.id, value_id.id) and 'checked' or ''"/>
-                                            <span style="font-weight: normal" t-field="value_id.name"/>
-                                        </label>
-                                    </li>
-                                </t>
-                            </ul>
-                        </li>
-                        <li t-if="attribute_id.type == 'float' and attribute_id.float_min != attribute_id.float_max">
-                            <div t-field="attribute_id.name"/>
-                            <t t-set="attribute" t-value="Ecommerce.has_search_filter(attribute_id.id)"/>
-                            <div style="margin: 0 20px;" class="js_slider"
-                              t-att-data-id="attribute_id.id"
-                              t-att-data-value-min="attribute and attribute[1][0] or attribute_id.float_min"
-                              t-att-data-value-max="attribute and attribute[1][1] or attribute_id.float_max"
-                              t-att-data-min="attribute_id.float_min"
-                              t-att-data-max="attribute_id.float_max"></div>
-                        </li>
-                      </t>
-                    </t>
-                </ul>
-                <button class="btn btn-xs btn-primary mt16">Apply filter</button>
-                <a t-href="/shop/" t-keep-query="category,search" class="btn btn-xs btn-default mt16">Cancel filter</a>
-            </form>
-        </xpath>
-        <xpath expr="//div[@id='products_grid_before']" position="attributes">
-            <attribute name="class">col-md-3</attribute>
-        </xpath>
-        <xpath expr="//div[@id='products_grid']" position="attributes">
-            <attribute name="class">col-md-9</attribute>
-        </xpath>
-    </template>
-
-    <template id="suggested_products_list" inherit_id="website_sale.mycart" inherit_option_id="website_sale.mycart" name="Suggested Products in my cart">
-        <xpath expr="//table[@id='mycart_products']" position="after">
-            <table t-if="suggested_products" class='table table-striped table-condensed'>
-                <colgroup>
-                    <col width="80"/>
-                    <col/>
-                    <col width="100"/>
-                    <col width="120"/>
-                </colgroup>
-                <thead>
-                    <tr>
-                        <th colspan="2">Suggested products</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr t-foreach="suggested_products" t-as="product">
-
-                        <td>
-                            <a t-href="/shop/product/#{ slug(product.product_tmpl_id) }/">
-                                <span t-field="product.image_small"
-                                      t-field-options='{"widget": "image", "class": "img-rounded"}'/>
-                            </a>
-                        </td>
-                        <td>
-                            <div>
-                                <a t-href="/shop/product/#{ slug(product.product_tmpl_id) }/">
-                                    <strong t-field="product.name"/>
-                                </a>
-                            </div>
-                            <div class="text-muted" t-field="product.description_sale"/>
-                        </td>
-                        <td>
-                            <span t-field="product.lst_price" t-field-options='{
-                                "widget": "monetary",
-                                "display_currency": "website.pricelist_id.currency_id"
-                            }'/>
-                        </td>
-                        <td class="text-center">
-                            <a t-href="./add_cart/#{ product.id }/"><strong>Add to Cart</strong></a>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-        </xpath>
-    </template>
-
-    <template id="reduction_code" inherit_option_id="website_sale.mycart" name="Reduction Code">
-        <xpath expr="//div[@id='right_column']" position="inside">
-            <h4>Coupon Code</h4>
-            <p>
-                Have a coupon code? Fill in this field and apply.
-            </p>
-            <form t-if="website_sale_order and website_sale_order.order_line" action="/shop/mycart/" method="post" class="mb32">
-                <div class="input-group">
-                    <input name="promo" class='form-control' type="text" placeholder="code..." t-att-value="website_sale_order.pricelist_id.code or ''"/>
-                    <div class="input-group-btn">
-                        <button class="btn btn-default">Apply</button>
-                    </div>
-                </div>
-            </form>
-        </xpath>
-    </template>
-
-
-    <!-- Page confirm my cart -->
-
-    <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>
-              <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
-              <t t-raw="head or ''"/>
+<template id="products_categories" inherit_option_id="website_sale.products" name="Product Categories">
+  <xpath expr="//div[@id='products_grid_before']" position="inside">
+      <ul class="nav nav-pills nav-stacked mt16">
+          <li t-att-class=" '' if search.get('category') else 'active' "><a href="/shop/">All Products</a></li>
+          <t t-foreach="categories" t-as="category">
+              <t t-call="website_sale.categories_recursive"/>
           </t>
-          <t t-set="additional_title">Shop - Checkout</t>
-          <div id="wrap">
-            <div class="container oe_website_sale">
-                <ul class="wizard pull-right">
-                    <li><a href="/shop/mycart" class="text-success">Review Order<span class="chevron"></span></a></li>
-                    <li class="text-primary">Shipping &amp; Billing<span class="chevron"></span></li>
-                    <li class="text-muted">Payment<span class="chevron"></span></li>
-                    <li class="text-muted">Confirmation<span class="chevron"></span></li>
-                </ul>
-                <h1>Your Address</h1>
-                <form action="/shop/confirm_order/" method="post">
+      </ul>
+  </xpath>
+  <xpath expr="//div[@id='products_grid_before']" position="attributes">
+      <attribute name="class">col-md-3</attribute>
+  </xpath>
+  <xpath expr="//div[@id='products_grid']" position="attributes">
+      <attribute name="class">col-md-9</attribute>
+  </xpath>
+</template>
 
-                <div class="row">
-                <div class="col-md-8 oe_mycart">
-                    <h3 class="page-header mt16">Billing Information
-                        <small t-if="user_id.id == website.public_user.id"> or
-                            <a t-if="not partner" t-attf-href="/web#action=redirect&amp;url=#{ request.httprequest.url }">sign in</a>
-                        </small>
-                    </h3>
-                        <div class="row">
-                            <div t-attf-class="form-group #{error.get('name') and 'has-error' or ''} col-lg-6">
-                                <label class="control-label" for="contact_name">Your Name</label>
-                                <input type="text" name="name" class="form-control" t-att-value="checkout.get('name')"/>
-                            </div>
-                            <div t-attf-class="form-group #{error.get('company') and 'has-error' or ''} col-lg-6">
-                                <label class="control-label" for="company" style="font-weight: normal">Your Company</label>
-                                <input type="text" name="company" class="form-control" t-att-value="checkout.get('company')"/>
-                            </div>
-                            <div t-attf-class="form-group #{error.get('email') and 'has-error' or ''} col-lg-6">
-                                <label class="control-label" for="contact_name">Email</label>
-                                <input type="email" name="email" class="form-control" t-att-value="checkout.get('email')"/>
-                            </div>
-                            <div t-attf-class="form-group #{ error.get('phone') and 'has-error' or ''} col-lg-6">
-                                <label class="control-label" for="phone">Phone</label>
-                                <input type="tel" name="phone" class="form-control" t-att-value="checkout.get('phone')"/>
-                            </div>
+<template id="products_attributes" inherit_option_id="website_sale.products" name="Product Filters and Attributes">
+  <xpath expr="//div[@id='products_grid_before']" position="inside">
+      <form t-action="/shop/filters/" method="post" t-keep-query="category,search">
+          <ul class="nav nav-pills nav-stacked mt16">
+              <t t-set="attribute_ids" t-value="Ecommerce.get_attribute_ids()"/>
+              <t t-foreach="attribute_ids" t-as="attribute_id">
+                <t t-if="attribute_id.visible">
+                  <li t-if="attribute_id.value_ids and attribute_id.type == 'distinct'">
+                      <div t-field="attribute_id.name"/>
+                      <ul class="nav nav-pills nav-stacked">
+                          <t t-foreach="attribute_id.value_ids" t-as="value_id">
+                              <li t-att-class="Ecommerce.has_search_filter(attribute_id.id, value_id.id) and 'active' or ''">
+                                  <label style="margin: 0 20px;">
+                                      <input type="checkbox" t-att-name="'att-%s-%s' % (attribute_id.id, value_id.id)"
+                                          t-att-checked="Ecommerce.has_search_filter(attribute_id.id, value_id.id) and 'checked' or ''"/>
+                                      <span style="font-weight: normal" t-field="value_id.name"/>
+                                  </label>
+                              </li>
+                          </t>
+                      </ul>
+                  </li>
+                  <li t-if="attribute_id.type == 'float' and attribute_id.float_min != attribute_id.float_max">
+                      <div t-field="attribute_id.name"/>
+                      <t t-set="attribute" t-value="Ecommerce.has_search_filter(attribute_id.id)"/>
+                      <div style="margin: 0 20px;" class="js_slider"
+                        t-att-data-id="attribute_id.id"
+                        t-att-data-value-min="attribute and attribute[1][0] or attribute_id.float_min"
+                        t-att-data-value-max="attribute and attribute[1][1] or attribute_id.float_max"
+                        t-att-data-min="attribute_id.float_min"
+                        t-att-data-max="attribute_id.float_max"></div>
+                  </li>
+                </t>
+              </t>
+          </ul>
+          <button class="btn btn-xs btn-primary mt16">Apply filter</button>
+          <a t-href="/shop/" t-keep-query="category,search" class="btn btn-xs btn-default mt16">Cancel filter</a>
+      </form>
+  </xpath>
+  <xpath expr="//div[@id='products_grid_before']" position="attributes">
+      <attribute name="class">col-md-3</attribute>
+  </xpath>
+  <xpath expr="//div[@id='products_grid']" position="attributes">
+      <attribute name="class">col-md-9</attribute>
+  </xpath>
+</template>
 
-                            <div t-attf-class="form-group #{error.get('street') and 'has-error' or ''} col-lg-6">
-                                <label class="control-label" for="street">Street</label>
-                                <input type="text" name="street" class="form-control" t-att-value="checkout.get('street')"/>
-                            </div>
-                            <div class="clearfix"/>
+<template id="suggested_products_list" inherit_id="website_sale.mycart" inherit_option_id="website_sale.mycart" name="Suggested Products in my cart">
+  <xpath expr="//table[@id='mycart_products']" position="after">
+      <table t-if="suggested_products" class='table table-striped table-condensed'>
+          <colgroup>
+              <col width="80"/>
+              <col/>
+              <col width="100"/>
+              <col width="120"/>
+          </colgroup>
+          <thead>
+              <tr>
+                  <th colspan="2">Suggested products</th>
+              </tr>
+          </thead>
+          <tbody>
+              <tr t-foreach="suggested_products" t-as="product">
 
-                            <div t-attf-class="form-group #{error.get('city') and 'has-error' or ''} col-lg-6">
-                                <label class="control-label" for="city">City</label>
-                                <input type="text" name="city" class="form-control" t-att-value="checkout.get('city')"/>
-                            </div>
-                            <div t-attf-class="form-group #{error.get('zip') and 'has-error' or ''} col-lg-6">
-                                <label class="control-label" for="zip">Zip / Postal Code</label>
-                                <input type="text" name="zip" class="form-control" t-att-value="checkout.get('zip')"/>
-                            </div>
-                            <div t-attf-class="form-group #{error.get('state_id') and 'has-error' or ''} col-lg-6">
-                                <label class="control-label" for="state_id" style="font-weight: normal">State / Province</label>
-                                <select name="state_id" class="form-control">
-                                    <option value="">select...</option>
-                                    <t t-foreach="states or []" t-as="state">
-                                        <option t-att-value="state.id" t-att-selected="state.id == checkout.get('state_id')"><t t-esc="state.name"/></option>
-                                    </t>
-                                </select>
-                            </div>
-                            <div t-attf-class="form-group #{error.get('country_id') and 'has-error' or ''} col-lg-6">
-                                <label class="control-label" for="contact_name">Country</label>
-                                <select name="country_id" class="form-control">
-                                    <option value="">Country...</option>
-                                    <t t-foreach="countries or []" t-as="country">
-                                        <option t-att-value="country.id" t-att-selected="country.id == checkout.get('country_id')"><t t-esc="country.name"/></option>
-                                    </t>
-                                </select>
-                            </div>
-
-                            <div class="clearfix"/>
-
-                            <div class="form-group col-lg-6">
-                                <label>
-                                    <input t-if="not shipping" type="checkbox" name="shipping_different"/>
-                                    <input t-if="shipping" type="checkbox" name="shipping_different" checked="1"/>
-                                    Ship to a different address
-                                </label>
-                            </div>
-                        </div>
-
-                        <div class="js_shipping row mb16" t-att-style="not shipping and 'display:none' or ''">
-                            <h3 class="oe_shipping col-lg-12 mt16">Shipping Information</h3>
-
-                            <div t-attf-class="form-group #{error.get('shipping_name') and 'has-error' or ''} col-lg-6">
-                                <label class="control-label" for="contact_name">Name (Shipping)</label>
-                                <input type="text" name="shipping_name" class="form-control" t-att-value="checkout.get('shipping_name', '')"/>
-                            </div>
-                            <div t-attf-class="form-group #{error.get('shipping_phone') and 'has-error' or ''} col-lg-6">
-                                <label class="control-label" for="contact_name">Phone</label>
-                                <input type="tel" name="shipping_phone" class="form-control" t-att-value="checkout.get('shipping_phone', '')"/>
-                            </div>
-                            <div t-attf-class="form-group #{error.get('shipping_street') and 'has-error' or ''} col-lg-6">
-                                <label class="control-label" for="contact_name">Street</label>
-                                <input type="text" name="shipping_street" class="form-control" t-att-value="checkout.get('shipping_street', '')"/>
-                            </div>
-                            <div class="clearfix"/>
-                            <div t-attf-class="form-group #{error.get('shipping_city') and 'has-error' or ''} col-lg-6">
-                                <label class="control-label" for="contact_name">City</label>
-                                <input type="text" name="shipping_city" class="form-control" t-att-value="checkout.get('shipping_city', '')"/>
-                            </div>
-                            <div t-attf-class="form-group #{error.get('shipping_zip') and 'has-error' or ''} col-lg-6">
-                                <label class="control-label" for="contact_name">Zip / Postal Code</label>
-                                <input type="text" name="shipping_zip" class="form-control" t-att-value="checkout.get('shipping_zip', '')"/>
-                            </div>
-                            <div t-attf-class="form-group #{error.get('shipping_state_id') and 'has-error' or ''} col-lg-6">
-                                <label class="control-label" for="contact_name" style="font-weight: normal">State / Province</label>
-                                <select name="shipping_state_id" class="form-control">
-                                    <option value="">State / Province...</option>
-                                    <t t-foreach="states or []" t-as="state">
-                                        <option t-att-value="state.id" t-att-selected="state.id == checkout.get('shipping_state_id')"><t t-esc="state.name"/></option>
-                                    </t>
-                                </select>
-                            </div>
-                            <div t-attf-class="form-group #{error.get('shipping_country_id') and 'has-error' or ''} col-lg-6">
-                                <label class="control-label" for="contact_name">Country</label>
-                                <select name="shipping_country_id" class="form-control">
-                                    <option value="">Country...</option>
-                                    <t t-foreach="countries or []" t-as="country">
-                                        <option t-att-value="country.id" t-att-selected="country.id == checkout.get('shipping_country_id')"><t t-esc="country.name"/></option>
-                                    </t>
-                                </select>
-                            </div>
-                        </div>
-                        <button type="submit" class="btn btn-default btn-primary pull-right mb32">Confirm <span class="fa fa-long-arrow-right"/></button>
-                </div>
-                <div class="col-lg-offset-1 col-lg-3 text-muted">
-                    <h3 class="page-header mt16">Your Order <small><a href="/shop/mycart"><span class="fa fa-arrow-right"/> change</a></small></h3>
-                    <div class="row">
-                        <div class="col-sm-6 text-right">Subtotal:</div>
-                        <div class="col-sm-6"><span t-esc="website_sale_order.amount_untaxed" t-field-options='{
-                            "widget": "monetary",
-                            "display_currency": "website.pricelist_id.currency_id"
-                        }'/></div>
-                        <div class="col-sm-6 text-right">Taxes:</div>
-                        <div class="col-sm-6"><span t-field="website_sale_order.amount_tax" t-field-options='{
-                            "widget": "monetary",
-                            "display_currency": "website.pricelist_id.currency_id"
-                        }'/></div>
-                        <div class="col-sm-6 text-right"><h4>Total To Pay:</h4></div>
-                        <div class="col-sm-6"><h4><span t-field="website_sale_order.amount_total" t-field-options='{
-                            "widget": "monetary",
-                            "display_currency": "website.pricelist_id.currency_id"
-                        }'/></h4></div>
-                    </div>
-                </div>
-            </div>
-            </form>
-          </div>
-          </div>
-        </t>
-    </template>
-
-    <template id="payment">
-        <t t-call="website.layout">
-            <t t-set="head">
-                <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
-                <script type="text/javascript" src="/website_sale/static/src/js/website_sale_payment.js"></script>
-                <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
-                <t t-raw="head or ''"/>
-            </t>
-            <t t-set="additional_title">Shop - Select Payment Mode</t>
-            <div id="wrap">
-              <div class="container oe_website_sale">
-
-                <ul class="wizard pull-right">
-                    <li><a href="/shop/mycart" class="text-success">Review Order<span class="chevron"></span></a></li>
-                    <li><a href="/shop/checkout" class="text-success">Shipping &amp; Billing<span class="chevron"></span></a></li>
-                    <li class="text-primary">Payment<span class="chevron"></span></li>
-                    <li class="text-muted">Confirmation<span class="chevron"></span></li>
-                </ul>
-                <h1 class="mb32">Validate Order</h1>
-                <div class="row">
-                <div class="col-lg-8 col-sm-9 oe_mycart">
-                    <table class='table table-striped table-condensed' id="mycart_products" t-if="website_sale_order and website_sale_order.order_line">
-                        <colgroup>
-                            <col width="80"/>
-                            <col/>
-                            <col width="100"/>
-                            <col width="120"/>
-                        </colgroup>
-                        <thead>
-                            <tr>
-                                <th colspan="2">Product</th>
-                                <th>Price</th>
-                                <th>Quantity</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <tr t-foreach="website_sale_order.order_line" t-as="line">
-                                <td colspan="2" t-if="not line.product_id.product_tmpl_id"></td>
-                                <td t-if="line.product_id.product_tmpl_id">
-                                    <a t-href="/shop/product/#{ slug(line.product_id.product_tmpl_id) }/">
-                                        <span t-field="line.product_id.image_small"
-                                              t-field-options='{"widget": "image", "class": "img-rounded"}'/>
-                                    </a>
-                                </td>
-                                <td t-if="line.product_id.product_tmpl_id">
-                                   <strong t-field="line.product_id.name"/>
-                                </td>
-                                <td class="text-center">
-                                   <span t-field="line.price_unit" t-field-options='{
-                                       "widget": "monetary",
-                                       "display_currency": "website.pricelist_id.currency_id"
-                                   }'/>
-                                </td>
-                                <td>
-                                   <div t-esc="line.product_uom_qty"/>
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <table class='pull-right mb16' id="mycart_total">
-                        <colgroup>
-                            <col width="100"/>
-                            <col width="120"/>
-                        </colgroup>
-                        <thead>
-                            <tr style="border-top: 1px solid #000">
-                                <th><h3>Total:</h3></th>
-                                <th class="text-right"><h3><span t-field="website_sale_order.amount_total" t-field-options='{
-                                    "widget": "monetary",
-                                    "display_currency": "website.pricelist_id.currency_id"
-                                }'/></h3></th>
-                            </tr>
-                            <tr class="text-muted">
-                                <td>Taxes:</td>
-                                <td class="text-right"><span t-field="website_sale_order.amount_tax" t-field-options='{
-                                    "widget": "monetary",
-                                    "display_currency": "website.pricelist_id.currency_id"
-                                }'/></td>
-                            </tr>
-                        </thead>
-                    </table>
-                    <div class="clearfix"/>
-                    <div class="oe_structure"/>
-                  </div>
-                  <div class="col-lg-3 col-lg-offset-1 col-sm-3 text-muted" id="right_column">
-                      <h4>Bill To:</h4>
-                      <div t-field="website_sale_order.partner_invoice_id"/>
+                  <td>
+                      <a t-href="/shop/product/#{ slug(product.product_tmpl_id) }/">
+                          <span t-field="product.image_small"
+                                t-field-options='{"widget": "image", "class": "img-rounded"}'/>
+                      </a>
+                  </td>
+                  <td>
                       <div>
-                        <a href="/shop/checkout"><span class="fa fa-arrow-right"/> Change Address</a>
+                          <a t-href="/shop/product/#{ slug(product.product_tmpl_id) }/">
+                              <strong t-field="product.name"/>
+                          </a>
+                      </div>
+                      <div class="text-muted" t-field="product.description_sale"/>
+                  </td>
+                  <td>
+                      <span t-field="product.lst_price" t-field-options='{
+                          "widget": "monetary",
+                          "display_currency": "website.pricelist_id.currency_id"
+                      }'/>
+                  </td>
+                  <td class="text-center">
+                      <a t-href="./add_cart/#{ product.id }/"><strong>Add to Cart</strong></a>
+                  </td>
+              </tr>
+          </tbody>
+      </table>
+  </xpath>
+</template>
+
+<template id="reduction_code" inherit_option_id="website_sale.mycart" name="Reduction Code">
+  <xpath expr="//div[@id='right_column']" position="inside">
+      <h4>Coupon Code</h4>
+      <p>
+          Have a coupon code? Fill in this field and apply.
+      </p>
+      <form t-if="website_sale_order and website_sale_order.order_line" action="/shop/mycart/" method="post" class="mb32">
+          <div class="input-group">
+              <input name="promo" class='form-control' type="text" placeholder="code..." t-att-value="website_sale_order.pricelist_id.code or ''"/>
+              <div class="input-group-btn">
+                  <button class="btn btn-default">Apply</button>
+              </div>
+          </div>
+      </form>
+  </xpath>
+</template>
+
+
+<!-- Page confirm my cart -->
+
+<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>
+        <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
+        <t t-raw="head or ''"/>
+    </t>
+    <t t-set="additional_title">Shop - Checkout</t>
+    <div id="wrap">
+      <div class="container oe_website_sale">
+          <ul class="wizard pull-right">
+              <li><a href="/shop/mycart" class="text-success">Review Order<span class="chevron"></span></a></li>
+              <li class="text-primary">Shipping &amp; Billing<span class="chevron"></span></li>
+              <li class="text-muted">Payment<span class="chevron"></span></li>
+              <li class="text-muted">Confirmation<span class="chevron"></span></li>
+          </ul>
+          <h1>Your Address</h1>
+          <form action="/shop/confirm_order/" method="post">
+
+          <div class="row">
+          <div class="col-md-8 oe_mycart">
+              <h3 class="page-header mt16">Billing Information
+                  <small t-if="user_id.id == website.public_user.id"> or
+                      <a t-if="not partner" t-attf-href="/web#action=redirect&amp;url=#{ request.httprequest.url }">sign in</a>
+                  </small>
+              </h3>
+                  <div class="row">
+                      <div t-attf-class="form-group #{error.get('name') and 'has-error' or ''} col-lg-6">
+                          <label class="control-label" for="contact_name">Your Name</label>
+                          <input type="text" name="name" class="form-control" t-att-value="checkout.get('name')"/>
+                      </div>
+                      <div t-attf-class="form-group #{error.get('company') and 'has-error' or ''} col-lg-6">
+                          <label class="control-label" for="company" style="font-weight: normal">Your Company</label>
+                          <input type="text" name="company" class="form-control" t-att-value="checkout.get('company')"/>
+                      </div>
+                      <div t-attf-class="form-group #{error.get('email') and 'has-error' or ''} col-lg-6">
+                          <label class="control-label" for="contact_name">Email</label>
+                          <input type="email" name="email" class="form-control" t-att-value="checkout.get('email')"/>
+                      </div>
+                      <div t-attf-class="form-group #{ error.get('phone') and 'has-error' or ''} col-lg-6">
+                          <label class="control-label" for="phone">Phone</label>
+                          <input type="tel" name="phone" class="form-control" t-att-value="checkout.get('phone')"/>
                       </div>
 
-                      <h4 class="mt32">Ship To:</h4>
-                      <div t-field="website_sale_order.partner_shipping_id"/>
-                      <div>
-                        <a href="/shop/checkout"><span class="fa fa-arrow-right"/> Change Address</a>
+                      <div t-attf-class="form-group #{error.get('street') and 'has-error' or ''} col-lg-6">
+                          <label class="control-label" for="street">Street</label>
+                          <input type="text" name="street" class="form-control" t-att-value="checkout.get('street')"/>
+                      </div>
+                      <div class="clearfix"/>
+
+                      <div t-attf-class="form-group #{error.get('city') and 'has-error' or ''} col-lg-6">
+                          <label class="control-label" for="city">City</label>
+                          <input type="text" name="city" class="form-control" t-att-value="checkout.get('city')"/>
+                      </div>
+                      <div t-attf-class="form-group #{error.get('zip') and 'has-error' or ''} col-lg-6">
+                          <label class="control-label" for="zip">Zip / Postal Code</label>
+                          <input type="text" name="zip" class="form-control" t-att-value="checkout.get('zip')"/>
+                      </div>
+                      <div t-attf-class="form-group #{error.get('state_id') and 'has-error' or ''} col-lg-6">
+                          <label class="control-label" for="state_id" style="font-weight: normal">State / Province</label>
+                          <select name="state_id" class="form-control">
+                              <option value="">select...</option>
+                              <t t-foreach="states or []" t-as="state">
+                                  <option t-att-value="state.id" t-att-selected="state.id == checkout.get('state_id')"><t t-esc="state.name"/></option>
+                              </t>
+                          </select>
+                      </div>
+                      <div t-attf-class="form-group #{error.get('country_id') and 'has-error' or ''} col-lg-6">
+                          <label class="control-label" for="contact_name">Country</label>
+                          <select name="country_id" class="form-control">
+                              <option value="">Country...</option>
+                              <t t-foreach="countries or []" t-as="country">
+                                  <option t-att-value="country.id" t-att-selected="country.id == checkout.get('country_id')"><t t-esc="country.name"/></option>
+                              </t>
+                          </select>
                       </div>
 
+                      <div class="clearfix"/>
+
+                      <div class="form-group col-lg-6">
+                          <label>
+                              <input t-if="not shipping" type="checkbox" name="shipping_different"/>
+                              <input t-if="shipping" type="checkbox" name="shipping_different" checked="1"/>
+                              Ship to a different address
+                          </label>
+                      </div>
                   </div>
-                </div>
 
-                <div class="js_payment mb64" t-if="acquirers" id="payment_method">
-                    <h3>Choose your payment method</h3>
-                    <div class="col-lg-5 col-sm-6">
-                        <t t-foreach="acquirers or []" t-as="acquirer">
-                            <label t-if="acquirer.button" class="oe_sale_acquirer_logo" style="display: block;">
-                                <input t-att-value="acquirer.id" type="radio" name="acquirer"/>
-                                <img class="media-object" style="width: 60px; display: inline-block;"
-                                    t-att-title="acquirer.name"
-                                    t-att-src="'/payment_acquirer_%s/static/src/img/%s_icon.png' % (acquirer.name, acquirer.name)"/>
-                            </label>
-                        </t>
-                    </div>
-                    <div class="col-lg-3 col-sm-3">
-                        <t t-foreach="acquirers or []" t-as="acquirer">
-                            <div t-att-data-id="acquirer.id" t-raw="acquirer.button" class="oe_sale_acquirer_button hidden"/>
-                        </t>
-                    </div>
-                </div>
+                  <div class="js_shipping row mb16" t-att-style="not shipping and 'display:none' or ''">
+                      <h3 class="oe_shipping col-lg-12 mt16">Shipping Information</h3>
 
+                      <div t-attf-class="form-group #{error.get('shipping_name') and 'has-error' or ''} col-lg-6">
+                          <label class="control-label" for="contact_name">Name (Shipping)</label>
+                          <input type="text" name="shipping_name" class="form-control" t-att-value="checkout.get('shipping_name', '')"/>
+                      </div>
+                      <div t-attf-class="form-group #{error.get('shipping_phone') and 'has-error' or ''} col-lg-6">
+                          <label class="control-label" for="contact_name">Phone</label>
+                          <input type="tel" name="shipping_phone" class="form-control" t-att-value="checkout.get('shipping_phone', '')"/>
+                      </div>
+                      <div t-attf-class="form-group #{error.get('shipping_street') and 'has-error' or ''} col-lg-6">
+                          <label class="control-label" for="contact_name">Street</label>
+                          <input type="text" name="shipping_street" class="form-control" t-att-value="checkout.get('shipping_street', '')"/>
+                      </div>
+                      <div class="clearfix"/>
+                      <div t-attf-class="form-group #{error.get('shipping_city') and 'has-error' or ''} col-lg-6">
+                          <label class="control-label" for="contact_name">City</label>
+                          <input type="text" name="shipping_city" class="form-control" t-att-value="checkout.get('shipping_city', '')"/>
+                      </div>
+                      <div t-attf-class="form-group #{error.get('shipping_zip') and 'has-error' or ''} col-lg-6">
+                          <label class="control-label" for="contact_name">Zip / Postal Code</label>
+                          <input type="text" name="shipping_zip" class="form-control" t-att-value="checkout.get('shipping_zip', '')"/>
+                      </div>
+                      <div t-attf-class="form-group #{error.get('shipping_state_id') and 'has-error' or ''} col-lg-6">
+                          <label class="control-label" for="contact_name" style="font-weight: normal">State / Province</label>
+                          <select name="shipping_state_id" class="form-control">
+                              <option value="">State / Province...</option>
+                              <t t-foreach="states or []" t-as="state">
+                                  <option t-att-value="state.id" t-att-selected="state.id == checkout.get('shipping_state_id')"><t t-esc="state.name"/></option>
+                              </t>
+                          </select>
+                      </div>
+                      <div t-attf-class="form-group #{error.get('shipping_country_id') and 'has-error' or ''} col-lg-6">
+                          <label class="control-label" for="contact_name">Country</label>
+                          <select name="shipping_country_id" class="form-control">
+                              <option value="">Country...</option>
+                              <t t-foreach="countries or []" t-as="country">
+                                  <option t-att-value="country.id" t-att-selected="country.id == checkout.get('shipping_country_id')"><t t-esc="country.name"/></option>
+                              </t>
+                          </select>
+                      </div>
+                  </div>
+                  <button type="submit" class="btn btn-default btn-primary pull-right mb32">Confirm <span class="fa fa-long-arrow-right"/></button>
+          </div>
+          <div class="col-lg-offset-1 col-lg-3 text-muted">
+              <h3 class="page-header mt16">Your Order <small><a href="/shop/mycart"><span class="fa fa-arrow-right"/> change</a></small></h3>
+              <div class="row">
+                  <div class="col-sm-6 text-right">Subtotal:</div>
+                  <div class="col-sm-6"><span t-esc="website_sale_order.amount_untaxed" t-field-options='{
+                      "widget": "monetary",
+                      "display_currency": "website.pricelist_id.currency_id"
+                  }'/></div>
+                  <div class="col-sm-6 text-right">Taxes:</div>
+                  <div class="col-sm-6"><span t-field="website_sale_order.amount_tax" t-field-options='{
+                      "widget": "monetary",
+                      "display_currency": "website.pricelist_id.currency_id"
+                  }'/></div>
+                  <div class="col-sm-6 text-right"><h4>Total To Pay:</h4></div>
+                  <div class="col-sm-6"><h4><span t-field="website_sale_order.amount_total" t-field-options='{
+                      "widget": "monetary",
+                      "display_currency": "website.pricelist_id.currency_id"
+                  }'/></h4></div>
               </div>
+          </div>
+      </div>
+      </form>
+    </div>
+    </div>
+  </t>
+</template>
+
+<template id="payment">
+  <t t-call="website.layout">
+      <t t-set="head">
+          <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
+          <script type="text/javascript" src="/website_sale/static/src/js/website_sale_payment.js"></script>
+          <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
+          <t t-raw="head or ''"/>
+      </t>
+      <t t-set="additional_title">Shop - Select Payment Mode</t>
+      <div id="wrap">
+        <div class="container oe_website_sale">
+
+          <ul class="wizard pull-right">
+              <li><a href="/shop/mycart" class="text-success">Review Order<span class="chevron"></span></a></li>
+              <li><a href="/shop/checkout" class="text-success">Shipping &amp; Billing<span class="chevron"></span></a></li>
+              <li class="text-primary">Payment<span class="chevron"></span></li>
+              <li class="text-muted">Confirmation<span class="chevron"></span></li>
+          </ul>
+          <h1 class="mb32">Validate Order</h1>
+          <div class="row">
+          <div class="col-lg-8 col-sm-9 oe_mycart">
+              <table class='table table-striped table-condensed' id="mycart_products" t-if="website_sale_order and website_sale_order.order_line">
+                  <colgroup>
+                      <col width="80"/>
+                      <col/>
+                      <col width="100"/>
+                      <col width="120"/>
+                  </colgroup>
+                  <thead>
+                      <tr>
+                          <th colspan="2">Product</th>
+                          <th>Price</th>
+                          <th>Quantity</th>
+                      </tr>
+                  </thead>
+                  <tbody>
+                      <tr t-foreach="website_sale_order.order_line" t-as="line">
+                          <td colspan="2" t-if="not line.product_id.product_tmpl_id"></td>
+                          <td t-if="line.product_id.product_tmpl_id">
+                              <a t-href="/shop/product/#{ slug(line.product_id.product_tmpl_id) }/">
+                                  <span t-field="line.product_id.image_small"
+                                        t-field-options='{"widget": "image", "class": "img-rounded"}'/>
+                              </a>
+                          </td>
+                          <td t-if="line.product_id.product_tmpl_id">
+                             <strong t-field="line.product_id.name"/>
+                          </td>
+                          <td class="text-center">
+                             <span t-field="line.price_unit" t-field-options='{
+                                 "widget": "monetary",
+                                 "display_currency": "website.pricelist_id.currency_id"
+                             }'/>
+                          </td>
+                          <td>
+                             <div t-esc="line.product_uom_qty"/>
+                          </td>
+                      </tr>
+                  </tbody>
+              </table>
+              <table class='pull-right mb16' id="mycart_total">
+                  <colgroup>
+                      <col width="100"/>
+                      <col width="120"/>
+                  </colgroup>
+                  <thead>
+                      <tr style="border-top: 1px solid #000">
+                          <th><h3>Total:</h3></th>
+                          <th class="text-right"><h3><span t-field="website_sale_order.amount_total" t-field-options='{
+                              "widget": "monetary",
+                              "display_currency": "website.pricelist_id.currency_id"
+                          }'/></h3></th>
+                      </tr>
+                      <tr class="text-muted">
+                          <td>Taxes:</td>
+                          <td class="text-right"><span t-field="website_sale_order.amount_tax" t-field-options='{
+                              "widget": "monetary",
+                              "display_currency": "website.pricelist_id.currency_id"
+                          }'/></td>
+                      </tr>
+                  </thead>
+              </table>
+              <div class="clearfix"/>
               <div class="oe_structure"/>
             </div>
-
-        </t>
-    </template>
-
-    <template id="confirmation">
-        <t t-call="website.layout">
-            <t t-set="head">
-                <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
-                <script type="text/javascript" src="/website_sale/static/src/js/website_sale_validate.js"></script>
-                <t t-raw="head or ''"/>
-            </t>
-            <t t-set="additional_title">Shop - Confirmed</t>
-            <div id="wrap">
-              <div class="container oe_website_sale">
-
-                <ul class="wizard pull-right">
-                    <li class="text-muted">Review Order<span class="chevron"></span></li>
-                    <li class="text-muted">Shipping &amp; Billing<span class="chevron"></span></li>
-                    <li class="text-muted">Payment<span class="chevron"></span></li>
-                    <li class="text-primary">Confirmation<span class="chevron"></span></li>
-                </ul>
-                <h1 class="mb32">Order Confirmed</h1>
-                <div class="row">
-                    <div class="col-md-8 oe_mycart">
-                        <h2>Thank you for your order.</h2>
-                        <div class="oe_website_sale_tx_status" t-att-data-order-id="order.id">
-                        </div>
-                        <div class="clearfix"/>
-                        <div class="oe_structure"/>
-                    </div>
-                    <div class="col-md-3 col-md-offset-1 text-muted" id="right_column">
-                        <h4>Bill To:</h4>
-                        <div t-field="order.partner_invoice_id"/>
-
-                        <h4 class="mt32">Ship To:</h4>
-                        <div t-field="order.partner_shipping_id"/>
-
-                        <h4 class="mt32">Amount:</h4>
-                        <!--<div t-field="order.amount_total" t-field-options='{
-                            "widget": "monetary",
-                            "display_currency": "website.pricelist_id.currency_id"
-                        }'/> -->
-                    </div>
+            <div class="col-lg-3 col-lg-offset-1 col-sm-3 text-muted" id="right_column">
+                <h4>Bill To:</h4>
+                <div t-field="website_sale_order.partner_invoice_id"/>
+                <div>
+                  <a href="/shop/checkout"><span class="fa fa-arrow-right"/> Change Address</a>
+                </div>
+
+                <h4 class="mt32">Ship To:</h4>
+                <div t-field="website_sale_order.partner_shipping_id"/>
+                <div>
+                  <a href="/shop/checkout"><span class="fa fa-arrow-right"/> Change Address</a>
                 </div>
 
-              </div>
-              <div class="oe_structure"/>
             </div>
+          </div>
 
-        </t>
-    </template>
+          <div class="js_payment mb64" t-if="acquirers" id="payment_method">
+              <h3>Choose your payment method</h3>
+              <div class="col-lg-5 col-sm-6">
+                  <t t-foreach="acquirers or []" t-as="acquirer">
+                      <label t-if="acquirer.button" class="oe_sale_acquirer_logo" style="display: block;">
+                          <input t-att-value="acquirer.id" type="radio" name="acquirer"/>
+                          <img class="media-object" style="width: 60px; display: inline-block;"
+                              t-att-title="acquirer.name"
+                              t-att-src="'/payment_acquirer_%s/static/src/img/%s_icon.png' % (acquirer.name, acquirer.name)"/>
+                      </label>
+                  </t>
+              </div>
+              <div class="col-lg-3 col-sm-3">
+                  <t t-foreach="acquirers or []" t-as="acquirer">
+                      <div t-att-data-id="acquirer.id" t-raw="acquirer.button" class="oe_sale_acquirer_button hidden"/>
+                  </t>
+              </div>
+          </div>
 
-    <template id="total">
-      <span t-field="website_sale_order.amount_total" t-field-options='{
-          "widget": "monetary",
-          "display_currency": "website.pricelist_id.currency_id"
-        }'/>
-    </template>
- </data>
+        </div>
+        <div class="oe_structure"/>
+      </div>
+
+  </t>
+</template>
+
+<template id="confirmation">
+  <t t-call="website.layout">
+      <t t-set="head">
+          <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
+          <script type="text/javascript" src="/website_sale/static/src/js/website_sale_validate.js"></script>
+          <t t-raw="head or ''"/>
+      </t>
+      <t t-set="additional_title">Shop - Confirmed</t>
+      <div id="wrap">
+        <div class="container oe_website_sale">
+
+          <ul class="wizard pull-right">
+              <li class="text-muted">Review Order<span class="chevron"></span></li>
+              <li class="text-muted">Shipping &amp; Billing<span class="chevron"></span></li>
+              <li class="text-muted">Payment<span class="chevron"></span></li>
+              <li class="text-primary">Confirmation<span class="chevron"></span></li>
+          </ul>
+          <h1 class="mb32">Order Confirmed</h1>
+          <div class="row">
+              <div class="col-md-8 oe_mycart">
+                  <h2>Thank you for your order.</h2>
+                  <div class="oe_website_sale_tx_status" t-att-data-order-id="order.id">
+                  </div>
+                  <div class="clearfix"/>
+                  <div class="oe_structure"/>
+              </div>
+              <div class="col-md-3 col-md-offset-1 text-muted" id="right_column">
+                  <h4>Bill To:</h4>
+                  <div t-field="order.partner_invoice_id"/>
+
+                  <h4 class="mt32">Ship To:</h4>
+                  <div t-field="order.partner_shipping_id"/>
+
+                  <h4 class="mt32">Amount:</h4>
+                  <!--<div t-field="order.amount_total" t-field-options='{
+                      "widget": "monetary",
+                      "display_currency": "website.pricelist_id.currency_id"
+                  }'/> -->
+              </div>
+          </div>
+
+        </div>
+        <div class="oe_structure"/>
+      </div>
+
+  </t>
+</template>
+
+<template id="total">
+<span t-field="website_sale_order.amount_total" t-field-options='{
+    "widget": "monetary",
+    "display_currency": "website.pricelist_id.currency_id"
+  }'/>
+</template>
+</data>
 </openerp>

From 730fdb904df4e4ab1d0743a794c5848fdfd2b8a7 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 12 Dec 2013 12:06:26 +0100
Subject: [PATCH 3/3] [FIX] website_sale: css

bzr revid: chm@openerp.com-20131212110626-5kj461y6erg5ddhq
---
 .../static/src/css/website_sale.css           |  6 ++--
 .../static/src/css/website_sale.sass          | 35 +++++++++----------
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/addons/website_sale/static/src/css/website_sale.css b/addons/website_sale/static/src/css/website_sale.css
index 38b1339f592..15047ab7271 100644
--- a/addons/website_sale/static/src/css/website_sale.css
+++ b/addons/website_sale/static/src/css/website_sale.css
@@ -64,8 +64,7 @@
   top: 15px;
   bottom: 50px;
 }
-
-.oe_product_description {
+.oe_product .oe_product_description {
   bottom: 0;
   position: absolute;
   left: 15px;
@@ -75,8 +74,7 @@
   overflow: hidden;
   padding-bottom: 24px;
 }
-
-.product_price {
+.oe_product .product_price {
   position: absolute;
   right: 15px;
   left: 15px;
diff --git a/addons/website_sale/static/src/css/website_sale.sass b/addons/website_sale/static/src/css/website_sale.sass
index ac42e10267e..5b2892a6035 100644
--- a/addons/website_sale/static/src/css/website_sale.sass
+++ b/addons/website_sale/static/src/css/website_sale.sass
@@ -57,24 +57,23 @@
         right: 15px
         top: 15px
         bottom: 50px
-
-.oe_product_description
-    bottom: 0
-    position: absolute
-    left: 15px
-    right: 15px
-    border-top: 1px solid #dddddd
-    max-height: 120px
-    overflow: hidden
-    padding-bottom: 24px
-.product_price
-    position: absolute
-    right: 15px
-    left: 15px
-    bottom: 0
-    z-index: 6
-    background: rgba(255,255,255,0.6)
-    padding: 5px 0
+    .oe_product_description
+        bottom: 0
+        position: absolute
+        left: 15px
+        right: 15px
+        border-top: 1px solid #dddddd
+        max-height: 120px
+        overflow: hidden
+        padding-bottom: 24px
+    .product_price
+        position: absolute
+        right: 15px
+        left: 15px
+        bottom: 0
+        z-index: 6
+        background: rgba(255,255,255,0.6)
+        padding: 5px 0
 
 .oe_mycart
     .input-group-addon