diff options
| author | Rucha (Open ERP) <rpa@tinyerp.com> | 2011-11-02 10:58:27 +0530 |
|---|---|---|
| committer | Rucha (Open ERP) <rpa@tinyerp.com> | 2011-11-02 10:58:27 +0530 |
| commit | 2fdecf4717080ea98a514b67dedefc27d76c6727 (patch) | |
| tree | bb54dd0e81af0bbf999fee1110fecb9e507f51e1 /addons/report_webkit/header_view.xml | |
| parent | 9fe0f6fa83b84d0806359bdc2a3ae31dfb7e997a (diff) | |
| parent | 3d22bb8b55d48e5ee8226f023555f003288b157a (diff) | |
[MERGE]: Merge with latest trunk
bzr revid: rpa@tinyerp.com-20111102052827-0bctjrhb4amyg6pl
Diffstat (limited to 'addons/report_webkit/header_view.xml')
| -rw-r--r-- | addons/report_webkit/header_view.xml | 45 |
1 files changed, 24 insertions, 21 deletions
diff --git a/addons/report_webkit/header_view.xml b/addons/report_webkit/header_view.xml index d3e9363acd7..267bc7cb0a4 100644 --- a/addons/report_webkit/header_view.xml +++ b/addons/report_webkit/header_view.xml @@ -6,31 +6,26 @@ <field name="type">form</field> <field name="arch" type="xml"> <form> - <field name='company_id' /> - <newline /> - <field name="name"/> - <field name="type"/> + <group col="6" colspan="4"> + <field name="name"/> + <field name="type"/> + <field name='company_id' /> + </group> <field name="img" widget="image" colspan="4"/> </form> </field> </record> - + <record model="ir.ui.view" id="header_webkit"> <field name="name">res.company.header.html</field> <field name="model">ir.header_webkit</field> <field name="type">form</field> <field name="arch" type="xml"> <form> - <field name="name"/> - <newline/> - <notebook> - <page string="Content and styling" > - <field name='company_id' /> - <field name="css" colspan="4"/> - <field name="html" colspan="4"/> - <field name="footer_html" colspan="4" /> - </page> - <page string="page setup" > + <field name="name" colspan="4"/> + <notebook colspan="4"> + <page string="Company and Page Setup" > + <field name='company_id' colspan="4"/> <field name="orientation" /> <field name="format" /> <field name="margin_top" /> @@ -38,27 +33,35 @@ <field name="margin_left" /> <field name="margin_right" /> </page> + <page string="CSS Style" > + <field name="css" colspan="4" nolabel="1"/> + </page> + <page string="Header" > + <field name="html" colspan="4" nolabel="1"/> + </page> + <page string="Footer" > + <field name="footer_html" colspan="4" nolabel="1"/> + </page> </notebook> </form> </field> </record> - + <record id="action_header_img" model="ir.actions.act_window"> - <field name="name">Header IMG</field> + <field name="name">Webkit Logos</field> <field name="res_model">ir.header_img</field> <field name="view_type">form</field> <field name="view_mode">tree,form</field> </record> <menuitem action="action_header_img" id="menu_header_img" parent="base.menu_res_company_global" sequence="14"/> - + <record id="action_header_webkit" model="ir.actions.act_window"> - <field name="name">Header HTML</field> + <field name="name">Webkit Headers/Footers</field> <field name="res_model">ir.header_webkit</field> <field name="view_type">form</field> <field name="view_mode">tree,form</field> </record> <menuitem action="action_header_webkit" id="menu_header_webkit" parent="base.menu_res_company_global" sequence="14"/> - - + </data> </openerp> |