[MERGE]merged with trunk-survey-layout-tta

bzr revid: vba@tinyerp.com-20120709130113-3lchipgil9oqpglg

4 files changed, 34 insertions, 36 deletions

diff --git a/addons/wiki/wizard/wiki_create_menu_view.xml b/addons/wiki/wizard/wiki_create_menu_view.xml
index fbdffb23e0a..45c4ba6a487 100644
--- a/addons/wiki/wizard/wiki_create_menu_view.xml
+++ b/addons/wiki/wizard/wiki_create_menu_view.xml
@@ -9,15 +9,17 @@
             <field name="model">wiki.create.menu</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              <form string="Create Menu">
-                     <separator string="Menu Information" colspan="4" />
-                    <field name="menu_name" />
-                    <field name="menu_parent_id" />
-                    <separator string="" colspan="4" />
-                    <label string="" colspan="2" />
-                    <button special="cancel" string="Cancel" />
-                    <button name="wiki_menu_create" string="Create Menu" type="object"/>
-             </form>
+                <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>
+                </form>
             </field>
         </record>
 
diff --git a/addons/wiki/wizard/wiki_make_index_view.xml b/addons/wiki/wizard/wiki_make_index_view.xml
index 28b0d8427b0..c818721c09c 100644
--- a/addons/wiki/wizard/wiki_make_index_view.xml
+++ b/addons/wiki/wizard/wiki_make_index_view.xml
@@ -9,16 +9,15 @@
             <field name="model">wiki.make.index</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              <form string="Create Menu">
-                <separator string="Menu Information" colspan="4"/>
-                <label string="Want to create a Index on Selected Pages ? "/>
-                <separator string="" colspan="6" />
-                <label string="" colspan="2"/>
-                <group>
-                <button special="cancel" string="Cancel" icon="gtk-cancel" />
-                <button name="wiki_do_index" string="Create Index" type="object" icon="gtk-ok"/>
-                </group>
-            </form>
+                <form string="Create Menu" version="7.0">
+                    <header>
+                        <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 ? "/>
+                </form>
             </field>
         </record>
 
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>
 
diff --git a/addons/wiki/wizard/wiki_wiki_page_open_view.xml b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
index a625d15e92a..9be2d4d22aa 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open_view.xml
+++ b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
@@ -9,15 +9,13 @@
             <field name="model">wiki.wiki.page.open</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              <form string="Open Page">
-                 <separator string="" colspan="6" />
-                  <label string="Want to open a wiki page? "/>
-                  <separator string="" colspan="6" />
-                <label string="" colspan="2" />
-                <group>
-                <button special="cancel" string="Cancel" icon="gtk-cancel" />
-                   <button name="open_wiki_page" string="Open Wiki Page" type="object" icon="gtk-ok"/>
-                   </group>
+                <form string="Open Page" version="7.0">
+                    <header>
+                        <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? "/>
              </form>
             </field>
         </record>