From d1c74232b89df2c94d9b74e773b41abdf2e9971e Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 18 Jul 2013 19:00:04 +0200
Subject: [PATCH] [ADD] Added template declaration in qweb templates

bzr revid: fme@openerp.com-20130718170004-sreng8338a40nilc
---
 addons/website/views/views.xml           | 16 +++++++++++++---
 addons/website_crm/views/website_crm.xml |  2 ++
 addons/website_sale/views/ecommerce.xml  | 22 ++++++++++++++++++++++
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index 4e8994cc888..fb9ba1712db 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- vim:fdn=3:
+-->
 <openerp>
     <data>
         <record id="layout" model="ir.ui.view">
             <field name="name">layout</field>
             <field name="type">qweb</field>
-            <!-- <!DOCTYPE html> -->
             <field name="arch" type="xml">
+                <t t-name="website.layout">
+                &lt;!DOCTYPE html&gt;
                 <html>
                     <head>
                         <title t-raw="title"><t t-esc="res_company.name"/></title>
@@ -181,6 +184,7 @@
 
                     </body>
                 </html>
+                </t>
             </field>
         </record>
 
@@ -188,6 +192,7 @@
             <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">
                 <div>
                     <section class="oe_container">
@@ -234,14 +239,15 @@
                     </div>
                 </div>
                 </t>
+                </t>
             </field>
         </record>
 
-
         <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">
                 <t t-call="website.layout">
                     <div class="container">
                         <div class="row">
@@ -250,9 +256,9 @@
                                 <p>Write your text here...</p>
                             </div>
                         </div>
-
                     </div>
                 </t>
+                </t>
             </field>
         </record>
 
@@ -261,6 +267,7 @@
             <field name="name">Page not found</field>
             <field name="type">qweb</field>
             <field name="arch" type="xml">
+                <t t-name="website.404">
                 <t t-call="website.layout">
                     <div class="container">
                         <div class="row">
@@ -289,6 +296,7 @@
                         </div>
                     </div>
                 </t>
+                </t>
             </field>
         </record>
 
@@ -296,6 +304,7 @@
             <field name="name">contactus</field>
             <field name="type">qweb</field>
             <field name="arch" type="xml">
+                <t t-name="website.contactus">
                 <t t-call="website.layout">
                     <t t-set="title">Contact us - <t t-esc="res_company.name"/></t>
                     <div class="container">
@@ -328,6 +337,7 @@
                         </div>
                     </div>
                 </t>
+                </t>
             </field>
         </record>
 
diff --git a/addons/website_crm/views/website_crm.xml b/addons/website_crm/views/website_crm.xml
index ea9ced61191..88529af4192 100644
--- a/addons/website_crm/views/website_crm.xml
+++ b/addons/website_crm/views/website_crm.xml
@@ -23,6 +23,7 @@
             <field name="name">thanks</field>
             <field name="type">qweb</field>
             <field name="arch" type="xml">
+                <t t-name="website_crm.thanks">
                 <t t-call="website.layout">
                     <t t-set="title">Thank You!</t>
                     <div class="container">
@@ -31,6 +32,7 @@
                         </div>
                     </div>
                 </t>
+                </t>
             </field>
         </record>
      </data>
diff --git a/addons/website_sale/views/ecommerce.xml b/addons/website_sale/views/ecommerce.xml
index a6e200087b8..ce0bbeb60dc 100644
--- a/addons/website_sale/views/ecommerce.xml
+++ b/addons/website_sale/views/ecommerce.xml
@@ -25,6 +25,7 @@
             <field name="name">page</field>
             <field name="type">qweb</field>
             <field name="arch" type="xml">
+                <t t-name="website_sale.page">
                 <t t-call="website.layout">
                     <t t-set="title">Shop - <t t-raw="title">Categories</t></t>
                     <div class="container oe_ecommerce">
@@ -43,6 +44,7 @@
                         </div>
                     </div>
                 </t>
+                </t>
             </field>
         </record>
 
@@ -52,6 +54,7 @@
             <field name="name">categories_recursive</field>
             <field name="type">qweb</field>
             <field name="arch" type="xml">
+                <t t-name="website_sale.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">
@@ -60,6 +63,7 @@
                         </t>
                     </ul>
                 </li>
+                </t>
             </field>
         </record>
 
@@ -69,6 +73,7 @@
             <field name="name">products</field>
             <field name="type">qweb</field>
             <field name="arch" type="xml">
+                <t t-name="website_sale.products">
                 <t t-call="website_sale.page">
                     <t t-set="title">Product</t>
                     <t t-set="shop_content">
@@ -86,6 +91,7 @@
                         </span>
                     </t>
                 </t>
+                </t>
             </field>
         </record>
 
@@ -93,6 +99,7 @@
             <field name="name">product_card</field>
             <field name="type">qweb</field>
             <field name="arch" type="xml">
+                <t t-name="website_sale.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>
@@ -107,6 +114,7 @@
                         </div>
                     </div>
                 </div>
+                </t>
             </field>
         </record>
 
@@ -114,12 +122,14 @@
             <field name="name">product_recommended</field>
             <field name="type">qweb</field>
             <field name="arch" type="xml">
+                <t t-name="website_sale.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>
 
@@ -129,6 +139,7 @@
             <field name="name">product</field>
             <field name="type">qweb</field>
             <field name="arch" type="xml">
+                <t t-name="website_sale.product">
                 <t t-call="website_sale.page">
                     <t t-set="title">Product</t>
                     <t t-set="shop_content">
@@ -147,6 +158,7 @@
                         </div>
                     </t>
                 </t>
+                </t>
             </field>
         </record>
 
@@ -156,6 +168,7 @@
             <field name="name">mycart</field>
             <field name="type">qweb</field>
             <field name="arch" type="xml">
+                <t t-name="website_sale.mycart">
                 <t t-call="website_sale.page">
                     <t t-set="title">My cart</t>
                     <t t-set="shop_content">
@@ -177,6 +190,7 @@
                         </span>
                     </t>
                 </t>
+                </t>
             </field>
         </record>
 
@@ -186,6 +200,7 @@
             <field name="name">total</field>
             <field name="type">qweb</field>
             <field name="arch" type="xml">
+                <t t-name="website_sale.total">
                 <div class="oe_total">
                     <div class="media well well-small">
                         <table t-if="order.order_line">
@@ -196,6 +211,7 @@
                         <span t-if="not order.order_line">Your cart is empty</span>
                     </div>
                 </div>
+                </t>
             </field>
         </record>
 
@@ -205,6 +221,7 @@
             <field name="name">customer</field>
             <field name="type">qweb</field>
             <field name="arch" type="xml">
+                <t t-name="website_sale.customer">
                 <t t-call="website_sale.page">
                     <t t-set="title">Your informations</t>
                     <t t-set="shop_content">
@@ -236,12 +253,14 @@
                         </form>
                     </t>
                 </t>
+                </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">
                 <t t-call="website_sale.page">
                     <t t-set="title">Order</t>
                     <t t-set="shop_content">
@@ -275,18 +294,21 @@
                         <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">
                 <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>
      </data>