From 788b1bdb5b2809c44fb814b4ebf67bd23efa6f32 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 3 Aug 2012 17:46:41 +0200
Subject: [REM] correctly rename and remove wiki

bzr revid: al@openerp.com-20120803154641-ocbydlqt7ppjecwn
---
 .../wizard/document_page_show_diff_view.xml        | 41 ++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 addons/document_page/wizard/document_page_show_diff_view.xml

(limited to 'addons/document_page/wizard/document_page_show_diff_view.xml')

diff --git a/addons/document_page/wizard/document_page_show_diff_view.xml b/addons/document_page/wizard/document_page_show_diff_view.xml
new file mode 100644
index 00000000000..9c58242844d
--- /dev/null
+++ b/addons/document_page/wizard/document_page_show_diff_view.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+<!-- Create Index Form view  -->
+
+        <record id="view_wiki_show_diff" model="ir.ui.view">
+            <field name="name">Show Difference</field>
+            <field name="model">wizard.document.page.history.show_diff</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Difference" version="7.0">
+                    <separator string="Notes"/>
+                    <field name="file_path" width="300"/>
+                    <footer>
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+<!-- Create Index Action  -->
+
+        <record id="action_view_wiki_show_diff" model="ir.actions.act_window">
+            <field name="name">Difference</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">wizard.document.page.history.show_diff</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+<!-- Create Index Action Window  -->
+
+         <act_window id="action_view_wiki_show_diff_values"
+            key2="client_action_multi" name="Difference"
+            res_model="wizard.document.page.history.show_diff" src_model="document.page.history"
+            view_mode="form" target="new" view_type="form" />
+
+    </data>
+</openerp>
-- 
cgit v1.2.3


From bda8f3fb7f675957b7e0b1245a21196c11b47865 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 10 Aug 2012 02:09:08 +0200
Subject: page mostly ok

bzr revid: al@openerp.com-20120810000908-ujg81v4mgm22glem
---
 .../wizard/document_page_show_diff_view.xml        | 27 +++++++++++-----------
 1 file changed, 13 insertions(+), 14 deletions(-)

(limited to 'addons/document_page/wizard/document_page_show_diff_view.xml')

diff --git a/addons/document_page/wizard/document_page_show_diff_view.xml b/addons/document_page/wizard/document_page_show_diff_view.xml
index 9c58242844d..c6066669dca 100644
--- a/addons/document_page/wizard/document_page_show_diff_view.xml
+++ b/addons/document_page/wizard/document_page_show_diff_view.xml
@@ -2,25 +2,21 @@
 <openerp>
     <data>
 
-<!-- Create Index Form view  -->
-
+        <!-- Create Index Form view  -->
         <record id="view_wiki_show_diff" model="ir.ui.view">
             <field name="name">Show Difference</field>
             <field name="model">wizard.document.page.history.show_diff</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Difference" version="7.0">
-                    <separator string="Notes"/>
-                    <field name="file_path" width="300"/>
+                    <field name="diff"/>
                     <footer>
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </footer>
                 </form>
             </field>
         </record>
-
-<!-- Create Index Action  -->
-
+        <!-- Create Index Action  -->
         <record id="action_view_wiki_show_diff" model="ir.actions.act_window">
             <field name="name">Difference</field>
             <field name="type">ir.actions.act_window</field>
@@ -29,13 +25,16 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-
-<!-- Create Index Action Window  -->
-
-         <act_window id="action_view_wiki_show_diff_values"
-            key2="client_action_multi" name="Difference"
-            res_model="wizard.document.page.history.show_diff" src_model="document.page.history"
-            view_mode="form" target="new" view_type="form" />
+        <!-- Create Index Action Window  -->
+        <act_window 
+            id="action_view_wiki_show_diff_values"
+            key2="client_action_multi"
+            name="Difference"
+            res_model="wizard.document.page.history.show_diff"
+            src_model="document.page.history"
+            view_mode="form"
+            target="new"
+            view_type="form"/>
 
     </data>
 </openerp>
-- 
cgit v1.2.3