From 596c38e7d7128a0cd437a6fd7d2d36b56c9e9dd3 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 22 Jul 2013 13:08:36 +0200
Subject: [PATCH] [IMP] Use <template> helper for qweb views

bzr revid: fme@openerp.com-20130722110836-w2el03tn5asm9ixm
---
 addons/website/views/views.xml           |  70 ++++----------
 addons/website_crm/views/website_crm.xml |  10 +-
 addons/website_sale/views/ecommerce.xml  | 112 +++++------------------
 3 files changed, 42 insertions(+), 150 deletions(-)

diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index bb4205ea08b..872a5e07549 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -3,10 +3,7 @@
 -->
 <openerp>
     <data>
-        <record id="header" model="ir.ui.view">
-            <field name="name">header</field>
-            <field name="type">qweb</field>
-            <field name="arch" type="xml">
+        <template id="header">
                 <div class="container">
                     <div class="row">
                         <div class="oe_website_logo span4">
@@ -18,13 +15,9 @@
                         </ul>
                     </div>
                 </div>
-            </field>
-        </record>
+        </template>
 
-        <record id="footer" model="ir.ui.view">
-            <field name="name">footer</field>
-            <field name="type">qweb</field>
-            <field name="arch" type="xml">
+        <template id="footer">
                 <div class="container">
                     <div class="row">
                         <div class="span4">
@@ -54,14 +47,9 @@
                         </div>
                     </div>
                 </div>
-            </field>
-        </record>
+        </template>
 
-        <record id="layout" model="ir.ui.view">
-            <field name="name">layout</field>
-            <field name="type">qweb</field>
-            <field name="arch" type="xml">
-                <t t-name="website.layout">
+        <template id="layout">
                 &lt;!DOCTYPE html&gt;
                 <html>
                     <head>
@@ -200,16 +188,10 @@
 
                     </body>
                 </html>
-                </t>
-            </field>
-        </record>
+        </template>
 
-        <record id="homepage" model="ir.ui.view">
-            <field name="name">homepage</field>
-            <field name="type">qweb</field>
-            <field name="arch" type="xml">
-                <t t-name="website.homepage">
-                <t t-call="website.layout">
+        <template id="homepage">
+            <t t-call="website.layout">
                 <div>
                     <section class="oe_container">
                         <div class="oe_row oe_spaced oe_dark">
@@ -254,16 +236,10 @@
                         </div>
                     </div>
                 </div>
-                </t>
-                </t>
-            </field>
-        </record>
+            </t>
+        </template>
 
-        <record id="default_page" model="ir.ui.view">
-            <field name="name">New Page</field>
-            <field name="type">qweb</field>
-            <field name="arch" type="xml">
-                <t t-name="website.default_page">
+        <template id="default_page">
                 <t t-call="website.layout">
                     <div class="container">
                         <div class="row">
@@ -274,16 +250,10 @@
                         </div>
                     </div>
                 </t>
-                </t>
-            </field>
-        </record>
+        </template>
 
 
-        <record id="404" model="ir.ui.view">
-            <field name="name">Page not found</field>
-            <field name="type">qweb</field>
-            <field name="arch" type="xml">
-                <t t-name="website.404">
+        <template id="404">
                 <t t-call="website.layout">
                     <div class="container">
                         <div class="row">
@@ -312,15 +282,9 @@
                         </div>
                     </div>
                 </t>
-                </t>
-            </field>
-        </record>
+        </template>
 
-        <record id="contactus" model="ir.ui.view">
-            <field name="name">contactus</field>
-            <field name="type">qweb</field>
-            <field name="arch" type="xml">
-                <t t-name="website.contactus">
+        <template id="contactus">
                 <t t-call="website.layout">
                     <t t-set="title">Contact us - <t t-esc="res_company.name"/></t>
                     <div class="container">
@@ -353,9 +317,7 @@
                         </div>
                     </div>
                 </t>
-                </t>
-            </field>
-        </record>
+        </template>
 
      </data>
 </openerp>
