[IMP]:config wizard templates

bzr revid: nch@tinyerp.com-20100511093858-f6mxmosml69axxzp

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 1d4a4f0..5db326c 100644 (file)
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -291,10 +291,11 @@
                  </xpath>
                  <xpath expr='//separator[@string="vsep"]' position='attributes'>
                          <attribute name='string'></attribute>
+                         <attribute name='rowspan'>14</attribute>
                      </xpath>
                <group string="res_config_contents" position="replace">
-                       <group colspan="5">
-                               <field colspan="5" name="view" nolabel="1"/>
+                       <group colspan="4">
+                               <field colspan="4" name="view" nolabel="1"/>
                                        </group>
                </group>
                 <xpath expr='//button[@name="action_skip"]' position='replace'/>

diff --git a/bin/addons/base/res/res_config.py b/bin/addons/base/res/res_config.py
index d474a00..e885476 100644 (file)
--- a/bin/addons/base/res/res_config.py
+++ b/bin/addons/base/res/res_config.py
@@ -50,16 +50,7 @@ class res_config_configurable(osv.osv_memory):
         if total:
             return round(open*100./total)
         return 100.
-#    def default_get(self, cr, uid, fields_list, context=None):
-#        ''' Set Config Logo...
-#        '''
-#        defaults = super(res_config_configurable, self).default_get(
-#            cr, uid, fields_list, context=context)
-#        file_no = str(random.randint(1,3))
-#        path = os.path.join('base','res','config_pixmaps/%s.png'%file_no)
-#        file_data = tools.file_open(path,'rb').read()
-#        defaults.update({'config_logo':base64.encodestring(file_data)})
-#        return defaults
+
     def _get_image(self, cr, uid, context=None):
         file_no = str(random.randint(1,3))
         path = os.path.join('base','res','config_pixmaps/%s.png'%file_no)

diff --git a/bin/addons/base/res/res_config.xml b/bin/addons/base/res/res_config.xml
index 6d1d8f9..e8d4d1d 100644 (file)
--- a/bin/addons/base/res/res_config.xml
+++ b/bin/addons/base/res/res_config.xml
@@ -7,12 +7,12 @@
       <field name="arch" type="xml">
        <form>
                <group colspan="4" col="8">
-               <group colspan="4" width="200" height="250">
+               <group colspan="3" width="200" height="250">
                        <field name="config_logo" widget="image" width="150" height="100" nolabel="1" colspan="1"/>
                        <newline/>
                        <label align="0.0" string="description" width="200" colspan="2"/>
-                       <separator string="vsep" position="vertical" colspan="1" rowspan="12"/>
                </group>
+               <separator string="vsep" position="vertical" colspan="1" rowspan="12"/>
                <group colspan="4">
                        <separator string="title" colspan="4"/>
                        <group string="res_config_contents"/>
@@ -61,12 +61,12 @@
       <field name="arch" type="xml">
         <form>
                <group colspan="4" col="8">
-               <group colspan="4" width="200" height="250">
+               <group colspan="3" width="200" height="300">
                        <field name="config_logo" widget="image" width="150" height="100" nolabel="1" colspan="1"/>
                        <newline/>
                        <label align="0.0" string="description" width="200" colspan="2"/>
-                       <separator string="vsep" position="vertical" colspan="1" rowspan="12"/>
                </group>
+               <separator string="vsep" position="vertical" colspan="1" rowspan="12"/>
                <group colspan="4">
                        <separator string="title" colspan="4"/>
                        <group colspan="8"/>
@@ -74,7 +74,7 @@
                        </group>
                <group colspan="8" col="8">
                        <separator string="" colspan="8"/>
-                       <group string="progress" colspan="4" width="220">
+                       <group colspan="4" width="220">
                                <field name="progress" widget="progressbar" nolabel="1" colspan="2"/>
                        </group>
                                        <button name="action_skip" icon="gtk-goto-last" special="cancel"