From d538387a8b41c45735853905589d2f250e4aeb3e Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Fri, 15 Jun 2012 16:01:43 +0530
Subject: [IMP] wiki: remove cancel button and improved view of wizard.

bzr revid: tpa@tinyerp.com-20120615103143-ofki3uanzmsunat6
---
 addons/wiki/wizard/wiki_show_diff_view.xml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'addons/wiki/wizard/wiki_show_diff_view.xml')

diff --git a/addons/wiki/wizard/wiki_show_diff_view.xml b/addons/wiki/wizard/wiki_show_diff_view.xml
index 8cc394986d8..55e6905b188 100644
--- a/addons/wiki/wizard/wiki_show_diff_view.xml
+++ b/addons/wiki/wizard/wiki_show_diff_view.xml
@@ -9,14 +9,10 @@
             <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">
+                    <separator colspan="4" string="Notes"/>
+                    <field name="file_path" colspan="4" width="300"/>
+                </form>
             </field>
         </record>
 
-- 
cgit v1.2.3


From 43039668376ea9e0ac639eb5166332ade73db50b Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Wed, 27 Jun 2012 18:48:24 +0530
Subject: [FIX] wiki survey, buton cancel

bzr revid: jam@tinyerp.com-20120627131824-tqgnos4z5zedzbp0
---
 addons/wiki/wizard/wiki_show_diff_view.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'addons/wiki/wizard/wiki_show_diff_view.xml')

diff --git a/addons/wiki/wizard/wiki_show_diff_view.xml b/addons/wiki/wizard/wiki_show_diff_view.xml
index 55e6905b188..d2afd170083 100644
--- a/addons/wiki/wizard/wiki_show_diff_view.xml
+++ b/addons/wiki/wizard/wiki_show_diff_view.xml
@@ -9,7 +9,10 @@
             <field name="model">wizard.wiki.history.show_diff</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Difference">
+                <form string="Difference" version="7.0">
+                    <header>
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </header>
                     <separator colspan="4" string="Notes"/>
                     <field name="file_path" colspan="4" width="300"/>
                 </form>
-- 
cgit v1.2.3


From 7c114fa26a0e5b8b4312f73f717a3274245b393a Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 29 Jun 2012 12:12:08 +0200
Subject: [IMP] small form view improvements

bzr revid: rco@openerp.com-20120629101208-fmfa4k5dgm818aqy
---
 addons/wiki/wizard/wiki_show_diff_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/wiki/wizard/wiki_show_diff_view.xml')

diff --git a/addons/wiki/wizard/wiki_show_diff_view.xml b/addons/wiki/wizard/wiki_show_diff_view.xml
index d2afd170083..c5b3583b1e5 100644
--- a/addons/wiki/wizard/wiki_show_diff_view.xml
+++ b/addons/wiki/wizard/wiki_show_diff_view.xml
@@ -13,8 +13,8 @@
                     <header>
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
-                    <separator colspan="4" string="Notes"/>
-                    <field name="file_path" colspan="4" width="300"/>
+                    <separator string="Notes"/>
+                    <field name="file_path" width="300"/>
                 </form>
             </field>
         </record>
-- 
cgit v1.2.3