[MERGE]merged with trunk-survey-layout-tta

bzr revid: vba@tinyerp.com-20120709130113-3lchipgil9oqpglg

6 files changed, 73 insertions, 69 deletions

diff --git a/addons/wiki/data/wiki_quickstart.xml b/addons/wiki/data/wiki_quickstart.xml
index 7324fa6f18f..f6ae59de9ee 100644
--- a/addons/wiki/data/wiki_quickstart.xml
+++ b/addons/wiki/data/wiki_quickstart.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data noupdate="1">
-		<record id="wiki_groups_wikiformatting0" model="wiki.groups">
-			<field name="name">Help - Using The Wiki</field>
-			<field eval="1" name="section"/>
-		</record>
-		<record id="wiki_wiki_quickstart0" model="wiki.wiki">
-			<field name="name">Basic Wiki Editing</field>
-			<field name="tags">help, quick start, wiki, formatting</field>
-			<field name="minor_edit">0</field>
-			<field name="toc">1</field>
-			<field name="section">1.1</field>
-			<field name="summary">Initial Page</field>
-			<field  name="text_area">==Basic Wiki Editing==
+    <data noupdate="1">
+        <record id="wiki_groups_wikiformatting0" model="wiki.groups">
+            <field name="name">Help - Using The Wiki</field>
+            <field eval="1" name="section"/>
+        </record>
+        <record id="wiki_wiki_quickstart0" model="wiki.wiki">
+            <field name="name">Basic Wiki Editing</field>
+            <field name="tags">help, quick start, wiki, formatting</field>
+            <field name="minor_edit">0</field>
+            <field name="toc">1</field>
+            <field name="section">1.1</field>
+            <field name="summary">Initial Page</field>
+            <field  name="text_area">==Basic Wiki Editing==
 You can ''italicize text'' by putting 2 
 apostrophes on each side. 
 3 apostrophes will embolden '''the text'''. 
@@ -110,7 +110,7 @@ A newline starts a new paragraph.
 ===3rd Level Heading===
 
 </field>
-			<field name="group_id" ref="wiki_groups_wikiformatting0"/>
-		</record>
-	</data>
+            <field name="group_id" ref="wiki_groups_wikiformatting0"/>
+        </record>
+    </data>
 </openerp>
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 8069de21d04..700585122d3 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -32,12 +32,12 @@
             <field name="arch" type="xml">
                 <form string="Wiki Groups" version="7.0">
                     <group col="4" colspan="3" >
-                        <field name="name" select="1"/>
+                        <field name="name"/>
                         <field name="create_date" readonly="2"/>
                     </group>
                     <group col="2" colspan="1">
-                        <field name="method" select="1"/>
-                        <field name="home" select="1" domain="[('group_id','=',active_id)]"
+                        <field name="method"/>
+                        <field name="home" domain="[('group_id','=',active_id)]"
                             attrs="{'required':[('method','=','page')], 'readonly':[('method','!=','page')]}" />
                     </group>
                     <notebook colspan="4">
@@ -129,27 +129,33 @@
             <field name="arch" type="xml">
                 <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"/>                        
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only"/>
+                                <h1><field name="name" select="1" /></h1>
+                            <label for="group_id" class="oe_edit_only"/>
+                            <h2>
+                            <field name="group_id" string="Topic" select="1" on_change="onchange_group_id(group_id, text_area)"/></h2>
+                        </div>
+                        <group>
+                            <group>
+                                <field name="parent_id" domain="[('group_id','=',group_id)]"/>
+                                <field name="section"/>
+                            </group>
                         </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"/>
+                            <field name="text_area" nolabel="1" colspan="4" widget="text_wiki" placeholder="Wiki Content"/>
                             </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"/>
+                            <field name="review"/>
                         </group>
                         <group col="2" colspan="2">
                             <separator colspan="4" string="Meta Information"/>
-                            <field name="tags" select="1"/>
+                            <field name="tags"/>
                             <field name="toc" groups="base.group_no_one"/>
                         </group>
                     </sheet>
@@ -234,11 +240,11 @@
             <field name="arch" type="xml">
                 <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"/>
