X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=view%2Fbikecoop.xml;h=94e20d622b8c79595e4f0bafe9d0be93a2a40647;hb=46b1f846b6d59d5532ed45190eb005e6b94d46a3;hp=649567d3b99cc269938541b4533e6c785f2f1911;hpb=c786834814f9b8b21b9657609189c8227b8acd16;p=burette%2Fbikecoop.git

diff --git a/view/bikecoop.xml b/view/bikecoop.xml
index 649567d..94e20d6 100644
--- a/view/bikecoop.xml
+++ b/view/bikecoop.xml
@@ -25,35 +25,40 @@
                         <field name="is_company"/> <label for="is_company"/>)
                     </div>
                     <h1>
-                        <field name="name"/>
+                        <field name="name" placeholder="Firstname LASTNAME"/>
                     </h1>
                 </div>
-                <group>
-                    <group>
-                        <label for="street" string="Postal address"/>
-                        <div>
-                            <field name="zip" placeholder="Zip code"/>
-                            <field name="city" placeholder="CITY"/>
-                            <field name="country_id" placeholder="Country"/>
-                            <field name="street" placeholder="Street ..."/>
-                            <field name="street2" placeholder="..."/>
-                            <field name="email" widget="email" placeholder="email"/>
-                            <field name="phone" placeholder="e.g. +32.81.81.37.00"/>
-                        </div>
-                    </group>
-                    <group attrs="{'invisible': [('is_company','=',True)]}">
-                        <field name="year" placeholder="1900" attrs="{'required': [('is_company','=', False)]}"/>
-                        <field name="gender_id" domain="[('domain','=', 'gender')]" placeholder="Other, Female or Male" attrs="{'required': [('is_company','=', False)]}"/>
-                        <field name="nationality_id" placeholder="France" attrs="{'required': [('is_company','=', False)]}"/>
-                        <field name="occupation_id" placeholder="Student/Employee/Other" domain="[('domain','=', 'occupation')]" attrs="{'required': [('is_company','=', False)]}"/>
-                    </group>
-                </group>
-                <notebook name="Volunteer activities">
-                    <page string="Volunteer activities" attrs="{'invisible': [('is_company','=',True)]}">
-                        <label string="Want to be volunteer in ..."/>
-                        <field name="volunteer_ids" domain="[('domain','=', 'volunteer')]" string="Want to be volunteer in ..."/>
-                        <label string="Other volunteer activities and comments"/>
-                        <field name="comment"/>
+                <notebook colspan="4">
+                    <page string="Main informations">
+                        <group>
+                            <group>
+                                <label for="street" string="Postal address"/>
+                                <div>
+                                    <field name="zip" placeholder="Zip code"/>
+                                    <field name="city" placeholder="CITY"/>
+                                    <field name="country_id" placeholder="Country"/>
+                                    <field name="street" placeholder="Street …"/>
+                                    <field name="street2" placeholder="Street (following) …"/>
+                                </div>
+                                <field name="email" widget="email" placeholder="email"/>
+                                <field name="phone" placeholder="e.g. +33 4 00 00 00 00"/>
+                                <field name="mobile" placeholder="e.g. +33 6 00 00 00 00"/>
+                            </group>
+                            <group attrs="{'invisible': [('is_company','=',True)]}">
+                                <field name="year" placeholder="1900" attrs="{'required': [('is_company','=', False)]}"/>
+                                <field name="gender_id" domain="[('domain','=', 'gender')]" placeholder="Other, Female or Male" attrs="{'required': [('is_company','=', False)]}" widget="selection"/>
+                                <field name="nationality_id" placeholder="France" attrs="{'required': [('is_company','=', False)]}"/>
+                                <field name="occupation_id" placeholder="Student/Employee/Other" domain="[('domain','=', 'occupation')]" attrs="{'required': [('is_company','=', False)]}" widget="selection"/>
+                            </group>
+                        </group>
+                        <notebook name="Volunteer activities">
+                            <page string="Volunteer activities" attrs="{'invisible': [('is_company','=',True)]}">
+                                <label string="Want to be volunteer in ..."/>
+                                <field name="volunteer_ids" domain="[('domain','=', 'volunteer')]" string="Want to be volunteer in ..."/>
+                                <label string="Other volunteer activities and comments"/>
+                                <field name="comment"/>
+                            </page>
+                        </notebook>
                     </page>
                 </notebook>
             </sheet>
@@ -226,13 +231,18 @@
             <field name="context">{'default_domain': 'occupation'}</field>
         </record>
 
+        <menuitem id="menu_bikecoop" 
+            name="Bikecoop"
+            parent="base.menu_config"
+            sequence="20"/>
+
         <menuitem id="menu_volunteer_ids"
-            parent="base.menu_marketing_config_association"
-            sequence="20"
+            parent="menu_bikecoop"
+            sequence="10"
             action="act_open_volunteer_ids_view"/>
 
         <menuitem id="menu_occupation"
-            parent="base.menu_marketing_config_association"
+            parent="menu_bikecoop"
             sequence="20"
             action="act_open_occupation_view"/>
     </data>