diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-07-11 09:52:57 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-07-11 09:52:57 +0200 |
| commit | 1daefb8fd5fb344f6e9ea0bce03b3ffbfbc8253d (patch) | |
| tree | b3a07be7bd960593df315512b5f471eebd497d03 /addons/wiki/wizard | |
| parent | d43db51a02806d175079ce63b755502c05c50db1 (diff) | |
| parent | 6cbb04758af8d1e7056df3eadbf1b490b958b0b5 (diff) | |
[MERGE] Merged with addons/trunk.
bzr revid: tde@openerp.com-20120711075257-1gldrjfxw8vgi7hx
Diffstat (limited to 'addons/wiki/wizard')
| -rw-r--r-- | addons/wiki/wizard/wiki_create_menu_view.xml | 10 | ||||
| -rw-r--r-- | addons/wiki/wizard/wiki_make_index_view.xml | 8 | ||||
| -rw-r--r-- | addons/wiki/wizard/wiki_show_diff_view.xml | 6 | ||||
| -rw-r--r-- | addons/wiki/wizard/wiki_wiki_page_open_view.xml | 6 |
4 files changed, 15 insertions, 15 deletions
diff --git a/addons/wiki/wizard/wiki_create_menu_view.xml b/addons/wiki/wizard/wiki_create_menu_view.xml index 45c4ba6a487..213ca9dd2e2 100644 --- a/addons/wiki/wizard/wiki_create_menu_view.xml +++ b/addons/wiki/wizard/wiki_create_menu_view.xml @@ -10,15 +10,15 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Create Menu" version="7.0"> - <header> - <button name="wiki_menu_create" string="Create Menu" type="object" class="oe_highlight"/> - or - <button string="Cancel" class="oe_link" special="cancel" /> - </header> <group string="Menu Information"> <field name="menu_name" /> <field name="menu_parent_id" /> </group> + <footer> + <button name="wiki_menu_create" string="Create Menu" type="object" class="oe_highlight"/> + or + <button string="Cancel" class="oe_link" special="cancel" /> + </footer> </form> </field> </record> diff --git a/addons/wiki/wizard/wiki_make_index_view.xml b/addons/wiki/wizard/wiki_make_index_view.xml index c818721c09c..90139c3afac 100644 --- a/addons/wiki/wizard/wiki_make_index_view.xml +++ b/addons/wiki/wizard/wiki_make_index_view.xml @@ -10,13 +10,13 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Create Menu" version="7.0"> - <header> + <separator string="Menu Information"/> + <label string="Want to create a Index on Selected Pages ? "/> + <footer> <button name="wiki_do_index" string="Create Index" type="object" class="oe_highlight"/> or <button string="Cancel" class="oe_link" special="cancel" /> - </header> - <separator string="Menu Information"/> - <label string="Want to create a Index on Selected Pages ? "/> + </footer> </form> </field> </record> diff --git a/addons/wiki/wizard/wiki_show_diff_view.xml b/addons/wiki/wizard/wiki_show_diff_view.xml index c5b3583b1e5..4729586c858 100644 --- a/addons/wiki/wizard/wiki_show_diff_view.xml +++ b/addons/wiki/wizard/wiki_show_diff_view.xml @@ -10,11 +10,11 @@ <field name="type">form</field> <field name="arch" type="xml"> <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"/> + <footer> + <button string="Cancel" class="oe_link" special="cancel" /> + </footer> </form> </field> </record> diff --git a/addons/wiki/wizard/wiki_wiki_page_open_view.xml b/addons/wiki/wizard/wiki_wiki_page_open_view.xml index 9be2d4d22aa..49f333e453f 100644 --- a/addons/wiki/wizard/wiki_wiki_page_open_view.xml +++ b/addons/wiki/wizard/wiki_wiki_page_open_view.xml @@ -10,12 +10,12 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Open Page" version="7.0"> - <header> + <label string="Want to open a wiki page? "/> + <footer> <button name="open_wiki_page" string="Open Wiki Page" type="object" class="oe_highlight"/> or <button string="Cancel" class="oe_link" special="cancel" /> - </header> - <label string="Want to open a wiki page? "/> + </footer> </form> </field> </record> |