+                        <field name="wiki_id" colspan="4"/>
+                        <field name="summary" colspan="4"/>
+                        <field name="text_area" colspan="4" nolabel="1" widget="text_wiki"/>
+                        <field name="create_date" readonly="1"/>
+                        <field name="minor_edit" groups="base.group_no_one"/>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/wiki/wizard/wiki_create_menu_view.xml b/addons/wiki/wizard/wiki_create_menu_view.xml
index fbdffb23e0a..45c4ba6a487 100644
--- a/addons/wiki/wizard/wiki_create_menu_view.xml
+++ b/addons/wiki/wizard/wiki_create_menu_view.xml
@@ -9,15 +9,17 @@
             <field name="model">wiki.create.menu</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              <form string="Create Menu">
-                     <separator string="Menu Information" colspan="4" />
-                    <field name="menu_name" />
-                    <field name="menu_parent_id" />
-                    <separator string="" colspan="4" />
-                    <label string="" colspan="2" />
-                    <button special="cancel" string="Cancel" />
-                    <button name="wiki_menu_create" string="Create Menu" type="object"/>
-             </form>
+                <form string="Create Menu" version="7.0">
+                    <header>
+                        <button name="wiki_menu_create" string="Create Menu" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </header>
+                    <group string="Menu Information">
+                        <field name="menu_name" />
+                        <field name="menu_parent_id" />
+                    </group>
+                </form>
             </field>
         </record>
 
diff --git a/addons/wiki/wizard/wiki_make_index_view.xml b/addons/wiki/wizard/wiki_make_index_view.xml
index 28b0d8427b0..c818721c09c 100644
--- a/addons/wiki/wizard/wiki_make_index_view.xml
+++ b/addons/wiki/wizard/wiki_make_index_view.xml
@@ -9,16 +9,15 @@
             <field name="model">wiki.make.index</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              <form string="Create Menu">
-                <separator string="Menu Information" colspan="4"/>
-                <label string="Want to create a Index on Selected Pages ? "/>
-                <separator string="" colspan="6" />
-                <label string="" colspan="2"/>
-                <group>
-                <button special="cancel" string="Cancel" icon="gtk-cancel" />
-                <button name="wiki_do_index" string="Create Index" type="object" icon="gtk-ok"/>
-                </group>
-            </form>
+                <form string="Create Menu" version="7.0">
+                    <header>
+                        <button name="wiki_do_index" string="Create Index" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </header>
+                    <separator string="Menu Information"/>
+                    <label string="Want to create a Index on Selected Pages ? "/>
+                </form>
             </field>
         </record>
 
diff --git a/addons/wiki/wizard/wiki_show_diff_view.xml b/addons/wiki/wizard/wiki_show_diff_view.xml
index 8cc394986d8..c5b3583b1e5 100644
--- a/addons/wiki/wizard/wiki_show_diff_view.xml
+++ b/addons/wiki/wizard/wiki_show_diff_view.xml
@@ -9,14 +9,13 @@
             <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" version="7.0">
+                    <header>
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </header>
+                    <separator string="Notes"/>
+                    <field name="file_path" width="300"/>
+                </form>
             </field>
         </record>
 
diff --git a/addons/wiki/wizard/wiki_wiki_page_open_view.xml b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
index a625d15e92a..9be2d4d22aa 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open_view.xml
+++ b/addons/wiki/wizard/wiki_wiki_page_open_view.xml
@@ -9,15 +9,13 @@
             <field name="model">wiki.wiki.page.open</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-              <form string="Open Page">
-                 <separator string="" colspan="6" />
-                  <label string="Want to open a wiki page? "/>
-                  <separator string="" colspan="6" />
-                <label string="" colspan="2" />
-                <group>
-                <button special="cancel" string="Cancel" icon="gtk-cancel" />
-                   <button name="open_wiki_page" string="Open Wiki Page" type="object" icon="gtk-ok"/>
-                   </group>
+                <form string="Open Page" version="7.0">
+                    <header>
+                        <button name="open_wiki_page" string="Open Wiki Page" type="object"  class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </header>
+                    <label string="Want to open a wiki page? "/>
              </form>
             </field>
         </record>