diff --git a/addons/website_crm/views/website_crm.xml b/addons/website_crm/views/website_crm.xml
index 88529af4192..9f33bc5d865 100644
--- a/addons/website_crm/views/website_crm.xml
+++ b/addons/website_crm/views/website_crm.xml
@@ -19,11 +19,7 @@
             </field>
         </record>
 
-        <record id="thanks" model="ir.ui.view">
-            <field name="name">thanks</field>
-            <field name="type">qweb</field>
-            <field name="arch" type="xml">
-                <t t-name="website_crm.thanks">
+        <template id="thanks">
                 <t t-call="website.layout">
                     <t t-set="title">Thank You!</t>
                     <div class="container">
@@ -32,8 +28,6 @@
                         </div>
                     </div>
                 </t>
-                </t>
-            </field>
-        </record>
+        </template>
      </data>
 </openerp>
diff --git a/addons/website_sale/views/ecommerce.xml b/addons/website_sale/views/ecommerce.xml
index 313b29be6a0..3582aa5024e 100644
--- a/addons/website_sale/views/ecommerce.xml
+++ b/addons/website_sale/views/ecommerce.xml
@@ -3,7 +3,7 @@
     <data>
         <!-- Layout add nav and footer -->
 
-        <record id="header_ecommerce" model="ir.ui.view">
+        <!--record id="header_ecommerce" model="ir.ui.view">
             <field name="name">header_ecommerce</field>
             <field name="inherit_id" ref="website.header"/>
             <field name="arch" type="xml">
@@ -25,15 +25,11 @@
                     </xpath>
                </data>
             </field>
-        </record>
+        </record-->
 
         <!-- Page Shop --> 
 
-        <record id="page" model="ir.ui.view">
-            <field name="name">page</field>
-            <field name="type">qweb</field>
-            <field name="arch" type="xml">
-                <t t-name="website_sale.page">
+        <template id="page">
                 <t t-call="website.layout">
                     <t t-set="title">Shop - <t t-raw="title">Categories</t></t>
                     <div class="container oe_ecommerce">
@@ -52,17 +48,11 @@
                         </div>
                     </div>
                 </t>
-                </t>
-            </field>
-        </record>
+        </template>
 
         <!-- List of categories --> 
 
-        <record id="categories_recursive" model="ir.ui.view">
-            <field name="name">categories_recursive</field>
-            <field name="type">qweb</field>
-            <field name="arch" type="xml">
-                <t t-name="website_sale.categories_recursive">
+        <template id="categories_recursive">
                 <li t-att-class="category.id == current_category and 'active' or ''">
                     <a t-att-href="'/shop/category/%%s' %% category.id"><span t-record="category" t-field="name"><t t-esc="category.name"/></span></a>
                     <ul t-if="category.child_id" class="nav nav-list">
@@ -71,17 +61,11 @@
                         </t>
                     </ul>
                 </li>
-                </t>
-            </field>
-        </record>
+        </template>
 
         <!-- Product list --> 
 
-        <record id="products" model="ir.ui.view">
-            <field name="name">products</field>
-            <field name="type">qweb</field>
-            <field name="arch" type="xml">
-                <t t-name="website_sale.products">
+        <template id="products">
                 <t t-call="website_sale.page">
                     <t t-set="title">Product</t>
                     <t t-set="shop_content">
@@ -99,15 +83,9 @@
                         </span>
                     </t>
                 </t>
-                </t>
-            </field>
-        </record>
+        </template>
 
-        <record id="product_card" model="ir.ui.view">
-            <field name="name">product_card</field>
-            <field name="type">qweb</field>
-            <field name="arch" type="xml">
-                <t t-name="website_sale.product_card">
+        <template id="product_card">
                 <div class="media oe_product">
                     <a t-att-href="'/shop/product/%%s' %% product.id"><h4 class="media-heading"><span t-record="product" t-field="name"><t t-esc="product.name"/></span></h4></a>
                     <a class="pull-left" t-att-href="'/shop/product/%%s' %% product.id"><img class="media-object" t-att-src="'data:image/png;base64,' + product.image"/></a>
