From ba0230fa530a0d83ae71f05cd77f040fb6ac5d36 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 13 Aug 2013 16:27:43 +0200
Subject: [PATCH] [FIX] website_hr: add javascript tag, website_sale: t-if for
 display number of product

bzr revid: chm@openerp.com-20130813142743-gwmmm2ik495ospbq
---
 addons/website_event/views/website_event.xml  |  2 +-
 .../static/src/js/{hr.js => website_hr.js}    |  0
 addons/website_hr/views/website_hr.xml        | 60 +++++++++----------
 addons/website_sale/views/website_sale.xml    |  4 +-
 4 files changed, 34 insertions(+), 32 deletions(-)
 rename addons/website_hr/static/src/js/{hr.js => website_hr.js} (100%)

diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index d91815a08ee..5ef2505bc9a 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -18,7 +18,7 @@
     <template id="index" name="Events">
         <t t-call="website.layout">
             <t t-set="head">
-                <script type="text/javascript" src="/website_event/static/src/js/website_event.js"></script>
+                <script type="text/javascript" src="/website_hr/static/src/js/website_hr.js"></script>
                 <t t-raw="head or ''"/>
             </t>
             <t t-set="title">Events</t>
diff --git a/addons/website_hr/static/src/js/hr.js b/addons/website_hr/static/src/js/website_hr.js
similarity index 100%
rename from addons/website_hr/static/src/js/hr.js
rename to addons/website_hr/static/src/js/website_hr.js
diff --git a/addons/website_hr/views/website_hr.xml b/addons/website_hr/views/website_hr.xml
index 7ed8916573a..59ba912edb1 100644
--- a/addons/website_hr/views/website_hr.xml
+++ b/addons/website_hr/views/website_hr.xml
@@ -20,40 +20,40 @@
 
     <!-- Page --> 
 
-    <record id="aboutus" model="ir.ui.view">
-        <field name="name">aboutus</field>
-        <field name="type">qweb</field>
-        <field name="inherit_id" ref="website.aboutus"/>
-        <field name="arch" type="xml">
-            <xpath expr="//div[@class='span8']" position="inside">
-                <h3>Our team</h3>
-                <div class="thumbnails">
-                    <div t-foreach="employee_ids" t-as="employee_id" class="span4 mt16">
-                        <div class="media thumbnail">
-                            <a class="pull-left" href="#">
-                                <img class="media-object" t-att-src="'data:image/png;base64,%%s' %% employee_id.image_small"/>
-                            </a>
-                            <div class="media-body">
-                                <div t-if="editable" class="pull-right">
-                                    <a href="#" t-att-data-id="employee_id.id">
-                                        <span t-att-class="'label label-success js_unpublish %%s' %% (not employee_id.website_published and 'hidden' or '')">Unpublish</span>
-                                        <span t-att-class="'label label-important js_publish %%s' %% (employee_id.website_published and 'hidden' or '')">Publish</span>
-                                    </a>
-                                </div>
-                                <h5 class="media-heading" t-field="employee_id.name"/>
-                                <div t-field="employee_id.department_id"/>
-                                <div t-field="employee_id.job_id"/>
-                                <div t-field="employee_id.work_location"/>
-                                <div t-field="employee_id.work_phone"/>
-                                <div t-field="employee_id.work_email"/>
-                                <div t-field="employee_id.public_info"/>
+ 
+    <template id="aboutus" inherit_id="website.aboutus">
+        <xpath expr="//div[@class='span8']" position="inside">
+            <t t-set="head">
+                <script type="text/javascript" src="/website_hr/static/src/js/website_hr.js"></script>
+                <t t-raw="head or ''"/>
+            </t>
+            <h3>Our team</h3>
+            <div class="thumbnails">
+                <div t-foreach="employee_ids" t-as="employee_id" class="span4 mt16">
+                    <div class="media thumbnail">
+                        <a class="pull-left" href="#">
+                            <img class="media-object" t-att-src="'data:image/png;base64,%%s' %% employee_id.image_small"/>
+                        </a>
+                        <div class="media-body">
+                            <div t-if="editable" class="pull-right">
+                                <a href="#" t-att-data-id="employee_id.id">
+                                    <span t-att-class="'label label-success js_unpublish %%s' %% (not employee_id.website_published and 'hidden' or '')">Unpublish</span>
+                                    <span t-att-class="'label label-important js_publish %%s' %% (employee_id.website_published and 'hidden' or '')">Publish</span>
+                                </a>
                             </div>
+                            <h5 class="media-heading" t-field="employee_id.name"/>
+                            <div t-field="employee_id.department_id"/>
+                            <div t-field="employee_id.job_id"/>
+                            <div t-field="employee_id.work_location"/>
+                            <div t-field="employee_id.work_phone"/>
+                            <div t-field="employee_id.work_email"/>
+                            <div t-field="employee_id.public_info"/>
                         </div>
                     </div>
                 </div>
-            </xpath>
-        </field>
-    </record>
+            </div>
+        </xpath>
+    </template>
 
  </data>
 </openerp>
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 8902921b534..48ecf41f64a 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -22,7 +22,9 @@
                 <a href="/shop/mycart/">
                     <i class="icon-shopping-cart"></i>
                     My cart
-                    <span class="badge badge-success" t-if="order.get_total_quantity()" t-esc="order.get_total_quantity()"/>
+                    <t t-if="order.get_total_quantity()">
+                        <span class="badge badge-success" t-esc="order.get_total_quantity()"/>
+                    </t>
                 </a>
             </li>
         </xpath>