From 92b3106212de2a109a769d3442b1a9700c3e1cbd Mon Sep 17 00:00:00 2001
From: "nicolas.bessi@camptocamp.com" <>
Date: Fri, 9 Sep 2011 12:59:01 +0200
Subject: [IMP] Layer of report webkit

bzr revid: nicolas.bessi@camptocamp.com-20110909105901-9odsx3p030znn6qc
---
 addons/report_webkit/header_view.xml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'addons/report_webkit/header_view.xml')

diff --git a/addons/report_webkit/header_view.xml b/addons/report_webkit/header_view.xml
index d3e9363acd7..bc643a0a28c 100644
--- a/addons/report_webkit/header_view.xml
+++ b/addons/report_webkit/header_view.xml
@@ -24,13 +24,8 @@
                     <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" >
+                        <page string="Company and Page Setup" >
+                            <field name='company_id' colspan="4"/>
                             <field name="orientation" />
                             <field name="format" />
                             <field name="margin_top" />
@@ -38,6 +33,15 @@
                             <field name="margin_left" />
                             <field name="margin_right" />
                         </page>
+                        <page string="css Styling" >
+                            <field name="css" colspan="4"/>
+                        </page>
+                        <page string="Webkit Header" >
+                            <field name="html" colspan="4"/>
+                        </page>
+                        <page string="Webkit Footer" >
+                            <field name="footer_html" colspan="4" />
+                        </page>
                     </notebook>
                 </form>
             </field>
-- 
cgit v1.2.3


From 5136b887714393231d0f8ce724e714f9e42247df Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Thu, 27 Oct 2011 16:45:30 +0200
Subject: [IMP] report_webkit: usability/views improvements

bzr revid: odo@openerp.com-20111027144530-g0moe49ek3q3qf7e
---
 addons/report_webkit/header_view.xml | 39 ++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

(limited to 'addons/report_webkit/header_view.xml')

diff --git a/addons/report_webkit/header_view.xml b/addons/report_webkit/header_view.xml
index bc643a0a28c..267bc7cb0a4 100644
--- a/addons/report_webkit/header_view.xml
+++ b/addons/report_webkit/header_view.xml
@@ -6,24 +6,24 @@
             <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>
+                    <field name="name" colspan="4"/>
+                    <notebook colspan="4">
                         <page string="Company and Page Setup" >
                             <field name='company_id' colspan="4"/>
                             <field name="orientation" />
@@ -33,36 +33,35 @@
                             <field name="margin_left" />
                             <field name="margin_right" />
                         </page>
-                        <page string="css Styling" >
-                            <field name="css" colspan="4"/>
+                        <page string="CSS Style" >
+                            <field name="css" colspan="4" nolabel="1"/>
                         </page>
-                        <page string="Webkit Header" >
-                            <field name="html" colspan="4"/>
+                        <page string="Header" >
+                            <field name="html" colspan="4" nolabel="1"/>
                         </page>
-                        <page string="Webkit Footer" >
-                            <field name="footer_html" colspan="4" />
+                        <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>
-- 
cgit v1.2.3