[MERGE]: Merged lp:~openerp-dev/openobject-addons/trunk-page-sheet-improvement-atp-wiki-and-related-modules-bde
bzr revid: atp@tinyerp.com-20120614051536-y88ed435epsli9sc
This commit is contained in:
commit
e73b656874
|
@ -30,7 +30,7 @@
|
|||
<field name="model">wiki.groups</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Wiki Groups">
|
||||
<form string="Wiki Groups" version="7.0">
|
||||
<group col="4" colspan="3" >
|
||||
<field name="name" select="1"/>
|
||||
<field name="create_date" readonly="2"/>
|
||||
|
@ -41,17 +41,18 @@
|
|||
attrs="{'required':[('method','=','page')], 'readonly':[('method','!=','page')]}" />
|
||||
</group>
|
||||
<notebook colspan="4">
|
||||
<page string="Notes">
|
||||
<separator string="Group Description" colspan="4"/>
|
||||
<field name="notes" colspan="4" nolabel="1"/>
|
||||
</page><page string="Configuration">
|
||||
<separator string="Page Template" colspan="4"/>
|
||||
<field name="template" colspan="4" nolabel="1" widget="text_wiki"/>
|
||||
</page>
|
||||
<page string="Notes">
|
||||
<separator string="Group Description" colspan="4"/>
|
||||
<field name="notes" colspan="4" nolabel="1"/>
|
||||
</page>
|
||||
<page string="Configuration">
|
||||
<separator string="Page Template" colspan="4"/>
|
||||
<field name="template" colspan="4" nolabel="1" widget="text_wiki"/>
|
||||
</page>
|
||||
</notebook>
|
||||
<field name="menu_id"/>
|
||||
<button
|
||||
name="%(wiki.action_wiki_create_menu)d"
|
||||
name="%(wiki.action_wiki_create_menu)d"
|
||||
string="Create Menu"
|
||||
type="action"
|
||||
icon="gtk-justify-fill"
|
||||
|
@ -126,30 +127,32 @@
|
|||
<field name="model">wiki.wiki</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Wiki">
|
||||
<group col="6" colspan="4">
|
||||
<field name="name" select="1" colspan="6"/>
|
||||
<field name="group_id" string="Topic" select="1" on_change="onchange_group_id(group_id, text_area)"/>
|
||||
<field name="parent_id" domain="[('group_id','=',group_id)]"/>
|
||||
<field name="section"/>
|
||||
</group>
|
||||
<notebook colspan="4">
|
||||
<page string="Content">
|
||||
<separator colspan="4" string="Page Content"/>
|
||||
<field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/>
|
||||
</page>
|
||||
</notebook>
|
||||
<group col="2" colspan="2" groups="base.group_no_one">
|
||||
<separator colspan="4" string="Modification Information"/>
|
||||
<field name="write_date" readonly="1"/>
|
||||
<field name="minor_edit"/>
|
||||
<field name="review" select="1"/>
|
||||
</group>
|
||||
<group col="2" colspan="2">
|
||||
<separator colspan="4" string="Meta Information"/>
|
||||
<field name="tags" select="1"/>
|
||||
<field name="toc" groups="base.group_no_one"/>
|
||||
</group>
|
||||
<form string="Wiki" version="7.0">
|
||||
<sheet>
|
||||
<group col="6" colspan="4">
|
||||
<field name="name" select="1" colspan="6"/>
|
||||
<field name="group_id" string="Topic" select="1" on_change="onchange_group_id(group_id, text_area)"/>
|
||||
<field name="parent_id" domain="[('group_id','=',group_id)]"/>
|
||||
<field name="section"/>
|
||||
</group>
|
||||
<notebook colspan="4">
|
||||
<page string="Content">
|
||||
<separator colspan="4" string="Page Content"/>
|
||||
<field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/>
|
||||
</page>
|
||||
</notebook>
|
||||
<group col="2" colspan="2" groups="base.group_no_one">
|
||||
<separator colspan="4" string="Modification Information"/>
|
||||
<field name="write_date" readonly="1"/>
|
||||
<field name="minor_edit"/>
|
||||
<field name="review" select="1"/>
|
||||
</group>
|
||||
<group col="2" colspan="2">
|
||||
<separator colspan="4" string="Meta Information"/>
|
||||
<field name="tags" select="1"/>
|
||||
<field name="toc" groups="base.group_no_one"/>
|
||||
</group>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
@ -227,12 +230,14 @@
|
|||
<field name="model">wiki.wiki.history</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Wiki History">
|
||||
<field name="wiki_id" select="1" colspan="4"/>
|
||||
<field name="summary" select="1" colspan="4"/>
|
||||
<field name="text_area" select="1" colspan="4" nolabel="1" widget="text_wiki"/>
|
||||
<field name="create_date" select="1" readonly="1"/>
|
||||
<field name="minor_edit" select="1" groups="base.group_no_one"/>
|
||||
<form string="Wiki History" version="7.0">
|
||||
<sheet>
|
||||
<field name="wiki_id" select="1" colspan="4"/>
|
||||
<field name="summary" select="1" colspan="4"/>
|
||||
<field name="text_area" select="1" colspan="4" nolabel="1" widget="text_wiki"/>
|
||||
<field name="create_date" select="1" readonly="1"/>
|
||||
<field name="minor_edit" select="1" groups="base.group_no_one"/>
|
||||
</sheet>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
|
Loading…
Reference in New Issue