[IMP]:change the template for config wizards and installer wizards

bzr revid: nch@tinyerp.com-20100429084300-q49ni93828ha8b48

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 542434d..41797f7 100644 (file)
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -282,21 +282,21 @@
                 <form position="attributes">
                   <attribute name="string">Choose Your Interface</attribute>
                 </form>
-
-                <group string="res_config_contents" position="replace">
-                       <group colspan="4">
-                               <group colspan="1">
-                                   <image name="gtk-dialog-info"/>
-                                       <label colspan="4" align="0.0" string="Choose between the simplified interface and the extended one."/>
-                                       <label colspan="4" align="0.0" string="If you are testing OpenERP or using it for the first time, we suggest you use the simplified interface. It has less options and fields but is easier to understand."/>
-                                       <label colspan="4" align="0.0" string="You will be able to switch to the extended interface later."/>
-                               </group>
-                               <group colspan="3">
-                                       <separator string="Choose Your Interface" colspan="4"/>
-                                       <field colspan="4" name="view" nolabel="1"/>
-                                               </group>
+                               <xpath expr="//label[@string='description']"
+                        position="attributes">
+                   <attribute name="string">Choose between the simplified interface and the extended one.If you are testing OpenERP or using it for the first time, we suggest you use the simplified interface. It has less options and fields but is easier to understand.You will be able to switch to the extended interface later.</attribute>
+                 </xpath>
+                 <xpath expr='//separator[@string="title"]' position='attributes'>
+                         <attribute name='string'>Choose Your Interface</attribute>
+                 </xpath>
+                 <xpath expr='//separator[@string="vsep"]' position='attributes'>
+                         <attribute name='string'></attribute>
+                     </xpath>
+               <group string="res_config_contents" position="replace">
+                       <group colspan="5">
+                               <field colspan="5" name="view" nolabel="1"/>
                                        </group>
-                </group>
+               </group>
                 <xpath expr='//button[@name="action_skip"]' position='replace'/>
                 <xpath expr='//button[@name="action_next"]' position='attributes'>
                   <attribute name='string'>Set</attribute>

diff --git a/bin/addons/base/res/res_config.xml b/bin/addons/base/res/res_config.xml
index 11d7530..ca00a49 100644 (file)
--- a/bin/addons/base/res/res_config.xml
+++ b/bin/addons/base/res/res_config.xml
@@ -5,22 +5,30 @@
       <field name="model">res.config</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form>
-          <group string="res_config_contents">
-          </group>
-          <separator string="" colspan="4"/>
-          <group colspan="4" col="8">
-            <field name="progress" widget="progressbar"/>
-            <label string="" colspan="3"/>
-            <group colspan="1" col="2">
-              <button name="action_skip" icon="gtk-goto-last" special="cancel"
-                      type="object" string="Skip"/>
-            </group>
-            <group colspan="1" col="2">
-              <button name="action_next" icon="gtk-go-forward"
-                      type="object" string="Next"/>
-            </group>
-          </group>
+       <form>
+               <group colspan="4" col="12">
+               <group colspan="4">
+                       <image name="gtk-dialog-info"/>
+                       <newline/>
+                       <label align="0.0" string="description" width="200" colspan="4"/>
+               </group>
+               <group colspan="1">
+                       <separator string="vsep" position="vertical" colspan="1" rowspan="12"/>
+               </group>
+               <group>
+                       <separator string="title" colspan="4"/>
+                       <group string="res_config_contents"/>
+               </group>
+           </group>
+           <group colspan="4" col="8">
+                       <separator string="" colspan="8"/>
+                               <field name="progress" widget="progressbar" colspan= "1" nolabel="1"/>
+                               <label string="" colspan="2"/>
+                               <button name="action_skip" icon="gtk-goto-last" special="cancel"
+                       type="object" string="Skip" colspan="1"/>
+                <button name="action_next" icon="gtk-go-forward"
+                        type="object" string="Next" colspan="1"/>
+               </group>
         </form>
       </field>
     </record>
@@ -55,18 +63,24 @@
 
         <form>
           <group colspan="4">
-            <separator string="title" colspan="4"/>
-            <group colspan="4" col="10">
+
+            <group colspan="4" col="12">
               <group colspan="2">
                 <image name="gtk-dialog-info"/>
                 <newline/>
                 <label align="0.0" string="description" width="200"/>
               </group>
-              <group colspan="8"/>
+              <group colspan="2">
+                       <separator string="vsep" position="vertical" colspan="1" rowspan="12"/>
+                 </group>
+              <group>
+               <separator string="title" colspan="4"/>
+                <group colspan="8" />
+               </group>
             </group>
           </group>
-          <separator string="" colspan="4"/>
           <group colspan="4" col="8">
+               <separator string="" colspan="8"/>
             <field name="progress" widget="progressbar"/>
             <label string="" colspan="3"/>
             <group colspan="1" col="2">