From 733f236a4fdb48bc11d13326a7bf485c77204e44 Mon Sep 17 00:00:00 2001
From: Tejas Tank <tta@openerp.com>
Date: Wed, 30 May 2012 19:16:13 +0530
Subject: config wizard cleanup

bzr revid: tta@openerp.com-20120530134613-bv6x9be14yho6nqr
---
 addons/knowledge/res_config_view.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'addons/knowledge/res_config_view.xml')

diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index 6816a9da3a1..ffcac90fb10 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -12,17 +12,16 @@
                         <button string="Cancel" special="cancel"/>
                     </div>
                     <sheet layout="auto">
-                        <separator string="Wiki" colspan="4"/>
-                        <field name="module_wiki_faq"/>
-                        <newline/>
-                        <field name="module_wiki_quality_manual"/>
-
                         <separator string="Documents" colspan="4"/>
                         <field name="module_document"/>
                         <newline/>
                         <field name="module_document_ftp"/>
                         <newline/>
                         <field name="module_document_webdav"/>
+                        <separator string="Wiki" colspan="4"/>
+                        <field name="module_wiki_faq"/>
+                        <newline/>
+                        <field name="module_wiki_quality_manual"/>
                     </sheet>
                 </form>
             </field>
-- 
cgit v1.2.3


From 0a377b68c8a93eada4e94ffadb9259c7e15572ba Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Thu, 7 Jun 2012 16:01:54 +0530
Subject: [IMP]improve general apply button red color in configuration wizard

bzr revid: pja@tinyerp.com-20120607103154-db1r7fzlz82prgb8
---
 addons/knowledge/res_config_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/knowledge/res_config_view.xml')

diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index d1debeaf562..8fda1fe42f8 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Knowledge" layout="manual">
                     <header>
-                        <button string="Apply" type="object" name="execute"/>
+                        <button string="Apply" type="object" name="execute" class="oe_form_button_hi"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
                     <sheet layout="auto">
-- 
cgit v1.2.3


From e1c255b71777947465141c1e935c46660bcefcd0 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 13 Jun 2012 15:36:07 +0530
Subject: [FIX]: put group in knowledge module

bzr revid: atp@tinyerp.com-20120613100607-rlrb95zky2edqzx7
---
 addons/knowledge/res_config_view.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'addons/knowledge/res_config_view.xml')

diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index 963f6ecf330..c13dee9f9c2 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -12,6 +12,7 @@
                         <button string="Cancel" special="cancel"/>
                     </header>
                     <sheet layout="auto">
+                       <group>
                         <separator string="Documents" colspan="4"/>
                         <field name="module_document"/>
                         <newline/>
@@ -22,6 +23,7 @@
                         <field name="module_wiki_faq"/>
                         <newline/>
                         <field name="module_wiki_quality_manual"/>
+                        </group>
                     </sheet>
                 </form>
             </field>
-- 
cgit v1.2.3


From 12ae053fba1389f3352c4ae7de9f2f797417c246 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Mon, 25 Jun 2012 15:55:04 +0200
Subject: [IMP] in all config wizards, add class 'oe_highlight_on_dirty' on
 button 'Apply'

bzr revid: rco@openerp.com-20120625135504-0f03j2j6p7d1pp7l
---
 addons/knowledge/res_config_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/knowledge/res_config_view.xml')

diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index 1e40022171d..32569a3d545 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Knowledge" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
                         <button string="Cancel" special="cancel"/>
                     </header>
                     <sheet>
-- 
cgit v1.2.3


From 0806d443e823af7dbc90405ba7446dc2f4f7f2b1 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 26 Jun 2012 09:49:46 +0200
Subject: [IMP] config wizards: add an action on button 'Cancel' to get the
 expected behavior

bzr revid: rco@openerp.com-20120626074946-a1tzebh85ta6v75l
---
 addons/knowledge/res_config_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/knowledge/res_config_view.xml')

diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index 32569a3d545..80d13e6283a 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -9,7 +9,7 @@
                 <form string="Configure Knowledge" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" special="cancel"/>
+                        <button string="Cancel" type="object" name="cancel"/>
                     </header>
                     <sheet>
                         <group>
-- 
cgit v1.2.3


From a4b94dbee6fe6ec1dd7aaa5f66186a2842d6a101 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Wed, 27 Jun 2012 19:49:17 +0530
Subject: [USA] add cancel button

bzr revid: rma@tinyerp.com-20120627141917-bs9bg2j3dasy9n1y
---
 addons/knowledge/res_config_view.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'addons/knowledge/res_config_view.xml')

diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index 80d13e6283a..a478d044266 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -9,7 +9,9 @@
                 <form string="Configure Knowledge" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
-                        <button string="Cancel" type="object" name="cancel"/>
+                        or 
+                        <button string="Cancel" type="object" name="cancel" class="oe_link"/>
+
                     </header>
                     <sheet>
                         <group>
-- 
cgit v1.2.3


From 90094ff19b4d015cc64114467aeaf016ac36650c Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Wed, 27 Jun 2012 20:20:49 +0530
Subject: [FIX] setting cancel link

bzr revid: jam@tinyerp.com-20120627145049-hu0h8x0ui3d74sz0
---
 addons/knowledge/res_config_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/knowledge/res_config_view.xml')

diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index a478d044266..7da1ecbe350 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -10,7 +10,7 @@
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
                         or 
-                        <button string="Cancel" type="object" name="cancel" class="oe_link"/>
+                        <button string="Cancel" type="object" name="cancel" class="oe_link" class="oe_link"/>
 
                     </header>
                     <sheet>
-- 
cgit v1.2.3


From c44963d631fe49eed02aacbabe97924e5a00e26c Mon Sep 17 00:00:00 2001
From: Jigar Amin - OpenERP <jam@tinyerp.com>
Date: Thu, 28 Jun 2012 11:47:20 +0530
Subject: [FIX] added missing or and removed duplicate class

bzr revid: jam@tinyerp.com-20120628061720-1y5oacjqehjlplqc
---
 addons/knowledge/res_config_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/knowledge/res_config_view.xml')

diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index 7da1ecbe350..a478d044266 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -10,7 +10,7 @@
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
                         or 
-                        <button string="Cancel" type="object" name="cancel" class="oe_link" class="oe_link"/>
+                        <button string="Cancel" type="object" name="cancel" class="oe_link"/>
 
                     </header>
                     <sheet>
-- 
cgit v1.2.3


From 5133bee1d529722cd690188d61d51debd2d91968 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Fri, 29 Jun 2012 10:30:24 +0200
Subject: [FIX] in form views, replace class 'oe_highlight_on_dirty' by
 'oe_highlight'

bzr revid: rco@openerp.com-20120629083024-rqhtbf9melkygg0m
---
 addons/knowledge/res_config_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/knowledge/res_config_view.xml')

diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index a478d044266..ad3488deb98 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Configure Knowledge" version="7.0">
                     <header>
-                        <button string="Apply" type="object" name="execute" class="oe_highlight_on_dirty"/>
+                        <button string="Apply" type="object" name="execute" class="oe_highlight"/>
                         or 
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
 
-- 
cgit v1.2.3