@@ -122,32 +100,20 @@
                         </div>
                     </div>
                 </div>
-                </t>
-            </field>
-        </record>
+        </template>
 
-        <record id="product_recommended" model="ir.ui.view">
-            <field name="name">product_recommended</field>
-            <field name="type">qweb</field>
-            <field name="arch" type="xml">
-                <t t-name="website_sale.product_recommended">
+        <template id="product_recommended">
                 <div class="oe_recommended media well well-small" t-if="recommended_products">
                     <h6>Other customers have also take this products:</h6>
                     <t t-foreach="recommended_products or []" t-as="product">
                         <a t-att-href="'/shop/product/%%s' %% product.id"><img t-att-src="'data:image/png;base64,' + product.image"/></a>
                     </t>
                 </div>
-                </t>
-            </field>
-        </record>
+        </template>
 
         <!-- product --> 
 
-        <record id="product" model="ir.ui.view">
-            <field name="name">product</field>
-            <field name="type">qweb</field>
-            <field name="arch" type="xml">
-                <t t-name="website_sale.product">
+        <template id="product">
                 <t t-call="website_sale.page">
                     <t t-set="title">Product</t>
                     <t t-set="shop_content">
@@ -166,17 +132,11 @@
                         </div>
                     </t>
                 </t>
-                </t>
-            </field>
-        </record>
+        </template>
 
         <!-- Page Shop my cart --> 
 
-        <record id="mycart" model="ir.ui.view">
-            <field name="name">mycart</field>
-            <field name="type">qweb</field>
-            <field name="arch" type="xml">
-                <t t-name="website_sale.mycart">
+        <template id="mycart">
                 <t t-call="website_sale.page">
                     <t t-set="title">My cart</t>
                     <t t-set="shop_content">
@@ -198,17 +158,11 @@
                         </span>
                     </t>
                 </t>
-                </t>
-            </field>
-        </record>
+        </template>
 
         <!-- Total Shop my cart --> 
 
-        <record id="total" model="ir.ui.view">
-            <field name="name">total</field>
-            <field name="type">qweb</field>
-            <field name="arch" type="xml">
-                <t t-name="website_sale.total">
+        <template id="total">
                 <div class="oe_total">
                     <div class="media well well-small">
                         <table t-if="order.order_line">
@@ -219,16 +173,11 @@
                         <span t-if="not order.order_line">Your cart is empty</span>
                     </div>
                 </div>
-                </t>
-            </field>
-        </record>
+        </template>
 
         <!-- Page confirm my cart -->
 
-        <record id="checkout" model="ir.ui.view">
-            <field name="name">checkout</field>
-            <field name="type">qweb</field>
-            <field name="arch" type="xml">
+        <template id="checkout">
                 <t t-call="website.layout">
                     <t t-set="title">Shop - Checkout</t>
                     <div class="container oe_ecommerce">
@@ -253,13 +202,8 @@
                         </div>
                     </div>
                 </t>
-            </field>
-        </record>
-        <record id="order" model="ir.ui.view">
-            <field name="name">order</field>
-            <field name="type">qweb</field>
-            <field name="arch" type="xml">
-                <t t-name="website_sale.order">
+        </template>
+        <template id="order">
                 <t t-call="website_sale.page">
                     <t t-set="title">Order</t>
                     <t t-set="shop_content">
@@ -293,22 +237,14 @@
                         <a t-if="order.order_line" href="/shop/confirm_order"><button class="btn btn-success">Confirm order</button></a>
                     </t>
                 </t>
-                </t>
-            </field>
-        </record>
-        <record id="thanks" model="ir.ui.view">
-            <field name="name">thanks</field>
-            <field name="type">qweb</field>
-            <field name="arch" type="xml">
-                <t t-name="website_sale.thanks">
+        </template>
+        <template id="thanks">
                 <t t-call="website_sale.page">
                     <t t-set="title">Order</t>
                     <t t-set="shop_content">
                         Thanks for your sale order
                     </t>
                 </t>
-                </t>
-            </field>
-        </record>
+        </template>
      </data>
 </openerp>