[MERGE] event: usability, review of form views

bzr revid: qdp-launchpad@openerp.com-20120710084626-oldsa3pdv3ku2ylb

diff --cc addons/event/event_view.xml
index ea27885,1526437..142ba2b
--- 1/addons/event/event_view.xml
--- 2/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@@ -436,44 -449,40 +449,40 @@@
              <field name="type">form</field>
              <field name="arch" type="xml">
                  <form version="7.0">
-                 <header>
-                     <button name="registration_open" string="Confirm" states="draft" type="object" class="oe_highlight"/>
-                     <button name="button_reg_close" string="Attended" states="open" type="object" class="oe_highlight"/>
-                     <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" />
-                     <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
-                     <field name="state" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
-                 </header>
-                 <sheet string="Registration">
-                     <group col="6" colspan="4">
-                         <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]"/>
-                         <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
-                         <field name="nb_register"/>
-                         <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}"/>
-                         <field name="origin"/>
-                     </group>
-                     <notebook colspan="4">
-                         <page string="Additional Information">
-                             <group colspan="2" col="2">
-                                 <separator string="Contact Information" colspan="2"/>
+                     <header>
+                         <button name="registration_open" string="Confirm" states="draft" type="object" class="oe_highlight"/>
+                         <button name="button_reg_close" string="Attended" states="open" type="object" class="oe_highlight"/>
+                         <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" />
+                         <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
+                         <field name="state" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
+                     </header>
+                     <sheet string="Registration">
+                         <label for="event_id" class="oe_edit_only"/>
+                         <h1>
+                             <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]"/>
+                         </h1>
+                         <group>
+                             <group>
+                                 <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)"/>
                                  <field name="name"/>
-                                 <field name="email"/>
                                  <field name="phone"/>
+                                 <label for="email"/>
+                                 <div>
+                                     <field name="email" class="oe_inline"/>
+                                     <button class="oe_inline oe_right" string="Send Email"
+                                       name="%(mail.action_email_compose_message_wizard)d"
+                                       icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action"/>
+                                 </div>
+                             </group>
+                             <group>
 -                                <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}"/>
+                                 <field name="nb_register"/>
++                                <field name="user_id" attrs="{'readonly':[('state','!=', 'draft')]}"/>
                              </group>
-                             <group colspan="2" col="2" groups="base.group_no_one">
-                                 <separator string="Dates" colspan="2"/>
+                             <group groups="base.group_no_one">
                                  <field name="create_date"/>
                                  <field name="date_closed"/>
-                                 <field name="event_begin_date" />
-                                 <field name="event_end_date" />
                              </group>
-                         </page>
-                         <page string="Emails">
-                             <button string="Send New Email"
-                                 name="%(mail.action_email_compose_message_wizard)d"
-                                 icon="terp-mail-message-new" context= '{"default_email_to":email}' type="action"/>
-                            </page>
- 
-                     </notebook>
+                         </group>
                      </sheet>
                      <footer>
                          <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>