From 0b20b258abbb56082a88e3cab7ef86bdb9569b98 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Thu, 28 Jun 2012 17:20:32 +0200
Subject: [PATCH] [IMP] base_* modules: clean up form views

bzr revid: rco@openerp.com-20120628152032-7ba5lzgu0ojq60bk
---
 .../wizard/base_module_record_data_view.xml   |  7 ++-
 .../wizard/base_module_record_object_view.xml | 46 +++++++++----------
 .../wizard/base_module_save_view.xml          |  7 ++-
 .../base_report_designer_installer.xml        |  8 ++--
 .../wizard/base_report_design_view.xml        |  5 +-
 5 files changed, 34 insertions(+), 39 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 31026141322..55578c0397a 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
@@ -15,12 +15,11 @@
                     </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>
+                    <separator string="Choose objects to record"/>
+                    <field name="objects"/>
+                    <group><field name="info_yaml"/></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 86b1c63c9c8..726820c546f 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
@@ -13,14 +13,13 @@
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
-                    <group> 
+                    <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>
+                    </group>
+                    <separator string="Choose objects to record"/>
+                    <field name="objects"/>
+                    <group><field name="info_yaml"/></group>
                 </form>
             </field>
         </record>
@@ -61,13 +60,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Module Recording">
-                    <separator string="Module successfully created!" colspan="4"/>
-                    <field name="module_filename"/>
-                    <newline/>
-                    <field name="module_file"/>
-                    <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"/>
+                    <group string="Module successfully created!">
+                        <field name="module_filename"/>
+                        <field name="module_file"/>
+                    </group>
+                    <separator string="Information"/>
+                    <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." align="0.0"/>
+                    <label string="Thanks in advance for your contribution." align="0.0"/>
                 </form>
             </field>
          </record>         
@@ -92,16 +91,17 @@
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
-                    <separator string="Module Information" colspan="4"/>
-                    <field name="name"/>
-                    <field name="directory_name"/>
-                    <field name="version"/>
-                    <field name="author"/>
-                    <field name="website" colspan="4"/>
-                    <field name="category" colspan="4"/>
-                    <field name="data_kind"/>
-                    <newline/>
-                    <field name="description" colspan="4"/>
+                    <group string="Module Information">
+                        <field name="name"/>
+                        <field name="directory_name"/>
+                        <field name="version"/>
+                        <field name="author"/>
+                        <field name="website" colspan="4"/>
+                        <field name="category" colspan="4"/>
+                        <field name="data_kind"/>
+                    </group>
+                    <separator string="Description"/>
+                    <field name="description"/>
                 </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 6fc6f8a35b2..fb82edba000 100644
--- a/addons/base_module_record/wizard/base_module_save_view.xml
+++ b/addons/base_module_record/wizard/base_module_save_view.xml
@@ -13,11 +13,10 @@
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
                     </header>
-                    <group>
-                        <separator string="Recording Information" colspan="4"/>
+                    <group string="Recording Information">
                         <field name="info_status"/>
-                        <field name="info_text" colspan="4" nolabel="1"/>
-                        <field name="info_yaml" colspan="4"/>
+                        <field name="info_text"/>
+                        <field name="info_yaml"/>
                    </group>
                 </form>
             </field>
diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml
index 0b2fe2cf530..eb3abae2b3a 100644
--- a/addons/base_report_designer/base_report_designer_installer.xml
+++ b/addons/base_report_designer/base_report_designer_installer.xml
@@ -9,16 +9,14 @@
             <field name="arch" type="xml">
                 <data>
                     <form position="attributes" version="7.0">
-                        <header>
-                            <xpath expr="//button[@string='Install Modules']" position="replace">
-                                <button name="action_next" icon="gtk-go-forward" type="object" string="Configure" colspan="1" invisible="context.get('menu',False)" class="oe_highlight_on_dirty"  />
-                            </xpath>
-                        </header>
                         <attribute name="string">OpenERP Report Designer Configuration</attribute>
                     </form>
                     <separator string="title" position="before">
                         <label string="This plug-in allows you to create/modify OpenERP Reports into OpenOffice Writer."/>
                     </separator>
+                    <xpath expr="//button[@string='Install Modules']" position="replace">
+                        <button name="action_next" icon="gtk-go-forward" type="object" string="Configure" invisible="context.get('menu',False)" class="oe_highlight_on_dirty"/>
+                    </xpath>
                     
                     <xpath expr="//separator[@string='title']" position="after">
                         <group colspan="8" height="450" width="750">
diff --git a/addons/base_report_designer/wizard/base_report_design_view.xml b/addons/base_report_designer/wizard/base_report_design_view.xml
index 44339ded438..b88c40588e4 100644
--- a/addons/base_report_designer/wizard/base_report_design_view.xml
+++ b/addons/base_report_designer/wizard/base_report_design_view.xml
@@ -13,8 +13,7 @@
                     or
                     <button string="Cancel" class="oe_link" special="cancel"/>
                 </header>
-                <group>
-                    <separator string="Select your report" colspan="4"/>
+                <group string="Select your report">
                     <field name="report_id"/>
                 </group>
             </form>
@@ -53,7 +52,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Save RML FIle">
-                    <separator string="The RML Report" colspan="4"/>
+                    <separator string="The RML Report"/>
                     <field name="file_rml"/>
                 </form>
             </field>