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

Proposed by Nicolas Bessi - Camptocamp
Status: Needs review
Proposed branch: lp:~camptocamp/openobject-addons/7.0-improve-webkit-head-readabiliy
Merge into: lp:openobject-addons/7.0
Diff against target: 35 lines (+13/-6)
1 file modified
report_webkit/header_view.xml (+13/-6)
To merge this branch: bzr merge lp:~camptocamp/openobject-addons/7.0-improve-webkit-head-readabiliy
Reviewer Review Type Date Requested Status
Alexandre Fayolle - camptocamp (community) code review, no test Approve
OpenERP Core Team Pending
Review via email: mp+151708@code.launchpad.net

Description of the change

Improvement of webkit header view.

To post a comment you must log in.
Revision history for this message
Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'report_webkit/header_view.xml'
2--- report_webkit/header_view.xml 2012-11-29 22:26:45 +0000
3+++ report_webkit/header_view.xml 2013-03-05 09:33:19 +0000
4@@ -26,18 +26,25 @@
5 <field name='company_id'/>
6 <field name="orientation"/>
7 <field name="format"/>
8- </group><group>
9+ </group>
10+ <group>
11 <field name="margin_top"/>
12 <field name="margin_bottom"/>
13 <field name="margin_left"/>
14 <field name="margin_right"/>
15 </group>
16 </group>
17- <group>
18- <field name="css"/>
19- <field name="html"/>
20- <field name="footer_html"/>
21- </group>
22+ <notebook>
23+ <page string="CSS Styling" >
24+ <field name="css" colspan="4"/>
25+ </page>
26+ <page string="Webkit Header Definition" >
27+ <field name="html" colspan="4"/>
28+ </page>
29+ <page string="Webkit Footer Definition" >
30+ <field name="footer_html" colspan="4" />
31+ </page>
32+ </notebook>
33 </form>
34 </field>
35 </record>