Merge lp:~camptocamp/openobject-addons/7.0-improve-webkit-head-readabiliy into lp:openobject-addons/7.0

[Nicolas Bessi - Camptocamp]

Improvement of webkit header view.

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

LGTM

However, given the current merge policies, I think there is little chance of getting this merged in the current stable branch. You should probably target this to the trunk branch, and add a community addon for this to get the same feature on a 7.0 instance.

review: Approve (code review, no test)

Unmerged revisions

8797. By Nicolas Bessi - Camptocamp on 2013-03-05

[IMP] webkit header/footer form lisibility

=== modified file 'report_webkit/header_view.xml'
--- report_webkit/header_view.xml	2012-11-29 22:26:45 +0000
+++ report_webkit/header_view.xml	2013-03-05 09:33:19 +0000
@@ -26,18 +26,25 @@
                             <field name='company_id'/>
                             <field name="orientation"/>
                             <field name="format"/>
-                        </group><group>
+                        </group>
+                        <group>
                             <field name="margin_top"/>
                             <field name="margin_bottom"/>
                             <field name="margin_left"/>
                             <field name="margin_right"/>
                         </group>
                     </group>
-                    <group>
-                        <field name="css"/>
-                        <field name="html"/>
-                        <field name="footer_html"/>
-                    </group>
+                    <notebook>
+                        <page string="CSS Styling" >
+                            <field name="css" colspan="4"/>
+                        </page>
+                        <page string="Webkit Header Definition" >
+                            <field name="html" colspan="4"/>
+                        </page>
+                        <page string="Webkit Footer Definition" >
+                            <field name="footer_html" colspan="4" />
+                        </page>
+                    </notebook>
                 </form>
             </field>
         </record>