From 770be947bd32106897bca6f08cba48d33783e327 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 16 Jul 2012 23:18:52 +0200
Subject: [PATCH] [IMP] form view

bzr revid: fp@tinyerp.com-20120716211852-i0j07wv9bpwrheoa
---
 addons/crm/crm_lead_view.xml  |  7 ++++---
 addons/hr/hr_view.xml         |  6 +++---
 addons/survey/survey_view.xml | 13 +++++++------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 30b0af1dc85..73c687e4ad0 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -140,9 +140,10 @@
                             name="%(act_crm_opportunity_crm_phonecall_new)d"
                             string="Phone Calls" />
                     </div>
-
-                    <label for="name" class="oe_edit_only" string="Lead Description"/>
-                    <h1><field name="name" placeholder="Describe the lead..."/></h1>
+                    <div class="oe_title">
+                        <label for="name" class="oe_edit_only" string="Lead Description"/>
+                        <h1><field name="name" placeholder="Describe the lead..."/></h1>
+                    </div>
                     <group>
                         <group>
                             <field name="user_id" />
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 1797f32e9ce..54ced534880 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -21,9 +21,6 @@
                 <form string="Employee" version="7.0">
                     <sheet>
                         <field name="photo" widget='image' class="oe_right" on_change="onchange_photo(photo)"/>    
-                        <div class="oe_right oe_button_box" name="button_box">
-                            <!-- Put here related buttons -->
-                        </div>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
                             <h1>
@@ -38,6 +35,9 @@
                             <label for="category_ids" class="oe_edit_only"/>
                             <h3><field name="category_ids" widget="many2many_tags"/></h3>
                         </div>
+                        <div class="oe_right oe_button_box" name="button_box">
+                            <!-- Put here related buttons -->
+                        </div>
                         <group colspan="4" col="4">
                             <field name="work_email" widget="email" />
                             <field name="work_phone"/>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index cfefc8f7dea..20f6f42a929 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -30,17 +30,18 @@
                         <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel" string="Test Survey" type="action" icon="gtk-new" context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}"/>
                         <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel" string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
                     </div>
-                    <label for="title" class="oe_edit_only"/>
-                    <h1>
-                        <field name="title" select="1" class="oe_inline"/>
-                        <label string=", " attrs="{'invisible':[('type','=',False)]}" class="oe_inline"/>
-                        <field name="type" class="oe_inline"/>
-                    </h1>
+                    <div class="oe_title">
+                        <label for="title" class="oe_edit_only"/>
+                        <h1>
+                            <field name="title"/>
+                        </h1>
+                    </div>
                     <group>
                         <group>
                             <field name="id" invisible="1"/>
                             <field name="responsible_id" class="oe_inline"/>
                             <field name="send_response"/>
+                            <field name="type"/>
                         </group>
                         <group>
                             <field name="max_response_limit" attrs="{'readonly':[('state','in',('open','close'))]}"/>