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
---
 addons/document_page/document_page_view.xml | 294 ++++++++++++++++++++++++++++
 1 file changed, 294 insertions(+)
 create mode 100644 addons/document_page/document_page_view.xml

(limited to 'addons/document_page/document_page_view.xml')

diff --git a/addons/document_page/document_page_view.xml b/addons/document_page/document_page_view.xml
new file mode 100644
index 00000000000..74d6f0b8719
--- /dev/null
+++ b/addons/document_page/document_page_view.xml
@@ -0,0 +1,294 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+       <menuitem name="Knowledge" icon="terp-stock"
+           id="knowledge.menu_document" sequence="19" />
+
+       <menuitem name="Configuration"
+           id="knowledge.menu_document_configuration"
+           parent="knowledge.menu_document" sequence="50"/>
+
+       <menuitem name="Document Page" id="menu_wiki_configuration"
+           parent="knowledge.menu_document_configuration" sequence="2" />
+
+
+        <!--  Wiki Groups Tree view -->
+       <record model="ir.ui.view" id="wiki_group_tree">
+            <field name="name">document.page.type.tree</field>
+            <field name="model">document.page.type</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Document type">
+                    <field name="name"/>
+                </tree>
+            </field>
+        </record>
+
+        <!--  Wiki Groups Form view -->
+        <record model="ir.ui.view" id="wiki_group_form">
+            <field name="name">document_page_type.form</field>
+            <field name="model">document.page.type</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Document Type" version="7.0">
+                	<sheet string="Document Page Type">
+                    	<div class="oe_right oe_button_box">
+                    		<button
+	                        name="%(document_page.action_wiki_create_menu)d"
+	                         string="Create Menu"
+	                          type="action"
+	                          attrs="{'invisible':[('menu_id','!=',False)]}"/>
+	                     <button
+	                         name="open_document_page"
+	                         string="Open Document Page"
+	                          type="object"/>
+                    	</div>
+                    <group col="4" colspan="3" >
+                        <field name="name"/>
+                        <field name="create_date" readonly="2"/>
+                    </group>
+                    <group col="2" colspan="1">
+                        <field name="method"/>
+                        <field name="home" domain="[('parent_id','=',active_id)]"
+                            attrs="{'required':[('method','=','page')], 'readonly':[('method','!=','page')]}" />
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Notes">
+                            <field name="notes" colspan="4" nolabel="1"/>
+                        </page>
+                        <page string="Configuration">
+                            <separator string="Page Template" colspan="4"/>
+                            <field name="content_template" colspan="4" nolabel="1" widget="text_wiki"/>
+                        </page>
+                    </notebook>
+                     <field name="menu_id"/>
+                    </sheet>
+                     
+                </form>
+            </field>
+        </record>
+
+        <!--  Wiki Groups Action  -->
+        <record model="ir.actions.act_window" id="action_wiki_groups">
+            <field name="name">Document Type</field>
+            <field name="res_model">document.page.type</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+      <menuitem name="Types"
+            parent="menu_wiki_configuration"
+            id="menu_action_wiki_groups"
+            action="action_wiki_groups"/>
+
+        <record model="ir.actions.act_window" id="action_wiki_groups_browse">
+            <field name="name">Document Type</field>
+            <field name="res_model">document.page.type</field>
+            <field name="view_type">tree</field>
+        </record>
+
+        <!-- wiki Tree view For child -->
+        <record id="view_wiki_tree_children" model="ir.ui.view">
+            <field name="name">document.page.tree.children</field>
+            <field name="model">document.page</field>
+            <field name="type">tree</field>
+            <field name="field_parent">child_ids</field>
+            <field name="priority">100</field>
+            <field name="arch" type="xml">
+                <tree string="Document Page">
+                    <field name="name"/>
+                    <field name="review"/>
+                    <field name="write_uid"/>
+                    <field name="write_date"/>
+                </tree>
+            </field>
+        </record>
+
+        <!-- wiki Tree view  -->
+        <record model="ir.ui.view" id="view_wiki_tree">
+            <field name="name">document.page.tree</field>
+            <field name="model">document.page</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Document Page">
+                    <field name="name"/>
+                    <field name="review"/>
+                    <field name="create_uid" invisible="context.get('create_uid',False)"/>
+                    <field name="write_uid"/>
+                    <field name="parent_id"/>
+                    <field name="write_date" groups="base.group_no_one"/>
+                </tree>
+            </field>
+        </record>
+
+        <!-- wiki Form view  -->
+        <record model="ir.ui.view" id="view_wiki_form">
+            <field name="name">document.page.form</field>
+            <field name="model">document.page</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Document Page" version="7.0">
+                    <sheet string="Document Page">
+                    	<div class="oe_right oe_button_box">
+                    		<button
+	                        name="%(document_page.action_wiki_create_menu)d"
+	                         string="Create Menu"
+	                          type="action"
+	                          class="oe_edit_only"/>
+                    	</div>
+                    	<label for="name" class="oe_edit_only"/>
+                                <h1><field name="name" select="1" /></h1>
+						<label for="type" class="oe_edit_only"/>
+	                            	<field name="type" class="oe_edit_only"/>
+                        <notebook colspan="4" >
+                            <page string="Content">
+	                            <field name="index" attrs="{'invisible':[('type','=','normal')]}" class="oe_edit_only"/>
+	                            <field name="content" nolabel="1" colspan="4" widget="text_wiki" placeholder="Wiki Content" attrs="{'invisible':[('type','=','index')]}"/>
+	                            <field name="content_template" attrs="{'invisible':[('type','!=','index')]}"/>
+	                            <label for="minor_edit" class="oe_edit_only"/>
+	                            	<field name="minor_edit" class="oe_edit_only"/>
+                            </page>
+                            <page string="History" groups="base.group_no_one" >
+	                            <field name="history_ids" nolabel="1"/>
+                            	<separator colspan="4" string="Modification Information"/>
+                            	<label for="write_date" readonly="1"/>
+	                            	<field name="write_date"/>
+                            </page>
+                            <page string="Configuration">
+                            	<label for="parent_id" />
+	                            	<field name="parent_id" on_change="onchange_parent_id(parent_id,content)" string="Topic" />
+	                            <label for="review" />
+	                            	<field name="review"/>
+                            	<separator colspan="4" string="Meta Information"/>
+                            	<label for="tags" />
+	                            	<field name="tags"/>
+                            </page>
+                        </notebook>
+                        
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <!-- wiki Search view  -->
+        <record id="view_wiki_filter" model="ir.ui.view">
+            <field name="name">document.page.search</field>
+            <field name="model">document.page</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Document Page">
+                    <field name="name"
+                        filter_domain="['|', '|', ('name','ilike',self), ('tags','ilike',self)]"
+                        string="Document Page"/>
+                    <separator orientation="vertical"/>
+                    <field name="write_date" groups="base.group_no_one"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-gtk-jump-to-ltr" string="Need Review" domain="[('review','=',True)]"/>
+                    <separator orientation="vertical"/>
+                    <field name="write_uid"/>
+                    <field name="parent_id"/>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter icon="terp-folder-blue" string="Document Type" domain="[]" context="{'group_by':'parent_id'}"/>
+                        <filter icon="terp-personal" string="Author" domain="[]" context="{'group_by':'create_uid'}"/>
+                        <filter icon="terp-personal+" string="Last Contributor" domain="[]" context="{'group_by':'write_uid'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <!-- search page for wiki -->
+        <record model="ir.actions.act_window" id="action_wiki">
+            <field name="name">Document Pages</field>
+            <field name="res_model">document.page</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_wiki_tree"/>
+            <field name="search_view_id" ref="view_wiki_filter"/>
+            <field name="help">With Wiki Pages you can share ideas and questions with your coworkers. You can create a new document that can be linked to one or several applications (CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. There is a basic wiki editing for text format.</field>
+        </record>
+
+        <menuitem parent="knowledge.menu_document2"
+            id="menu_action_document_page" name="Document Pages"
+            action="action_wiki" />
+
+        <!--  Pages Waiting Review -->
+        <record model="ir.actions.act_window" id="action_wiki_review">
+            <field name="name">Pages Waiting Review</field>
+            <field name="res_model">document.page</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_wiki_tree"/>
+            <field name="domain">[('review','=',True)]</field>
+            <field name="filter" eval="True"/>
+        </record>
+
+        <!-- History Tree view -->
+        <record model="ir.ui.view" id="view_wiki_history_tree">
+            <field name="name">document.page.history.tree</field>
+            <field name="model">document.page.history</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Document History">
+                    <field name="create_date"/>
+                    <field name="write_uid"/>
+                    <field name="minor_edit" groups="base.group_no_one"/>
+                    <field name="summary"/>
+                </tree>
+            </field>
+        </record>
+
+        <!-- History Form view  -->
+        <record model="ir.ui.view" id="wiki_history_form">
+            <field name="name">document.page.history.form</field>
+            <field name="model">document.page.history</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Document Page History" version="7.0">
+                    <sheet>
+                        <label for="document_id" class="oe_edit_only"/>
+                                <h1><field name="document_id" select="1" /></h1>
+                        <label for="summary" class="oe_edit_only"/>
+                        	<field name="summary" colspan="4" />
+                        <label for="content" class="oe_edit_only"/>
+                        	<field name="content" colspan="4" nolabel="1" widget="text_wiki" onchange="onchange_content(content)"/>
+                        <label for="create_date" class="oe_edit_only"/>
+                        	<field name="create_date" readonly="1"/>
+                        <label for="minor_edit" class="oe_edit_only" groups="base.group_no_one"/>
+                        	<field name="minor_edit" groups="base.group_no_one"/>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <!-- History Action  -->
+        <record model="ir.actions.act_window" id="action_history">
+            <field name="name">All Page Histories</field>
+            <field name="res_model">document.page.history</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <act_window 
+            context="{'search_default_document_id': [active_id], 'default_document_id': active_id}"
+            id="act_wiki_wiki_history"
+            name="Page History"
+            res_model="document.page.history"
+            src_model="document.page"/>
+
+        <act_window
+            context="{'search_default_parent_id': [active_id], 'default_parent_id': active_id}"
+            id="act_wiki_group_open"
+            name="Search Page"
+            res_model="document.page"
+            src_model="document.page.type"/>
+
+        <record id="ir_open_wiki_pages" model="ir.values">
+            <field name="key2">tree_but_open</field>
+            <field name="model">document.page.type</field>
+            <field name="name">Search a Page</field>
+             <field eval="'ir.actions.wizard,%d'%action_view_wiki_wiki_page_open" name="value"/>
+        </record>
+
+    </data>
+</openerp>
-- 
cgit v1.2.3


From 9a5f47946df8f42badd12bf6169c04ba80ab0e4b Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 9 Aug 2012 15:29:01 +0200
Subject: page work in progress view

bzr revid: al@openerp.com-20120809132901-0zjj2zeji8bsk962
---
 addons/document_page/document_page_view.xml | 184 +++++-----------------------
 1 file changed, 31 insertions(+), 153 deletions(-)

(limited to 'addons/document_page/document_page_view.xml')

diff --git a/addons/document_page/document_page_view.xml b/addons/document_page/document_page_view.xml
index 74d6f0b8719..023dab44013 100644
--- a/addons/document_page/document_page_view.xml
+++ b/addons/document_page/document_page_view.xml
@@ -1,95 +1,12 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-       <menuitem name="Knowledge" icon="terp-stock"
-           id="knowledge.menu_document" sequence="19" />
+       <menuitem name="Knowledge" id="knowledge.menu_document"/>
+       <menuitem name="Pages" id="menu_wiki" parent="knowledge.menu_document" sequence="20" />
 
-       <menuitem name="Configuration"
-           id="knowledge.menu_document_configuration"
-           parent="knowledge.menu_document" sequence="50"/>
-
-       <menuitem name="Document Page" id="menu_wiki_configuration"
-           parent="knowledge.menu_document_configuration" sequence="2" />
-
-
-        <!--  Wiki Groups Tree view -->
-       <record model="ir.ui.view" id="wiki_group_tree">
-            <field name="name">document.page.type.tree</field>
-            <field name="model">document.page.type</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Document type">
-                    <field name="name"/>
-                </tree>
-            </field>
-        </record>
-
-        <!--  Wiki Groups Form view -->
-        <record model="ir.ui.view" id="wiki_group_form">
-            <field name="name">document_page_type.form</field>
-            <field name="model">document.page.type</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Document Type" version="7.0">
-                	<sheet string="Document Page Type">
-                    	<div class="oe_right oe_button_box">
-                    		<button
-	                        name="%(document_page.action_wiki_create_menu)d"
-	                         string="Create Menu"
-	                          type="action"
-	                          attrs="{'invisible':[('menu_id','!=',False)]}"/>
-	                     <button
-	                         name="open_document_page"
-	                         string="Open Document Page"
-	                          type="object"/>
-                    	</div>
-                    <group col="4" colspan="3" >
-                        <field name="name"/>
-                        <field name="create_date" readonly="2"/>
-                    </group>
-                    <group col="2" colspan="1">
-                        <field name="method"/>
-                        <field name="home" domain="[('parent_id','=',active_id)]"
-                            attrs="{'required':[('method','=','page')], 'readonly':[('method','!=','page')]}" />
-                    </group>
-                    <notebook colspan="4">
-                        <page string="Notes">
-                            <field name="notes" colspan="4" nolabel="1"/>
-                        </page>
-                        <page string="Configuration">
-                            <separator string="Page Template" colspan="4"/>
-                            <field name="content_template" colspan="4" nolabel="1" widget="text_wiki"/>
-                        </page>
-                    </notebook>
-                     <field name="menu_id"/>
-                    </sheet>
-                     
-                </form>
-            </field>
-        </record>
-
-        <!--  Wiki Groups Action  -->
-        <record model="ir.actions.act_window" id="action_wiki_groups">
-            <field name="name">Document Type</field>
-            <field name="res_model">document.page.type</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-      <menuitem name="Types"
-            parent="menu_wiki_configuration"
-            id="menu_action_wiki_groups"
-            action="action_wiki_groups"/>
-
-        <record model="ir.actions.act_window" id="action_wiki_groups_browse">
-            <field name="name">Document Type</field>
-            <field name="res_model">document.page.type</field>
-            <field name="view_type">tree</field>
-        </record>
-
-        <!-- wiki Tree view For child -->
+        <!-- wiki tree view -->
         <record id="view_wiki_tree_children" model="ir.ui.view">
-            <field name="name">document.page.tree.children</field>
+            <field name="name">document.page.tree</field>
             <field name="model">document.page</field>
             <field name="type">tree</field>
             <field name="field_parent">child_ids</field>
@@ -97,30 +14,25 @@
             <field name="arch" type="xml">
                 <tree string="Document Page">
                     <field name="name"/>
-                    <field name="review"/>
                     <field name="write_uid"/>
                     <field name="write_date"/>
                 </tree>
             </field>
         </record>
-
-        <!-- wiki Tree view  -->
+        <!-- wiki list view  -->
         <record model="ir.ui.view" id="view_wiki_tree">
-            <field name="name">document.page.tree</field>
+            <field name="name">document.page.list</field>
             <field name="model">document.page</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Document Page">
                     <field name="name"/>
-                    <field name="review"/>
-                    <field name="create_uid" invisible="context.get('create_uid',False)"/>
-                    <field name="write_uid"/>
                     <field name="parent_id"/>
-                    <field name="write_date" groups="base.group_no_one"/>
+                    <field name="write_uid"/>
+                    <field name="write_date"/>
                 </tree>
             </field>
         </record>
-
         <!-- wiki Form view  -->
         <record model="ir.ui.view" id="view_wiki_form">
             <field name="name">document.page.form</field>
@@ -129,47 +41,31 @@
             <field name="arch" type="xml">
                 <form string="Document Page" version="7.0">
                     <sheet string="Document Page">
-                    	<div class="oe_right oe_button_box">
-                    		<button
-	                        name="%(document_page.action_wiki_create_menu)d"
-	                         string="Create Menu"
-	                          type="action"
-	                          class="oe_edit_only"/>
-                    	</div>
-                    	<label for="name" class="oe_edit_only"/>
-                                <h1><field name="name" select="1" /></h1>
-						<label for="type" class="oe_edit_only"/>
-	                            	<field name="type" class="oe_edit_only"/>
+                        <div class="oe_right oe_button_box">
+                            <button name="%(document_page.action_wiki_create_menu)d" string="Create Menu" type="action" class="oe_edit_only"/>
+                        </div>
+                        <label for="name" class="oe_edit_only"/>
+                        <h1><field name="name" select="1" /></h1>
+                        <label for="type" class="oe_edit_only"/>
+                        <field name="type" class="oe_edit_only"/>
+                        <label for="parent_id" />
+                        <field name="parent_id" on_change="onchange_parent_id(parent_id,content)" string="Topic" />
                         <notebook colspan="4" >
                             <page string="Content">
-	                            <field name="index" attrs="{'invisible':[('type','=','normal')]}" class="oe_edit_only"/>
-	                            <field name="content" nolabel="1" colspan="4" widget="text_wiki" placeholder="Wiki Content" attrs="{'invisible':[('type','=','index')]}"/>
-	                            <field name="content_template" attrs="{'invisible':[('type','!=','index')]}"/>
-	                            <label for="minor_edit" class="oe_edit_only"/>
-	                            	<field name="minor_edit" class="oe_edit_only"/>
+                                <field name="display_content" attrs="{'invisible':[('type','=','normal')]}"/>
+                                <field name="content" placeholder="e.g. Once upon a time..." class="oe_edit_only" attrs="{'invisible':[('type','=','index')]}"/>
                             </page>
                             <page string="History" groups="base.group_no_one" >
-	                            <field name="history_ids" nolabel="1"/>
-                            	<separator colspan="4" string="Modification Information"/>
-                            	<label for="write_date" readonly="1"/>
-	                            	<field name="write_date"/>
-                            </page>
-                            <page string="Configuration">
-                            	<label for="parent_id" />
-	                            	<field name="parent_id" on_change="onchange_parent_id(parent_id,content)" string="Topic" />
-	                            <label for="review" />
-	                            	<field name="review"/>
-                            	<separator colspan="4" string="Meta Information"/>
-                            	<label for="tags" />
-	                            	<field name="tags"/>
+                                <field name="history_ids" nolabel="1"/>
+                                <separator colspan="4" string="Modification Information"/>
+                                <label for="write_date" readonly="1"/>
+                                <field name="write_date"/>
                             </page>
                         </notebook>
-                        
                     </sheet>
                 </form>
             </field>
         </record>
-
         <!-- wiki Search view  -->
         <record id="view_wiki_filter" model="ir.ui.view">
             <field name="name">document.page.search</field>
@@ -177,9 +73,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Document Page">
-                    <field name="name"
-                        filter_domain="['|', '|', ('name','ilike',self), ('tags','ilike',self)]"
-                        string="Document Page"/>
+                    <field name="name" filter_domain="['|', '|', ('name','ilike',self), ('content','ilike',self)]" string="Document Page"/>
                     <separator orientation="vertical"/>
                     <field name="write_date" groups="base.group_no_one"/>
                     <separator orientation="vertical"/>
@@ -196,7 +90,6 @@
                 </search>
             </field>
         </record>
-
         <!-- search page for wiki -->
         <record model="ir.actions.act_window" id="action_wiki">
             <field name="name">Document Pages</field>
@@ -205,23 +98,9 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_wiki_tree"/>
             <field name="search_view_id" ref="view_wiki_filter"/>
-            <field name="help">With Wiki Pages you can share ideas and questions with your coworkers. You can create a new document that can be linked to one or several applications (CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. There is a basic wiki editing for text format.</field>
-        </record>
-
-        <menuitem parent="knowledge.menu_document2"
-            id="menu_action_document_page" name="Document Pages"
-            action="action_wiki" />
-
-        <!--  Pages Waiting Review -->
-        <record model="ir.actions.act_window" id="action_wiki_review">
-            <field name="name">Pages Waiting Review</field>
-            <field name="res_model">document.page</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_wiki_tree"/>
-            <field name="domain">[('review','=',True)]</field>
-            <field name="filter" eval="True"/>
+            <field name="help">Create web pages</field>
         </record>
+        <menuitem parent="menu_wiki" id="menu_page" name="Document Pages" action="action_page"/>
 
         <!-- History Tree view -->
         <record model="ir.ui.view" id="view_wiki_history_tree">
@@ -237,7 +116,6 @@
                 </tree>
             </field>
         </record>
-
         <!-- History Form view  -->
         <record model="ir.ui.view" id="wiki_history_form">
             <field name="name">document.page.history.form</field>
@@ -247,15 +125,15 @@
                 <form string="Document Page History" version="7.0">
                     <sheet>
                         <label for="document_id" class="oe_edit_only"/>
-                                <h1><field name="document_id" select="1" /></h1>
+                        <h1><field name="document_id" select="1" /></h1>
                         <label for="summary" class="oe_edit_only"/>
-                        	<field name="summary" colspan="4" />
+                        <field name="summary" colspan="4" />
                         <label for="content" class="oe_edit_only"/>
-                        	<field name="content" colspan="4" nolabel="1" widget="text_wiki" onchange="onchange_content(content)"/>
+                        <field name="content" colspan="4" nolabel="1" widget="text_wiki" onchange="onchange_content(content)"/>
                         <label for="create_date" class="oe_edit_only"/>
-                        	<field name="create_date" readonly="1"/>
+                        <field name="create_date" readonly="1"/>
                         <label for="minor_edit" class="oe_edit_only" groups="base.group_no_one"/>
-                        	<field name="minor_edit" groups="base.group_no_one"/>
+                        <field name="minor_edit" groups="base.group_no_one"/>
                     </sheet>
                 </form>
             </field>
-- 
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
---
 addons/document_page/document_page_view.xml | 112 ++++++++++------------------
 1 file changed, 41 insertions(+), 71 deletions(-)

(limited to 'addons/document_page/document_page_view.xml')

diff --git a/addons/document_page/document_page_view.xml b/addons/document_page/document_page_view.xml
index 023dab44013..3b019e471f5 100644
--- a/addons/document_page/document_page_view.xml
+++ b/addons/document_page/document_page_view.xml
@@ -20,7 +20,7 @@
             </field>
         </record>
         <!-- wiki list view  -->
-        <record model="ir.ui.view" id="view_wiki_tree">
+        <record id="view_wiki_tree" model="ir.ui.view">
             <field name="name">document.page.list</field>
             <field name="model">document.page</field>
             <field name="type">tree</field>
@@ -34,65 +34,57 @@
             </field>
         </record>
         <!-- wiki Form view  -->
-        <record model="ir.ui.view" id="view_wiki_form">
+        <record id="view_wiki_form" model="ir.ui.view">
             <field name="name">document.page.form</field>
             <field name="model">document.page</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Document Page" version="7.0">
-                    <sheet string="Document Page">
-                        <div class="oe_right oe_button_box">
-                            <button name="%(document_page.action_wiki_create_menu)d" string="Create Menu" type="action" class="oe_edit_only"/>
-                        </div>
+                    <div class="oe_right oe_button_box">
+                        <button name="%(document_page.action_wiki_create_menu)d" string="Create Menu" type="action" class="oe_edit_only"/>
+                        <button name="%(document_page.action_wiki_create_menu)d" string="History" type="action" class="oe_edit_only"/>
+                    </div>
+                    <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>
                         <h1><field name="name" select="1" /></h1>
-                        <label for="type" class="oe_edit_only"/>
-                        <field name="type" class="oe_edit_only"/>
-                        <label for="parent_id" />
-                        <field name="parent_id" on_change="onchange_parent_id(parent_id,content)" string="Topic" />
-                        <notebook colspan="4" >
-                            <page string="Content">
-                                <field name="display_content" attrs="{'invisible':[('type','=','normal')]}"/>
-                                <field name="content" placeholder="e.g. Once upon a time..." class="oe_edit_only" attrs="{'invisible':[('type','=','index')]}"/>
-                            </page>
-                            <page string="History" groups="base.group_no_one" >
-                                <field name="history_ids" nolabel="1"/>
-                                <separator colspan="4" string="Modification Information"/>
-                                <label for="write_date" readonly="1"/>
-                                <field name="write_date"/>
-                            </page>
-                        </notebook>
-                    </sheet>
+                    </div>
+                    <group class="oe_edit_only">
+                        <group>
+                            <field name="parent_id" on_change="onchange_parent_id(parent_id,content)" string="Section"/>
+                            <field name="type"/>
+                        </group>
+                        <group>
+                            <field name="write_uid" groups="base.group_no_one"/>
+                            <field name="write_date" groups="base.group_no_one"/>
+                        </group>
+                    </group>
+                    <label for="content" class="oe_edit_only" string="Template" attrs="{'invisible':[('type','=','content')]}"/>
+                    <field name="content" placeholder="e.g. Once upon a time..." class="oe_edit_only"/>
+                    <field name="display_content" widget="html"/>
                 </form>
             </field>
         </record>
-        <!-- wiki Search view  -->
+        <!-- page Search view  -->
         <record id="view_wiki_filter" model="ir.ui.view">
             <field name="name">document.page.search</field>
             <field name="model">document.page</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Document Page">
-                    <field name="name" filter_domain="['|', '|', ('name','ilike',self), ('content','ilike',self)]" string="Document Page"/>
-                    <separator orientation="vertical"/>
-                    <field name="write_date" groups="base.group_no_one"/>
-                    <separator orientation="vertical"/>
-                    <filter icon="terp-gtk-jump-to-ltr" string="Need Review" domain="[('review','=',True)]"/>
-                    <separator orientation="vertical"/>
+                    <field name="name" string="Content" filter_domain="['|', '|', ('name','ilike',self), ('content','ilike',self)]"/>
                     <field name="write_uid"/>
                     <field name="parent_id"/>
-                    <newline/>
                     <group expand="0" string="Group By...">
-                        <filter icon="terp-folder-blue" string="Document Type" domain="[]" context="{'group_by':'parent_id'}"/>
-                        <filter icon="terp-personal" string="Author" domain="[]" context="{'group_by':'create_uid'}"/>
-                        <filter icon="terp-personal+" string="Last Contributor" domain="[]" context="{'group_by':'write_uid'}"/>
+                        <filter string="Document Type" domain="[]" context="{'group_by':'parent_id'}"/>
+                        <filter string="Author" domain="[]" context="{'group_by':'create_uid'}"/>
+                        <filter string="Last Contributor" domain="[]" context="{'group_by':'write_uid'}"/>
                     </group>
                 </search>
             </field>
         </record>
-        <!-- search page for wiki -->
-        <record model="ir.actions.act_window" id="action_wiki">
-            <field name="name">Document Pages</field>
+        <!-- page action -->
+        <record id="action_page" model="ir.actions.act_window">
+            <field name="name">Pages</field>
             <field name="res_model">document.page</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -100,7 +92,7 @@
             <field name="search_view_id" ref="view_wiki_filter"/>
             <field name="help">Create web pages</field>
         </record>
-        <menuitem parent="menu_wiki" id="menu_page" name="Document Pages" action="action_page"/>
+        <menuitem parent="menu_wiki" id="menu_page" name="Pages" action="action_page"/>
 
         <!-- History Tree view -->
         <record model="ir.ui.view" id="view_wiki_history_tree">
@@ -110,9 +102,8 @@
             <field name="arch" type="xml">
                 <tree string="Document History">
                     <field name="create_date"/>
-                    <field name="write_uid"/>
-                    <field name="minor_edit" groups="base.group_no_one"/>
-                    <field name="summary"/>
+                    <field name="create_uid"/>
+                    <field name="page_id"/>
                 </tree>
             </field>
         </record>
@@ -123,50 +114,29 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Document Page History" version="7.0">
-                    <sheet>
-                        <label for="document_id" class="oe_edit_only"/>
-                        <h1><field name="document_id" select="1" /></h1>
-                        <label for="summary" class="oe_edit_only"/>
-                        <field name="summary" colspan="4" />
-                        <label for="content" class="oe_edit_only"/>
-                        <field name="content" colspan="4" nolabel="1" widget="text_wiki" onchange="onchange_content(content)"/>
-                        <label for="create_date" class="oe_edit_only"/>
-                        <field name="create_date" readonly="1"/>
-                        <label for="minor_edit" class="oe_edit_only" groups="base.group_no_one"/>
-                        <field name="minor_edit" groups="base.group_no_one"/>
-                    </sheet>
+                    <label for="page_id" class="oe_edit_only"/>
+                    <h1><field name="page_id" select="1" /></h1>
+                    <label for="create_date" class="oe_edit_only"/>
+                    <field name="create_date" readonly="1"/>
+                    <label for="content" class="oe_edit_only"/>
+                    <field name="content" colspan="4"/>
                 </form>
             </field>
         </record>
-
         <!-- History Action  -->
         <record model="ir.actions.act_window" id="action_history">
-            <field name="name">All Page Histories</field>
+            <field name="name">Page history</field>
             <field name="res_model">document.page.history</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-
+        <menuitem parent="menu_wiki" id="menu_page_history" name="Pages history" action="action_history" groups="base.group_no_one"/>
         <act_window 
-            context="{'search_default_document_id': [active_id], 'default_document_id': active_id}"
             id="act_wiki_wiki_history"
+            context="{'search_default_page_id': [active_id], 'default_page_id': active_id}"
             name="Page History"
             res_model="document.page.history"
             src_model="document.page"/>
 
-        <act_window
-            context="{'search_default_parent_id': [active_id], 'default_parent_id': active_id}"
-            id="act_wiki_group_open"
-            name="Search Page"
-            res_model="document.page"
-            src_model="document.page.type"/>
-
-        <record id="ir_open_wiki_pages" model="ir.values">
-            <field name="key2">tree_but_open</field>
-            <field name="model">document.page.type</field>
-            <field name="name">Search a Page</field>
-             <field eval="'ir.actions.wizard,%d'%action_view_wiki_wiki_page_open" name="value"/>
-        </record>
-
     </data>
 </openerp>
-- 
cgit v1.2.3


From 4fb193140b5cd39c120ae3c3e19c64f153866217 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 10 Aug 2012 02:31:04 +0200
Subject: page minor fixes

bzr revid: al@openerp.com-20120810003104-9kjue6bigt2ayfsu
---
 addons/document_page/document_page_view.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'addons/document_page/document_page_view.xml')

diff --git a/addons/document_page/document_page_view.xml b/addons/document_page/document_page_view.xml
index 3b019e471f5..3cfd3b9665b 100644
--- a/addons/document_page/document_page_view.xml
+++ b/addons/document_page/document_page_view.xml
@@ -56,9 +56,13 @@
                         <group>
                             <field name="write_uid" groups="base.group_no_one"/>
                             <field name="write_date" groups="base.group_no_one"/>
+                            <field name="menu_id" groups="base.group_no_one"/>
                         </group>
                     </group>
-                    <label for="content" class="oe_edit_only" string="Template" attrs="{'invisible':[('type','=','content')]}"/>
+                    <div class="oe_edit_only" attrs="{'invisible':[('type','=','content')]}">
+                        <label for="content" string="Template"/>
+                        This will be used as template content for all new page of this section.
+                    </div>
                     <field name="content" placeholder="e.g. Once upon a time..." class="oe_edit_only"/>
                     <field name="display_content" widget="html"/>
                 </form>
@@ -71,7 +75,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Document Page">
-                    <field name="name" string="Content" filter_domain="['|', '|', ('name','ilike',self), ('content','ilike',self)]"/>
+                    <field name="name" string="Content" filter_domain="['|', ('name','ilike',self), ('content','ilike',self)]"/>
                     <field name="write_uid"/>
                     <field name="parent_id"/>
                     <group expand="0" string="Group By...">
-- 
cgit v1.2.3


From 4e4a7dcbeec869464a5fb442088217b0d6cb2fb7 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sat, 11 Aug 2012 00:50:46 +0200
Subject: document_page ready

bzr revid: al@openerp.com-20120810225046-qs3liea2s76lh6v0
---
 addons/document_page/document_page_view.xml | 42 ++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 12 deletions(-)

(limited to 'addons/document_page/document_page_view.xml')

diff --git a/addons/document_page/document_page_view.xml b/addons/document_page/document_page_view.xml
index 3cfd3b9665b..53ae52818a8 100644
--- a/addons/document_page/document_page_view.xml
+++ b/addons/document_page/document_page_view.xml
@@ -40,18 +40,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Document Page" version="7.0">
-                    <div class="oe_right oe_button_box">
-                        <button name="%(document_page.action_wiki_create_menu)d" string="Create Menu" type="action" class="oe_edit_only"/>
-                        <button name="%(document_page.action_wiki_create_menu)d" string="History" type="action" class="oe_edit_only"/>
-                    </div>
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>
-                        <h1><field name="name" select="1" /></h1>
+                        <h1><field name="name"/></h1>
+                        <field name="type" invisible="1"/>
                     </div>
                     <group class="oe_edit_only">
                         <group>
-                            <field name="parent_id" on_change="onchange_parent_id(parent_id,content)" string="Section"/>
-                            <field name="type"/>
+                            <field name="parent_id" on_change="onchange_parent_id(parent_id,content)" string="Category"/>
                         </group>
                         <group>
                             <field name="write_uid" groups="base.group_no_one"/>
@@ -64,7 +60,7 @@
                         This will be used as template content for all new page of this section.
                     </div>
                     <field name="content" placeholder="e.g. Once upon a time..." class="oe_edit_only"/>
-                    <field name="display_content" widget="html"/>
+                    <field name="display_content" widget="html" class="oe_view_only"/>
                 </form>
             </field>
         </record>
@@ -87,16 +83,29 @@
             </field>
         </record>
         <!-- page action -->
+        <record id="action_category" model="ir.actions.act_window">
+            <field name="name">Category</field>
+            <field name="res_model">document.page</field>
+            <field name="domain">[('type','=','category')]</field>
+            <field name="context">{'default_type': 'category'}</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_wiki_tree"/>
+            <field name="search_view_id" ref="view_wiki_filter"/>
+        </record>
+        <menuitem id="menu_category" parent="menu_wiki" name="Categories" action="action_category" sequence="10"/>
         <record id="action_page" model="ir.actions.act_window">
             <field name="name">Pages</field>
             <field name="res_model">document.page</field>
+            <field name="domain">[('type','=','content')]</field>
+            <field name="context">{'default_type': 'content'}</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_wiki_tree"/>
             <field name="search_view_id" ref="view_wiki_filter"/>
             <field name="help">Create web pages</field>
         </record>
-        <menuitem parent="menu_wiki" id="menu_page" name="Pages" action="action_page"/>
+        <menuitem id="menu_page" parent="menu_wiki" name="Pages" action="action_page" sequence="20"/>
 
         <!-- History Tree view -->
         <record model="ir.ui.view" id="view_wiki_history_tree">
@@ -134,13 +143,22 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        <menuitem parent="menu_wiki" id="menu_page_history" name="Pages history" action="action_history" groups="base.group_no_one"/>
-        <act_window 
-            id="act_wiki_wiki_history"
+        <menuitem id="menu_page_history" parent="menu_wiki" name="Pages history" action="action_history" sequence="30" groups="base.group_no_one"/>
+        <act_window
+            id="action_related_page_history"
             context="{'search_default_page_id': [active_id], 'default_page_id': active_id}"
+            domain="[('page_id','=',active_id)]"
             name="Page History"
             res_model="document.page.history"
             src_model="document.page"/>
+        <act_window 
+            id="action_related_page_create_menu"
+            name="Create Menu"
+            res_model="document.page.create.menu"
+            target="new"
+            view_type="form"
+            view_mode="form"
+            src_model="document.page"/>
 
     </data>
 </openerp>
-- 
cgit v1.2.3


From 1f4d92ba8ba6f1694ec36246400b9f7d2b7e4934 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sat, 11 Aug 2012 01:13:07 +0200
Subject: fix index

bzr revid: al@openerp.com-20120810231307-w9rgwiaybhm1gdyk
---
 addons/document_page/document_page_view.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'addons/document_page/document_page_view.xml')

