From d2f3bbf4bc77a64deaaf6d3a4e4a381f32bd776a Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 3 Oct 2012 18:16:41 +0200
Subject: [PATCH] [REV] Undo header template extraction

bzr revid: odo@openerp.com-20121003161641-9zodo9ks2bqjjjfd
---
 openerp/addons/base/ir/ir.xml                 | 44 +++++++++----------
 .../base/module/wizard/base_module_upgrade.py |  4 +-
 openerp/addons/base/res/res_widget_view.xml   |  4 +-
 3 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/openerp/addons/base/ir/ir.xml b/openerp/addons/base/ir/ir.xml
index 2f25f24c394..3189870aa68 100644
--- a/openerp/addons/base/ir/ir.xml
+++ b/openerp/addons/base/ir/ir.xml
@@ -1170,9 +1170,9 @@
             <field name="model">ir.translation</field>
             <field name="arch" type="xml">
                 <form string="Translations" version="7.0">
-                    <t t-call="ui.Header">
+                   <header>
                         <field name="state" widget="statusbar" nolabel="1"/>
-                    </t>
+                   </header>
                    <sheet>
                     <group>
                         <group>
@@ -1733,30 +1733,26 @@
             <field name="name">Config Wizard Steps</field>
             <field name="arch" type="xml">
                 <form string="Config Wizard Steps" version="7.0">
-                    <t t-call="ui.Header">
+                  <header>
                         <button name="action_launch"
-                                states="open" string="Launch"
-                                type="object" icon="gtk-execute"
-                                class="oe_highlight"
-                                help="Launch Configuration Wizard"/>
+                            states="open" string="Launch"
+                            type="object" icon="gtk-execute" class="oe_highlight" 
+                            help="Launch Configuration Wizard"/>
                         <button name="action_open" states="done"
-                                string="Set as Todo" type="object"
-                                icon="gtk-convert" class="oe_highlight"/>
-                        <field name="state" widget="statusbar"
-                               statusbar_visible="open,done" nolabel="1"
-                               readonly="1"
-                               statusbar_colors='{"open":"red","done":"blue"}'/>
-                    </t>
-                    <sheet>
-                        <group col="4">
-                            <field name="action_id"/>
-                            <field name="type"/>
-                            <field name="sequence"/>
-                        </group>
-                        <group string="Groups">
-                            <field name="groups_id" nolabel="1" colspan="4"/>
-                        </group>
-                    </sheet>
+                            string="Set as Todo" type="object"
+                            icon="gtk-convert" class="oe_highlight"/>
+                        <field name="state" widget="statusbar" statusbar_visible="open,done" nolabel="1" readonly="1" statusbar_colors='{"open":"red","done":"blue"}'/>
+                  </header>
+                  <sheet>
+                    <group col="4">
+                        <field name="action_id"/>
+                        <field name="type"/>
+                        <field name="sequence"/>
+                    </group>
+                    <group string="Groups">
+                        <field name="groups_id" nolabel="1" colspan="4"/>
+                    </group>
+                  </sheet>
                 </form>
             </field>
         </record>
diff --git a/openerp/addons/base/module/wizard/base_module_upgrade.py b/openerp/addons/base/module/wizard/base_module_upgrade.py
index 98ea0ac0482..04b7e785e48 100644
--- a/openerp/addons/base/module/wizard/base_module_upgrade.py
+++ b/openerp/addons/base/module/wizard/base_module_upgrade.py
@@ -47,10 +47,10 @@ class base_module_upgrade(osv.osv_memory):
         ids = self.get_module_list(cr, uid, context=context)
         if not ids:
             res['arch'] = '''<form string="Apply Schedule Upgrade" version="7.0">
-                                <t t-call="ui.Header">
+                                <header>
                                     <button name="config" string="Start configuration" type="object" icon="gtk-ok"/>
                                     <button special="cancel" string="Close" icon="gtk-cancel"/>
-                                </t>
+                                </header>
                                 <separator string="Apply Schedule Upgrade" colspan="4"/>
                              </form>'''
 
diff --git a/openerp/addons/base/res/res_widget_view.xml b/openerp/addons/base/res/res_widget_view.xml
index 764f319de7b..bad582f97db 100644
--- a/openerp/addons/base/res/res_widget_view.xml
+++ b/openerp/addons/base/res/res_widget_view.xml
@@ -82,11 +82,11 @@
             <field name="model">res.widget.wizard</field>
             <field name="arch" type="xml">
                 <form string="Widget Wizard" col="4" version="7.0">
-                    <t t-call="ui.Header">
+                    <header>
                         <button name="res_widget_add" string="Add" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
-                    </t>
+                    </header>
                     <group>
                         <field name="widgets_list"/>
                     </group>