odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] use correct attribute for vertical separators, remove unneeded optional tags from view.rng 

bzr revid: xmo@openerp.com-20100727134517-atf62dm02rgmfwdf
This commit is contained in:
Xavier Morel 2010-07-27 15:45:17 +02:00
parent 75cbab1fd2
commit 1d6c86a579
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
bin/addons/base/res/res_config.xml
View File

@ -6,28 +6,28 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form>
<group colspan="4" col="8">
<group colspan="3" width="220" height="250">
<field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
<newline/>
<label align="0.0" string="description" width="200" colspan="2"/>
</group>
<separator string="vsep" position="vertical" colspan="1" rowspan="12"/>
<group colspan="4">
<separator string="title" colspan="4"/>
<group string="res_config_contents"/>
</group>
</group>
<group colspan="8" col="8">
<separator string="" colspan="8"/>
<group colspan="4" width="220">
<field name="progress" widget="progressbar" nolabel="1" colspan="2"/>
</group>
<button name="action_skip" icon="gtk-jump-to" special="cancel"
type="object" string="Skip" colspan="1"/>
<button name="action_next" icon="gtk-go-forward"
type="object" string="Next" colspan="1"/>
<group colspan="4" col="8">
<group colspan="3" width="220" height="250">
<field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
<newline/>
<label align="0.0" string="description" width="200" colspan="2"/>
</group>
<separator string="vsep" orientation="vertical" colspan="1" rowspan="12"/>
<group colspan="4">
<separator string="title" colspan="4"/>
<group string="res_config_contents"/>
</group>
</group>
<group colspan="8" col="8">
<separator string="" colspan="8"/>
<group colspan="4" width="220">
<field name="progress" widget="progressbar" nolabel="1" colspan="2"/>
</group>
<button name="action_skip" icon="gtk-jump-to" 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>
@ -66,7 +66,7 @@
<newline/>
<label align="0.0" string="description" width="200" colspan="2"/>
</group>
<separator string="vsep" position="vertical" colspan="1" rowspan="12"/>
<separator string="vsep" orientation="vertical" colspan="1" rowspan="12"/>
<group colspan="4">
<separator string="title" colspan="4"/>
<group colspan="8"/>

12
bin/addons/base/rng/view.rng
View File

@ -177,11 +177,11 @@
<rng:optional><rng:attribute name="object"/></rng:optional>
<rng:optional><rng:attribute name="link"/></rng:optional>
<rng:optional><rng:attribute name="domain"/></rng:optional>
<rng:oneOrMore>
<rng:optional><rng:ref name="field"/></rng:optional>
</rng:oneOrMore>
<rng:zeroOrMore>
<rng:optional><rng:ref name="html"/></rng:optional>
<rng:ref name="field"/>
</rng:zeroOrMore>
<rng:zeroOrMore>
<rng:ref name="html"/>
</rng:zeroOrMore>
</rng:element>
</rng:define>
@ -476,7 +476,7 @@
<rng:ref name="field"/>
</rng:oneOrMore>
<rng:zeroOrMore>
<rng:optional><rng:ref name="html"/></rng:optional>
<rng:ref name="html"/>
</rng:zeroOrMore>
</rng:element>
</rng:define>
@ -491,7 +491,7 @@
<rng:ref name="field"/>
</rng:oneOrMore>
<rng:zeroOrMore>
<rng:optional><rng:ref name="html"/></rng:optional>
<rng:ref name="html"/>
</rng:zeroOrMore>
</rng:element>
</rng:define>