diff options
| author | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-06-29 14:36:18 +0200 |
|---|---|---|
| committer | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2012-06-29 14:36:18 +0200 |
| commit | 6fe94bd4bc076ad659dffe453c7b057e9340b54d (patch) | |
| tree | d673f7a2b25ec1f01307c45f081ed8c9fe27babf /addons/wiki/wizard/wiki_show_diff_view.xml | |
| parent | a642b36339ac6628b1a937bbf0d2750cc14fcdd5 (diff) | |
| parent | 37601079a987b0b20f22fff8963d22b1440b78b4 (diff) | |
[MERGE] merged with maint runk
bzr revid: qdp-launchpad@openerp.com-20120629123618-z1bv3dqdfqy23hno
Diffstat (limited to 'addons/wiki/wizard/wiki_show_diff_view.xml')
| -rw-r--r-- | addons/wiki/wizard/wiki_show_diff_view.xml | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/addons/wiki/wizard/wiki_show_diff_view.xml b/addons/wiki/wizard/wiki_show_diff_view.xml index 8cc394986d8..c5b3583b1e5 100644 --- a/addons/wiki/wizard/wiki_show_diff_view.xml +++ b/addons/wiki/wizard/wiki_show_diff_view.xml @@ -9,14 +9,13 @@ <field name="model">wizard.wiki.history.show_diff</field> <field name="type">form</field> <field name="arch" type="xml"> - <form string="Difference"> - <separator colspan="4" string="Notes"/> - <field name="file_path" colspan="4" width="300"/> - <label string="" colspan="2" /> - <group> - <button special="cancel" string="Close" icon="gtk-close" /> - </group> - </form> + <form string="Difference" version="7.0"> + <header> + <button string="Cancel" class="oe_link" special="cancel" /> + </header> + <separator string="Notes"/> + <field name="file_path" width="300"/> + </form> </field> </record> |