diff --git a/addons/document_page/document_page_view.xml b/addons/document_page/document_page_view.xml
index 53ae52818a8..fe890c0c6b8 100644
--- a/addons/document_page/document_page_view.xml
+++ b/addons/document_page/document_page_view.xml
@@ -60,7 +60,9 @@
                         This will be used as template content for all new page of this section.
                     </div>
                     <field name="content" placeholder="e.g. Once upon a time..." class="oe_edit_only"/>
-                    <field name="display_content" widget="html" class="oe_view_only"/>
+                    <div class="oe_document_page">
+                        <field name="display_content" widget="html" class="oe_view_only"/>
+                    </div>
                 </form>
             </field>
         </record>
-- 
cgit v1.2.3


From d2a01d78a4b21a0b37a5decacee3d5443a91d9d6 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sat, 11 Aug 2012 20:34:44 +0200
Subject: fixes css, demo, js

bzr revid: al@openerp.com-20120811183444-0wwagnum2tm964i6
---
 addons/document_page/document_page_view.xml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'addons/document_page/document_page_view.xml')

diff --git a/addons/document_page/document_page_view.xml b/addons/document_page/document_page_view.xml
index fe890c0c6b8..c54be43d226 100644
--- a/addons/document_page/document_page_view.xml
+++ b/addons/document_page/document_page_view.xml
@@ -40,11 +40,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Document Page" version="7.0">
-                    <div class="oe_title">
-                        <label for="name" class="oe_edit_only"/>
-                        <h1><field name="name"/></h1>
-                        <field name="type" invisible="1"/>
-                    </div>
+                    <field name="type" invisible="1"/>
+                    <h1><field name="name" placeholder="Name"/></h1>
                     <group class="oe_edit_only">
                         <group>
                             <field name="parent_id" on_change="onchange_parent_id(parent_id,content)" string="Category"/>
@@ -57,11 +54,11 @@
                     </group>
                     <div class="oe_edit_only" attrs="{'invisible':[('type','=','content')]}">
                         <label for="content" string="Template"/>
-                        This will be used as template content for all new page of this section.
+                        that will be used as a content template for all new page of this category.
                     </div>
                     <field name="content" placeholder="e.g. Once upon a time..." class="oe_edit_only"/>
                     <div class="oe_document_page">
-                        <field name="display_content" widget="html" class="oe_view_only"/>
+                        <field name="display_content" widget="text_wiki" class="oe_view_only"/>
                     </div>
                 </form>
             </field>
-- 
cgit v1.2.3