[MERGE] lp:~openerp-commiter/openobject-addons/trunk-wiz-remove-btn-crm-aja

bzr revid: jam@tinyerp.com-20120619075706-8tdc3g580sf0z215

3 files changed, 37 insertions, 59 deletions

diff --git a/addons/base_module_record/wizard/base_module_record_data_view.xml b/addons/base_module_record/wizard/base_module_record_data_view.xml
index 94e20d98f8b..c487845b42b 100644
--- a/addons/base_module_record/wizard/base_module_record_data_view.xml
+++ b/addons/base_module_record/wizard/base_module_record_data_view.xml
@@ -7,17 +7,17 @@
             <field name="model">base.module.data</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Data Recording">
-                    <field name="check_date"/>
-                    <newline/>
-                    <field name="filter_cond"/>
-                    <separator string="Choose objects to record" colspan="4"/>
-                    <field name="objects" colspan="4" nolabel="1"/>
-                    <group><field name="info_yaml"/></group>
-                    <separator colspan="4"/>
-                    <group colspan="4" col="2">
-                        <button icon="gtk-cancel" string="Cancel" special="cancel"/>
-                        <button name="record_objects" icon="gtk-ok" string="Record" type="object"/>
+                <form string="Data Recording" version="7.0">
+                    <header>
+                        <button name="record_objects" icon="gtk-ok" string="Record" type="object" class="oe_form_button_active_flow"/>
+                    </header>
+                    <group>
+                        <field name="check_date"/>
+                        <newline/>
+                        <field name="filter_cond"/>
+                        <separator string="Choose objects to record" colspan="4"/>
+                        <field name="objects" colspan="4" nolabel="1"/>
+                        <group><field name="info_yaml"/></group>
                     </group>
                 </form>
             </field>
@@ -57,11 +57,6 @@
                 <form string="Data Recording">
                     <separator string="Result, paste this to your module's xml" colspan="4" />
                     <field name="res_text" nolabel="1"  colspan="4"/>
-                    <separator colspan="4"/>
-                    <group colspan="4" col="2">
-                        <label string=""/>
-                        <button icon="gtk-close" string="Close" special="cancel"/>
-                    </group>
                 </form>
             </field>
          </record>
diff --git a/addons/base_module_record/wizard/base_module_record_object_view.xml b/addons/base_module_record/wizard/base_module_record_object_view.xml
index 60aeba46ef2..a643740521e 100644
--- a/addons/base_module_record/wizard/base_module_record_object_view.xml
+++ b/addons/base_module_record/wizard/base_module_record_object_view.xml
@@ -7,18 +7,18 @@
             <field name="model">base.module.record</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Objects Recording">
-                    <field name="check_date"/>
-                    <newline/>
-                    <field name="filter_cond"/>
-                    <separator string="Choose objects to record" colspan="4"/>
-                    <field name="objects" colspan="4" nolabel="1"/>
-                    <group><field name="info_yaml"/></group>
-                    <separator colspan="4"/>
-                    <group colspan="4" col="2">
-                        <button icon="gtk-cancel" string="Cancel" special="cancel"/>
-                        <button name="record_objects" icon="gtk-ok" string="Record" type="object"/>
-                    </group>
+                <form string="Objects Recording" version="7.0">
+                    <header>
+                        <button name="record_objects" icon="gtk-ok" string="Record" type="object" class="oe_form_button_active_flow"/>
+                    </header>
+                    <group> 
+                        <field name="check_date"/>
+                        <newline/>
+                        <field name="filter_cond"/>
+                        <separator string="Choose objects to record" colspan="4"/>
+                        <field name="objects" colspan="4" nolabel="1"/>
+                        <group><field name="info_yaml"/></group>
+                   </group>
                 </form>
             </field>
         </record>
@@ -66,11 +66,6 @@
                     <separator string="Information" colspan="4"/>
                     <label string="If you think your module could interest other people, we'd like you to publish it on http://www.openerp.com, in the 'Modules' section. You can do it through the website or using features of the 'base_module_publish' module." colspan="4" align="0.0"/>
                     <label string="Thanks in advance for your contribution." colspan="4" align="0.0"/>
-                    <separator colspan="4"/>
-                    <group colspan="4" col="2">
-                        <label string=""/>
-                        <button icon="gtk-close" string="Close" special="cancel"/>
-                    </group>
                 </form>
             </field>
          </record>         
@@ -89,7 +84,10 @@
             <field name="model">base.module.record.objects</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Module Recording">
+                <form string="Module Recording" version="7.0">
+                    <header>
+                        <button string="Continue" name="inter_call" type="object" icon="gtk-ok" class="oe_form_button_active_flow"/>
+                    </header>
                     <separator string="Module Information" colspan="4"/>
                     <field name="name"/>
                     <field name="directory_name"/>
@@ -100,11 +98,6 @@
                     <field name="data_kind"/>
                     <newline/>
                     <field name="description" colspan="4"/>
-                    <separator colspan="4"/>
-                    <group colspan="4" col="2">
-                        <button icon="gtk-cancel" string="Cancel" special="cancel"/>
-                        <button string="Continue" name="inter_call" type="object" icon="gtk-ok"/>
-                    </group>
                 </form>
             </field>
          </record>
@@ -116,11 +109,6 @@
             <field name="arch" type="xml">
                 <form string="Module Recording">
                     <label string="Thanks For using Module Recorder" colspan="4" align="0.0"/>
-                    <separator string="" colspan="4"/>
-                    <group colspan="4" col="2">
-                        <label string=""/>
-                        <button icon="gtk-ok" string="OK" special="cancel"/>
-                    </group>
                 </form>
             </field>
         </record>         
@@ -134,11 +122,6 @@
                     <separator string="YAML file successfully created !" colspan="4"/>
                     <newline/>
                     <field name="yaml_file" filename="module_filename"/>
-                    <separator colspan="4"/>
-                    <group colspan="4" col="2">
-                        <label string=""/>
-                        <button icon="gtk-close" string="Close" special="cancel"/>
-                    </group>				    
                 </form>  
             </field>
         </record>   
diff --git a/addons/base_module_record/wizard/base_module_save_view.xml b/addons/base_module_record/wizard/base_module_save_view.xml
index 86b64220543..df40d2972a0 100644
--- a/addons/base_module_record/wizard/base_module_save_view.xml
+++ b/addons/base_module_record/wizard/base_module_save_view.xml
@@ -7,16 +7,16 @@
             <field name="model">base.module.save</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Module Recording">
-                    <separator string="Recording Information" colspan="4"/>
-                    <field name="info_status"/>
-                    <field name="info_text" colspan="4" nolabel="1"/>
-                    <field name="info_yaml" colspan="4"/>
-                    <separator colspan="4"/>
-                    <group colspan="4" col="2">
-                        <button icon="gtk-cancel" string="Cancel" special="cancel"/>
-                        <button name="record_save" icon="gtk-ok" string="Continue" type="object"/>
-                    </group>
+                <form string="Module Recording" version="7.0">
+                    <header>
+                        <button name="record_save" icon="gtk-ok" string="Continue" type="object" class="oe_form_button_active_flow"/>
+                    </header>
+                    <group>
+                        <separator string="Recording Information" colspan="4"/>
+                        <field name="info_status"/>
+                        <field name="info_text" colspan="4" nolabel="1"/>
+                        <field name="info_yaml" colspan="4"/>
+                   </group>
                 </form>
             </field>
         </record>