Index: /WAeUP_SRP/trunk/profiles/default/actions.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/actions.xml	(revision 1196)
+++ /WAeUP_SRP/trunk/profiles/default/actions.xml	(revision 1197)
@@ -117,5 +117,5 @@
   </action>
   <action title="Students" action_id="view_students" category="navigation"
-     condition_expr="python:portal.campus.students.isStaff()"
+     condition_expr="member"
      url_expr="string:${portal_url}/campus/students" visible="True">
    <permission>View</permission>
Index: /WAeUP_SRP/trunk/profiles/default/layouts/student_personal.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/layouts/student_personal.xml	(revision 1196)
+++ /WAeUP_SRP/trunk/profiles/default/layouts/student_personal.xml	(revision 1197)
@@ -7,5 +7,40 @@
  <property name="flexible_widgets"/>
  <property name="validate_values_expr"></property>
-
+ <widget name="campus_address" meta_type="String Widget">
+  <property name="title">Campus Address</property>
+  <property name="fields">
+   <element value="campus_address"/>
+  </property>
+  <property name="label">Campus Address</property>
+  <property name="label_edit">Campus Address</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="disabled" meta_type="Boolean Widget">
+  <property name="title">Disabled</property>
+  <property name="fields">
+   <element value="disabled"/>
+  </property>
+  <property name="label">Disabled</property>
+  <property name="label_edit">Disabled</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="label_false">no</property>
+  <property name="label_true">yes</property>
+  <property name="render_format">radio</property>
+ </widget>
+ <widget name="email" meta_type="Email Widget">
+  <property name="title">Email</property>
+  <property name="fields">
+   <element value="email"/>
+  </property>
+  <property name="label">Email</property>
+  <property name="label_edit">Email</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
  <widget name="firstname" meta_type="String Widget">
   <property name="title">Firstname</property>
@@ -13,5 +48,4 @@
    <element value="firstname"/>
   </property>
-  <property name="is_required">False</property>
   <property name="label">Firstname</property>
   <property name="label_edit">Firstname</property>
@@ -20,5 +54,85 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
-
+ <widget name="for_lga" meta_type="String Widget">
+  <property name="title">Foreign Student Local Government Area</property>
+  <property name="fields">
+   <element value="for_lga"/>
+  </property>
+  <property name="label">Foreign Student Local Government Area</property>
+  <property name="label_edit">Foreign Student Local Government Area</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="for_state" meta_type="Select Widget">
+  <property name="title">Foreign Student State</property>
+  <property name="fields">
+   <element value="for_state"/>
+  </property>
+  <property name="label">Foreign Student State</property>
+  <property name="label_edit">Foreign Student State</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">states</property>
+ </widget>
+ <widget name="former_surname" meta_type="String Widget">
+  <property name="title">Former Surname</property>
+  <property name="fields">
+   <element value="former_surname"/>
+  </property>
+  <property name="label">Former Surname</property>
+  <property name="label_edit">Former Surname</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="fst_best_lang" meta_type="String Widget">
+  <property name="title">First Best Language</property>
+  <property name="fields">
+   <element value="fst_best_lang"/>
+  </property>
+  <property name="label">First Best Language</property>
+  <property name="label_edit">First Best Language</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="hall" meta_type="String Widget">
+  <property name="title">Residence Hall on Campus</property>
+  <property name="fields">
+   <element value="hall"/>
+  </property>
+  <property name="label">Residence Hall on Campus</property>
+  <property name="label_edit">Residence Hall on Campus</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="lastname" meta_type="String Widget">
+  <property name="title">Lastname</property>
+  <property name="fields">
+   <element value="lastname"/>
+  </property>
+  <property name="label">Lastname</property>
+  <property name="label_edit">Lastname</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="marit_stat" meta_type="Boolean Widget">
+  <property name="title">Marital Status</property>
+  <property name="fields">
+   <element value="marit_stat"/>
+  </property>
+  <property name="label">Marital Status</property>
+  <property name="label_edit">Marital Status</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="label_false">single</property>
+  <property name="label_true">married</property>
+  <property name="render_format">radio</property>
+ </widget>
  <widget name="middlename" meta_type="String Widget">
   <property name="title">Middlename</property>
@@ -32,30 +146,181 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
-
- <widget name="lastname" meta_type="String Widget">
-  <property name="title">Lastname</property>
-  <property name="fields">
-   <element value="lastname"/>
-  </property>
-  <property name="label">Lastname</property>
-  <property name="label_edit">Lastname</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-  <widget name="former_surname" meta_type="String Widget">
-  <property name="title">Former Surname</property>
-  <property name="fields">
-   <element value="former_surname"/>
-  </property>
-  <property name="label">Former Surname</property>
-  <property name="label_edit">Former Surname</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
+ <widget name="mother_tongue" meta_type="String Widget">
+  <property name="title">Mother Tongue</property>
+  <property name="fields">
+   <element value="mother_tongue"/>
+  </property>
+  <property name="label">Mother Tongue</property>
+  <property name="label_edit">Mother Tongue</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="next_kin_address" meta_type="String Widget">
+  <property name="title">Next of Kin Address</property>
+  <property name="fields">
+   <element value="next_kin_address"/>
+  </property>
+  <property name="label">Next of Kin Address</property>
+  <property name="label_edit">Next of Kin Address</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="next_kin_city" meta_type="String Widget">
+  <property name="title">Next of Kin City</property>
+  <property name="fields">
+   <element value="next_kin_city"/>
+  </property>
+  <property name="label">Next of Kin City</property>
+  <property name="label_edit">Next of Kin City</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="next_kin_email" meta_type="Email Widget">
+  <property name="title">Next of Kin Email</property>
+  <property name="fields">
+   <element value="next_kin_email"/>
+  </property>
+  <property name="label">Next of Kin Email</property>
+  <property name="label_edit">Next of Kin Email</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="next_kin_firstname" meta_type="String Widget">
+  <property name="title">Next of Kin Firstname</property>
+  <property name="fields">
+   <element value="next_kin_firstname"/>
+  </property>
+  <property name="label">Next of Kin Firstname</property>
+  <property name="label_edit">Next of Kin Firstname</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="next_kin_lastname" meta_type="String Widget">
+  <property name="title">Next of Kin Lastname</property>
+  <property name="fields">
+   <element value="next_kin_lastname"/>
+  </property>
+  <property name="label">Next of Kin Lastname</property>
+  <property name="label_edit">Next of Kin Lastname</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="next_kin_middlename" meta_type="String Widget">
+  <property name="title">Next of Kin Middlename</property>
+  <property name="fields">
+   <element value="next_kin_middlename"/>
+  </property>
+  <property name="label">Next of Kin Middlename</property>
+  <property name="label_edit">Next of Kin Middlename</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="next_kin_phone" meta_type="String Widget">
+  <property name="title">Next of Kin Phone</property>
+  <property name="fields">
+   <element value="next_kin_phone"/>
+  </property>
+  <property name="label">Next of Kin Phone</property>
+  <property name="label_edit">Next of Kin Phone</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="next_kin_relation" meta_type="String Widget">
+  <property name="title">Next of Kin Relationship</property>
+  <property name="fields">
+   <element value="next_kin_relation"/>
+  </property>
+  <property name="label">Next of Kin Relationship</property>
+  <property name="label_edit">Next of Kin Relationship</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="next_kin_state" meta_type="String Widget">
+  <property name="title">Next of Kin State</property>
+  <property name="fields">
+   <element value="next_kin_state"/>
+  </property>
+  <property name="label">Next of Kin State</property>
+  <property name="label_edit">Next of Kin State</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="notes" meta_type="Text Widget">
+  <property name="title">Notes</property>
+  <property name="fields">
+   <element value="notes"/>
+  </property>
+  <property name="label">Notes</property>
+  <property name="label_edit">Notes</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="perm_address" meta_type="String Widget">
+  <property name="title">Permanent Address</property>
+  <property name="fields">
+   <element value="perm_address"/>
+  </property>
+  <property name="label">Permanent Address</property>
+  <property name="label_edit">Permanent Address</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="perm_city" meta_type="String Widget">
+  <property name="title">City</property>
+  <property name="fields">
+   <element value="perm_city"/>
+  </property>
+  <property name="label">City</property>
+  <property name="label_edit">City</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="phone" meta_type="String Widget">
+  <property name="title">Phone</property>
+  <property name="fields">
+   <element value="phone"/>
+  </property>
+  <property name="label">Phone</property>
+  <property name="label_edit">Phone</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="religion" meta_type="Select Widget">
+  <property name="title">Religion</property>
+  <property name="fields">
+   <element value="religion"/>
+  </property>
+  <property name="label">Religion</property>
+  <property name="label_edit">Religion</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">religion</property>
+ </widget>
+ <widget name="scd_best_lang" meta_type="String Widget">
+  <property name="title">Second Best Language</property>
+  <property name="fields">
+   <element value="scd_best_lang"/>
+  </property>
+  <property name="label">Second Best Language</property>
+  <property name="label_edit">Second Best Language</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
  <widget name="sex" meta_type="Boolean Widget">
   <property name="title">Sex</property>
@@ -70,234 +335,39 @@
   <property name="label_false">male</property>
   <property name="label_true">female</property>
- </widget>
-
- <widget name="for_lga" meta_type="String Widget">
-  <property name="title">Foreign Student Local Government Area</property>
-  <property name="fields">
-   <element value="for_lga"/>
-  </property>
-  <property name="label">Foreign Student Local Government Area</property>
-  <property name="label_edit">Foreign Student Local Government Area</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="for_state" meta_type="Select Widget">
-  <property name="title">Foreign Student State</property>
-  <property name="fields">
-   <element value="for_state"/>
-  </property>
-  <property name="label">Foreign Student State</property>
-  <property name="label_edit">Foreign Student State</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="vocabulary">states</property>
- </widget>
-
- <widget name="marit_stat" meta_type="Boolean Widget">
-  <property name="title">Marital Status</property>
-  <property name="fields">
-   <element value="marit_stat"/>
-  </property>
-  <property name="label">Marital Status</property>
-  <property name="label_edit">Marital Status</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="label_false">single</property>
-  <property name="label_true">married</property>
- </widget>
-
- <widget name="religion" meta_type="Select Widget">
-  <property name="title">Religion</property>
-  <property name="fields">
-   <element value="religion"/>
-  </property>
-  <property name="label">Religion</property>
-  <property name="label_edit">Religion</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="vocabulary">religion</property>
- </widget>
-
- <widget name="perm_address" meta_type="String Widget">
-  <property name="title">Permanent Address</property>
-  <property name="fields">
-   <element value="perm_address"/>
-  </property>
-  <property name="label">Permanent Address</property>
-  <property name="label_edit">Permanent Address</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="perm_city" meta_type="String Widget">
-  <property name="title">City</property>
-  <property name="fields">
-   <element value="perm_city"/>
-  </property>
-  <property name="label">City</property>
-  <property name="label_edit">City</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="campus_address" meta_type="String Widget">
-  <property name="title">Campus Address</property>
-  <property name="fields">
-   <element value="campus_address"/>
-  </property>
-  <property name="label">Campus Address</property>
-  <property name="label_edit">Campus Address</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="phone" meta_type="String Widget">
-  <property name="title">Phone</property>
-  <property name="fields">
-   <element value="phone"/>
-  </property>
-  <property name="label">Phone</property>
-  <property name="label_edit">Phone</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="email" meta_type="Email Widget">
-  <property name="title">Email</property>
-  <property name="fields">
-   <element value="email"/>
-  </property>
-  <property name="label">Email</property>
-  <property name="label_edit">Email</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="next_kin_firstname" meta_type="String Widget">
-  <property name="title">Next of Kin Firstname</property>
-  <property name="fields">
-   <element value="next_kin_firstname"/>
-  </property>
-  <property name="label">Next of Kin Firstname</property>
-  <property name="label_edit">Next of Kin Firstname</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="next_kin_middlename" meta_type="String Widget">
-  <property name="title">Next of Kin Middlename</property>
-  <property name="fields">
-   <element value="next_kin_middlename"/>
-  </property>
-  <property name="label">Next of Kin Middlename</property>
-  <property name="label_edit">Next of Kin Middlename</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="next_kin_lastname" meta_type="String Widget">
-  <property name="title">Next of Kin Lastname</property>
-  <property name="fields">
-   <element value="next_kin_lastname"/>
-  </property>
-  <property name="label">Next of Kin Lastname</property>
-  <property name="label_edit">Next of Kin Lastname</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="next_kin_relation" meta_type="String Widget">
-  <property name="title">Next of Kin Relationship</property>
-  <property name="fields">
-   <element value="next_kin_relation"/>
-  </property>
-  <property name="label">Next of Kin Relationship</property>
-  <property name="label_edit">Next of Kin Relationship</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="next_kin_address" meta_type="String Widget">
-  <property name="title">Next of Kin Address</property>
-  <property name="fields">
-   <element value="next_kin_address"/>
-  </property>
-  <property name="label">Next of Kin Address</property>
-  <property name="label_edit">Next of Kin Address</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="next_kin_city" meta_type="String Widget">
-  <property name="title">Next of Kin City</property>
-  <property name="fields">
-   <element value="next_kin_city"/>
-  </property>
-  <property name="label">Next of Kin City</property>
-  <property name="label_edit">Next of Kin City</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="next_kin_state" meta_type="String Widget">
-  <property name="title">Next of Kin State</property>
-  <property name="fields">
-   <element value="next_kin_state"/>
-  </property>
-  <property name="label">Next of Kin State</property>
-  <property name="label_edit">Next of Kin State</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="next_kin_email" meta_type="Email Widget">
-  <property name="title">Next of Kin Email</property>
-  <property name="fields">
-   <element value="next_kin_email"/>
-  </property>
-  <property name="label">Next of Kin Email</property>
-  <property name="label_edit">Next of Kin Email</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="next_kin_phone" meta_type="String Widget">
-  <property name="title">Next of Kin Phone</property>
-  <property name="fields">
-   <element value="next_kin_phone"/>
-  </property>
-  <property name="label">Next of Kin Phone</property>
-  <property name="label_edit">Next of Kin Phone</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
+  <property name="render_format">radio</property>
+ </widget>
+ <widget name="sponsor_address" meta_type="String Widget">
+  <property name="title">Sponsor Address</property>
+  <property name="fields">
+   <element value="sponsor_address"/>
+  </property>
+  <property name="label">Sponsor Address</property>
+  <property name="label_edit">Sponsor Address</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="sponsor_city" meta_type="String Widget">
+  <property name="title">Sponsor City</property>
+  <property name="fields">
+   <element value="sponsor_city"/>
+  </property>
+  <property name="label">Sponsor City</property>
+  <property name="label_edit">Sponsor City</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="sponsor_email" meta_type="Email Widget">
+  <property name="title">Sponsor Email</property>
+  <property name="fields">
+   <element value="sponsor_email"/>
+  </property>
+  <property name="label">Sponsor Email</property>
+  <property name="label_edit">Sponsor Email</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
  <widget name="sponsor_firstname" meta_type="String Widget">
   <property name="title">Sponsor Firstname</property>
@@ -311,7 +381,15 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
-
- <field name="sponsor_middlename" meta_type="CPS String Field"/>
-
+ <widget name="sponsor_lastname" meta_type="String Widget">
+  <property name="title">Sponsor Lastname</property>
+  <property name="fields">
+   <element value="sponsor_lastname"/>
+  </property>
+  <property name="label">Sponsor Lastname</property>
+  <property name="label_edit">Sponsor Lastname</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
  <widget name="sponsor_middlename" meta_type="String Widget">
   <property name="title">Sponsor Middlename</property>
@@ -325,45 +403,15 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
-
-
- <widget name="sponsor_lastname" meta_type="String Widget">
-  <property name="title">Sponsor Lastname</property>
-  <property name="fields">
-   <element value="sponsor_lastname"/>
-  </property>
-  <property name="label">Sponsor Lastname</property>
-  <property name="label_edit">Sponsor Lastname</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="sponsor_address" meta_type="String Widget">
-  <property name="title">Sponsor Address</property>
-  <property name="fields">
-   <element value="sponsor_address"/>
-  </property>
-  <property name="label">Sponsor Address</property>
-  <property name="label_edit">Sponsor Address</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="sponsor_city" meta_type="String Widget">
-  <property name="title">Sponsor City</property>
-  <property name="fields">
-   <element value="sponsor_city"/>
-  </property>
-  <property name="label">Sponsor City</property>
-  <property name="label_edit">Sponsor City</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
+ <widget name="sponsor_phone" meta_type="String Widget">
+  <property name="title">Sponsor Phone</property>
+  <property name="fields">
+   <element value="sponsor_phone"/>
+  </property>
+  <property name="label">Sponsor Phone</property>
+  <property name="label_edit">Sponsor Phone</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
  <widget name="sponsor_state" meta_type="String Widget">
   <property name="title">Sponsor State</property>
@@ -377,106 +425,4 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
-
- <widget name="sponsor_email" meta_type="Email Widget">
-  <property name="title">Sponsor Email</property>
-  <property name="fields">
-   <element value="sponsor_email"/>
-  </property>
-  <property name="label">Sponsor Email</property>
-  <property name="label_edit">Sponsor Email</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="sponsor_phone" meta_type="String Widget">
-  <property name="title">Sponsor Phone</property>
-  <property name="fields">
-   <element value="sponsor_phone"/>
-  </property>
-  <property name="label">Sponsor Phone</property>
-  <property name="label_edit">Sponsor Phone</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="fst_best_lang" meta_type="String Widget">
-  <property name="title">First Best Language</property>
-  <property name="fields">
-   <element value="fst_best_lang"/>
-  </property>
-  <property name="label">First Best Language</property>
-  <property name="label_edit">First Best Language</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="scd_best_lang" meta_type="String Widget">
-  <property name="title">Second Best Language</property>
-  <property name="fields">
-   <element value="scd_best_lang"/>
-  </property>
-  <property name="label">Second Best Language</property>
-  <property name="label_edit">Second Best Language</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="mother_tongue" meta_type="String Widget">
-  <property name="title">Mother Tongue</property>
-  <property name="fields">
-   <element value="mother_tongue"/>
-  </property>
-  <property name="label">Mother Tongue</property>
-  <property name="label_edit">Mother Tongue</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="hall" meta_type="String Widget">
-  <property name="title">Residence Hall on Campus</property>
-  <property name="fields">
-   <element value="hall"/>
-  </property>
-  <property name="label">Residence Hall on Campus</property>
-  <property name="label_edit">Residence Hall on Campus</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="disabled" meta_type="Boolean Widget">
-  <property name="title">Disabled</property>
-  <property name="fields">
-   <element value="disabled"/>
-  </property>
-  <property name="label">Disabled</property>
-  <property name="label_edit">Disabled</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="label_false">no</property>
-  <property name="label_true">yes</property>
- </widget>
-
- <widget name="notes" meta_type="Text Widget">
-  <property name="title">Notes</property>
-  <property name="fields">
-   <element value="notes"/>
-  </property>
-  <property name="label">Notes</property>
-  <property name="label_edit">Notes</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
  <table>
   <row>
@@ -588,5 +534,5 @@
    <cell name="notes"/>
   </row>
-
  </table>
 </object>
+
Index: /WAeUP_SRP/trunk/profiles/default/layouts/student_personal_fe.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/layouts/student_personal_fe.xml	(revision 1196)
+++ /WAeUP_SRP/trunk/profiles/default/layouts/student_personal_fe.xml	(revision 1197)
@@ -7,5 +7,40 @@
  <property name="flexible_widgets"/>
  <property name="validate_values_expr"></property>
-
+ <widget name="campus_address" meta_type="String Widget">
+  <property name="title">Campus Address</property>
+  <property name="fields">
+   <element value="campus_address"/>
+  </property>
+  <property name="label">Campus Address</property>
+  <property name="label_edit">Campus Address</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="disabled" meta_type="Boolean Widget">
+  <property name="title">Disabled</property>
+  <property name="fields">
+   <element value="disabled"/>
+  </property>
+  <property name="label">Disabled</property>
+  <property name="label_edit">Disabled</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="label_false">no</property>
+  <property name="label_true">yes</property>
+  <property name="render_format">radio</property>
+ </widget>
+ <widget name="email" meta_type="Email Widget">
+  <property name="title">Email</property>
+  <property name="fields">
+   <element value="email"/>
+  </property>
+  <property name="label">Email</property>
+  <property name="label_edit">Email</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
  <widget name="firstname" meta_type="String Widget">
   <property name="title">Firstname</property>
@@ -13,5 +48,4 @@
    <element value="firstname"/>
   </property>
-  <property name="is_required">False</property>
   <property name="label">Firstname</property>
   <property name="label_edit">Firstname</property>
@@ -22,5 +56,87 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
-
+ <widget name="for_lga" meta_type="String Widget">
+  <property name="title">Foreign Student Local Government Area</property>
+  <property name="fields">
+   <element value="for_lga"/>
+  </property>
+  <property name="label">Foreign Student Local Government Area</property>
+  <property name="label_edit">Foreign Student Local Government Area</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="for_state" meta_type="Select Widget">
+  <property name="title">Foreign Student State</property>
+  <property name="fields">
+   <element value="for_state"/>
+  </property>
+  <property name="label">Foreign Student State</property>
+  <property name="label_edit">Foreign Student State</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">states</property>
+ </widget>
+ <widget name="former_surname" meta_type="String Widget">
+  <property name="title">Former Surname</property>
+  <property name="fields">
+   <element value="former_surname"/>
+  </property>
+  <property name="label">Former Surname</property>
+  <property name="label_edit">Former Surname</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="fst_best_lang" meta_type="String Widget">
+  <property name="title">First Best Language</property>
+  <property name="fields">
+   <element value="fst_best_lang"/>
+  </property>
+  <property name="label">First Best Language</property>
+  <property name="label_edit">First Best Language</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="hall" meta_type="String Widget">
+  <property name="title">Residence Hall on Campus</property>
+  <property name="fields">
+   <element value="hall"/>
+  </property>
+  <property name="label">Residence Hall on Campus</property>
+  <property name="label_edit">Residence Hall on Campus</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="lastname" meta_type="String Widget">
+  <property name="title">Lastname</property>
+  <property name="fields">
+   <element value="lastname"/>
+  </property>
+  <property name="label">Lastname</property>
+  <property name="label_edit">Lastname</property>
+  <property name="readonly_layout_modes">
+   <element value="edit"/>
+  </property>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="marit_stat" meta_type="Boolean Widget">
+  <property name="title">Marital Status</property>
+  <property name="fields">
+   <element value="marit_stat"/>
+  </property>
+  <property name="label">Marital Status</property>
+  <property name="label_edit">Marital Status</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="label_false">single</property>
+  <property name="label_true">married</property>
+  <property name="render_format">radio</property>
+ </widget>
  <widget name="middlename" meta_type="String Widget">
   <property name="title">Middlename</property>
@@ -36,19 +152,181 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
-
- <widget name="lastname" meta_type="String Widget">
-  <property name="title">Lastname</property>
-  <property name="fields">
-   <element value="lastname"/>
-  </property>
-  <property name="label">Lastname</property>
-  <property name="label_edit">Lastname</property>
-  <property name="readonly_layout_modes">
-   <element value="edit"/>
-  </property>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
+ <widget name="mother_tongue" meta_type="String Widget">
+  <property name="title">Mother Tongue</property>
+  <property name="fields">
+   <element value="mother_tongue"/>
+  </property>
+  <property name="label">Mother Tongue</property>
+  <property name="label_edit">Mother Tongue</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="next_kin_address" meta_type="String Widget">
+  <property name="title">Next of Kin Address</property>
+  <property name="fields">
+   <element value="next_kin_address"/>
+  </property>
+  <property name="label">Next of Kin Address</property>
+  <property name="label_edit">Next of Kin Address</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="next_kin_city" meta_type="String Widget">
+  <property name="title">Next of Kin City</property>
+  <property name="fields">
+   <element value="next_kin_city"/>
+  </property>
+  <property name="label">Next of Kin City</property>
+  <property name="label_edit">Next of Kin City</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="next_kin_email" meta_type="Email Widget">
+  <property name="title">Next of Kin Email</property>
+  <property name="fields">
+   <element value="next_kin_email"/>
+  </property>
+  <property name="label">Next of Kin Email</property>
+  <property name="label_edit">Next of Kin Email</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="next_kin_firstname" meta_type="String Widget">
+  <property name="title">Next of Kin Firstname</property>
+  <property name="fields">
+   <element value="next_kin_firstname"/>
+  </property>
+  <property name="label">Next of Kin Firstname</property>
+  <property name="label_edit">Next of Kin Firstname</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="next_kin_lastname" meta_type="String Widget">
+  <property name="title">Next of Kin Lastname</property>
+  <property name="fields">
+   <element value="next_kin_lastname"/>
+  </property>
+  <property name="label">Next of Kin Lastname</property>
+  <property name="label_edit">Next of Kin Lastname</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="next_kin_middlename" meta_type="String Widget">
+  <property name="title">Next of Kin Middlename</property>
+  <property name="fields">
+   <element value="next_kin_middlename"/>
+  </property>
+  <property name="label">Next of Kin Middlename</property>
+  <property name="label_edit">Next of Kin Middlename</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="next_kin_phone" meta_type="String Widget">
+  <property name="title">Next of Kin Phone</property>
+  <property name="fields">
+   <element value="next_kin_phone"/>
+  </property>
+  <property name="label">Next of Kin Phone</property>
+  <property name="label_edit">Next of Kin Phone</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="next_kin_relation" meta_type="String Widget">
+  <property name="title">Next of Kin Relationship</property>
+  <property name="fields">
+   <element value="next_kin_relation"/>
+  </property>
+  <property name="label">Next of Kin Relationship</property>
+  <property name="label_edit">Next of Kin Relationship</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="next_kin_state" meta_type="String Widget">
+  <property name="title">Next of Kin State</property>
+  <property name="fields">
+   <element value="next_kin_state"/>
+  </property>
+  <property name="label">Next of Kin State</property>
+  <property name="label_edit">Next of Kin State</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="notes" meta_type="Text Widget">
+  <property name="title">Notes</property>
+  <property name="fields">
+   <element value="notes"/>
+  </property>
+  <property name="label">Notes</property>
+  <property name="label_edit">Notes</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="perm_address" meta_type="String Widget">
+  <property name="title">Permanent Address</property>
+  <property name="fields">
+   <element value="perm_address"/>
+  </property>
+  <property name="label">Permanent Address</property>
+  <property name="label_edit">Permanent Address</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="perm_city" meta_type="String Widget">
+  <property name="title">City</property>
+  <property name="fields">
+   <element value="perm_city"/>
+  </property>
+  <property name="label">City</property>
+  <property name="label_edit">City</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="phone" meta_type="String Widget">
+  <property name="title">Phone</property>
+  <property name="fields">
+   <element value="phone"/>
+  </property>
+  <property name="label">Phone</property>
+  <property name="label_edit">Phone</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="religion" meta_type="Select Widget">
+  <property name="title">Religion</property>
+  <property name="fields">
+   <element value="religion"/>
+  </property>
+  <property name="label">Religion</property>
+  <property name="label_edit">Religion</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">religion</property>
+ </widget>
+ <widget name="scd_best_lang" meta_type="String Widget">
+  <property name="title">Second Best Language</property>
+  <property name="fields">
+   <element value="scd_best_lang"/>
+  </property>
+  <property name="label">Second Best Language</property>
+  <property name="label_edit">Second Best Language</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
  <widget name="sex" meta_type="Boolean Widget">
   <property name="title">Sex</property>
@@ -65,246 +343,39 @@
   <property name="label_false">male</property>
   <property name="label_true">female</property>
- </widget>
- 
- <widget name="former_surname" meta_type="String Widget">
-  <property name="title">Former Surname</property>
-  <property name="fields">
-   <element value="former_surname"/>
-  </property>
-  <property name="label">Former Surname</property>
-  <property name="label_edit">Former Surname</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget> 
- 
- <widget name="for_lga" meta_type="String Widget">
-  <property name="title">Foreign Student Local Government Area</property>
-  <property name="fields">
-   <element value="for_lga"/>
-  </property>
-  <property name="label">Foreign Student Local Government Area</property>
-  <property name="label_edit">Foreign Student Local Government Area</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="for_state" meta_type="Select Widget">
-  <property name="title">Foreign Student State</property>
-  <property name="fields">
-   <element value="for_state"/>
-  </property>
-  <property name="label">Foreign Student State</property>
-  <property name="label_edit">Foreign Student State</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="vocabulary">states</property>
- </widget>
-
- <widget name="marit_stat" meta_type="Boolean Widget">
-  <property name="title">Marital Status</property>
-  <property name="fields">
-   <element value="marit_stat"/>
-  </property>
-  <property name="label">Marital Status</property>
-  <property name="label_edit">Marital Status</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="label_false">single</property>
-  <property name="label_true">married</property>
- </widget>
-
- <widget name="religion" meta_type="Select Widget">
-  <property name="title">Religion</property>
-  <property name="fields">
-   <element value="religion"/>
-  </property>
-  <property name="label">Religion</property>
-  <property name="label_edit">Religion</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="vocabulary">religion</property>
- </widget>
-
- <widget name="perm_address" meta_type="String Widget">
-  <property name="title">Permanent Address</property>
-  <property name="fields">
-   <element value="perm_address"/>
-  </property>
-  <property name="label">Permanent Address</property>
-  <property name="label_edit">Permanent Address</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="perm_city" meta_type="String Widget">
-  <property name="title">City</property>
-  <property name="fields">
-   <element value="perm_city"/>
-  </property>
-  <property name="label">City</property>
-  <property name="label_edit">City</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="campus_address" meta_type="String Widget">
-  <property name="title">Campus Address</property>
-  <property name="fields">
-   <element value="campus_address"/>
-  </property>
-  <property name="label">Campus Address</property>
-  <property name="label_edit">Campus Address</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="phone" meta_type="String Widget">
-  <property name="title">Phone</property>
-  <property name="fields">
-   <element value="phone"/>
-  </property>
-  <property name="label">Phone</property>
-  <property name="label_edit">Phone</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="email" meta_type="Email Widget">
-  <property name="title">Email</property>
-  <property name="fields">
-   <element value="email"/>
-  </property>
-  <property name="label">Email</property>
-  <property name="label_edit">Email</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="next_kin_firstname" meta_type="String Widget">
-  <property name="title">Next of Kin Firstname</property>
-  <property name="fields">
-   <element value="next_kin_firstname"/>
-  </property>
-  <property name="label">Next of Kin Firstname</property>
-  <property name="label_edit">Next of Kin Firstname</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="next_kin_middlename" meta_type="String Widget">
-  <property name="title">Next of Kin Middlename</property>
-  <property name="fields">
-   <element value="next_kin_middlename"/>
-  </property>
-  <property name="label">Next of Kin Middlename</property>
-  <property name="label_edit">Next of Kin Middlename</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="next_kin_lastname" meta_type="String Widget">
-  <property name="title">Next of Kin Lastname</property>
-  <property name="fields">
-   <element value="next_kin_lastname"/>
-  </property>
-  <property name="label">Next of Kin Lastname</property>
-  <property name="label_edit">Next of Kin Lastname</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="next_kin_relation" meta_type="String Widget">
-  <property name="title">Next of Kin Relationship</property>
-  <property name="fields">
-   <element value="next_kin_relation"/>
-  </property>
-  <property name="label">Next of Kin Relationship</property>
-  <property name="label_edit">Next of Kin Relationship</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="next_kin_address" meta_type="String Widget">
-  <property name="title">Next of Kin Address</property>
-  <property name="fields">
-   <element value="next_kin_address"/>
-  </property>
-  <property name="label">Next of Kin Address</property>
-  <property name="label_edit">Next of Kin Address</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="next_kin_city" meta_type="String Widget">
-  <property name="title">Next of Kin City</property>
-  <property name="fields">
-   <element value="next_kin_city"/>
-  </property>
-  <property name="label">Next of Kin City</property>
-  <property name="label_edit">Next of Kin City</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="next_kin_state" meta_type="String Widget">
-  <property name="title">Next of Kin State</property>
-  <property name="fields">
-   <element value="next_kin_state"/>
-  </property>
-  <property name="label">Next of Kin State</property>
-  <property name="label_edit">Next of Kin State</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="next_kin_email" meta_type="Email Widget">
-  <property name="title">Next of Kin Email</property>
-  <property name="fields">
-   <element value="next_kin_email"/>
-  </property>
-  <property name="label">Next of Kin Email</property>
-  <property name="label_edit">Next of Kin Email</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="next_kin_phone" meta_type="String Widget">
-  <property name="title">Next of Kin Phone</property>
-  <property name="fields">
-   <element value="next_kin_phone"/>
-  </property>
-  <property name="label">Next of Kin Phone</property>
-  <property name="label_edit">Next of Kin Phone</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
+  <property name="render_format">radio</property>
+ </widget>
+ <widget name="sponsor_address" meta_type="String Widget">
+  <property name="title">Sponsor Address</property>
+  <property name="fields">
+   <element value="sponsor_address"/>
+  </property>
+  <property name="label">Sponsor Address</property>
+  <property name="label_edit">Sponsor Address</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="sponsor_city" meta_type="String Widget">
+  <property name="title">Sponsor City</property>
+  <property name="fields">
+   <element value="sponsor_city"/>
+  </property>
+  <property name="label">Sponsor City</property>
+  <property name="label_edit">Sponsor City</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="sponsor_email" meta_type="Email Widget">
+  <property name="title">Sponsor Email</property>
+  <property name="fields">
+   <element value="sponsor_email"/>
+  </property>
+  <property name="label">Sponsor Email</property>
+  <property name="label_edit">Sponsor Email</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
  <widget name="sponsor_firstname" meta_type="String Widget">
   <property name="title">Sponsor Firstname</property>
@@ -318,7 +389,15 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
-
- <field name="sponsor_middlename" meta_type="CPS String Field"/>
-
+ <widget name="sponsor_lastname" meta_type="String Widget">
+  <property name="title">Sponsor Lastname</property>
+  <property name="fields">
+   <element value="sponsor_lastname"/>
+  </property>
+  <property name="label">Sponsor Lastname</property>
+  <property name="label_edit">Sponsor Lastname</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
  <widget name="sponsor_middlename" meta_type="String Widget">
   <property name="title">Sponsor Middlename</property>
@@ -332,45 +411,15 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
-
-
- <widget name="sponsor_lastname" meta_type="String Widget">
-  <property name="title">Sponsor Lastname</property>
-  <property name="fields">
-   <element value="sponsor_lastname"/>
-  </property>
-  <property name="label">Sponsor Lastname</property>
-  <property name="label_edit">Sponsor Lastname</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="sponsor_address" meta_type="String Widget">
-  <property name="title">Sponsor Address</property>
-  <property name="fields">
-   <element value="sponsor_address"/>
-  </property>
-  <property name="label">Sponsor Address</property>
-  <property name="label_edit">Sponsor Address</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="sponsor_city" meta_type="String Widget">
-  <property name="title">Sponsor City</property>
-  <property name="fields">
-   <element value="sponsor_city"/>
-  </property>
-  <property name="label">Sponsor City</property>
-  <property name="label_edit">Sponsor City</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
+ <widget name="sponsor_phone" meta_type="String Widget">
+  <property name="title">Sponsor Phone</property>
+  <property name="fields">
+   <element value="sponsor_phone"/>
+  </property>
+  <property name="label">Sponsor Phone</property>
+  <property name="label_edit">Sponsor Phone</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
  <widget name="sponsor_state" meta_type="String Widget">
   <property name="title">Sponsor State</property>
@@ -384,215 +433,114 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
+ <table>
+  <row>
+   <cell name="firstname"/>
+  </row>
+  <row>
+   <cell name="middlename"/>
+  </row>
+  <row>
+   <cell name="lastname"/>
+  </row>
+  <row>
+   <cell name="former_surname"/>
+  </row>
+  <row>
+   <cell name="sex"/>
+  </row>
+  <row>
+   <cell name="for_state"/>
+  </row>
+  <row>
+   <cell name="marit_stat"/>
+  </row>
+  <row>
+   <cell name="religion"/>
+  </row>
+  <row>
+   <cell name="perm_address"/>
+  </row>
+  <row>
+   <cell name="perm_city"/>
+  </row>
+  <row>
+   <cell name="campus_address"/>
+  </row>
+  <row>
+   <cell name="phone"/>
+  </row>
+  <row>
+   <cell name="email"/>
+  </row>
+  <row>
+   <cell name="next_kin_firstname"/>
+  </row>
+  <row>
+   <cell name="next_kin_middlename"/>
+  </row>
+  <row>
+   <cell name="next_kin_lastname"/>
+  </row>
+  <row>
+   <cell name="next_kin_relation"/>
+  </row>
+  <row>
+   <cell name="next_kin_address"/>
+  </row>
+  <row>
+   <cell name="next_kin_city"/>
+  </row>
+  <row>
+   <cell name="next_kin_state"/>
+  </row>
+  <row>
+   <cell name="next_kin_email"/>
+  </row>
+  <row>
+   <cell name="next_kin_phone"/>
+  </row>
+  <row>
+   <cell name="sponsor_firstname"/>
+  </row>
+  <row>
+   <cell name="sponsor_middlename"/>
+  </row>
+  <row>
+   <cell name="sponsor_lastname"/>
+  </row>
+  <row>
+   <cell name="sponsor_address"/>
+  </row>
+  <row>
+   <cell name="sponsor_city"/>
+  </row>
+  <row>
+   <cell name="sponsor_state"/>
+  </row>
+  <row>
+   <cell name="sponsor_email"/>
+  </row>
+  <row>
+   <cell name="sponsor_phone"/>
+  </row>
+  <row>
+   <cell name="fst_best_lang"/>
+  </row>
+  <row>
+   <cell name="scd_best_lang"/>
+  </row>
+  <row>
+   <cell name="mother_tongue"/>
+  </row>
+  <row>
+   <cell name="hall"/>
+  </row>
+  <row>
+   <cell name="disabled"/>
+  </row>
+  <row>
+   <cell name="notes"/>
+  </row>
+ </table>
+</object>
 
- <widget name="sponsor_email" meta_type="Email Widget">
-  <property name="title">Sponsor Email</property>
-  <property name="fields">
-   <element value="sponsor_email"/>
-  </property>
-  <property name="label">Sponsor Email</property>
-  <property name="label_edit">Sponsor Email</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="sponsor_phone" meta_type="String Widget">
-  <property name="title">Sponsor Phone</property>
-  <property name="fields">
-   <element value="sponsor_phone"/>
-  </property>
-  <property name="label">Sponsor Phone</property>
-  <property name="label_edit">Sponsor Phone</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="fst_best_lang" meta_type="String Widget">
-  <property name="title">First Best Language</property>
-  <property name="fields">
-   <element value="fst_best_lang"/>
-  </property>
-  <property name="label">First Best Language</property>
-  <property name="label_edit">First Best Language</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="scd_best_lang" meta_type="String Widget">
-  <property name="title">Second Best Language</property>
-  <property name="fields">
-   <element value="scd_best_lang"/>
-  </property>
-  <property name="label">Second Best Language</property>
-  <property name="label_edit">Second Best Language</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="mother_tongue" meta_type="String Widget">
-  <property name="title">Mother Tongue</property>
-  <property name="fields">
-   <element value="mother_tongue"/>
-  </property>
-  <property name="label">Mother Tongue</property>
-  <property name="label_edit">Mother Tongue</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="hall" meta_type="String Widget">
-  <property name="title">Residence Hall on Campus</property>
-  <property name="fields">
-   <element value="hall"/>
-  </property>
-  <property name="label">Residence Hall on Campus</property>
-  <property name="label_edit">Residence Hall on Campus</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="disabled" meta_type="Boolean Widget">
-  <property name="title">Disabled</property>
-  <property name="fields">
-   <element value="disabled"/>
-  </property>
-  <property name="label">Disabled</property>
-  <property name="label_edit">Disabled</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="label_false">no</property>
-  <property name="label_true">yes</property>
- </widget>
-
- <widget name="notes" meta_type="Text Widget">
-  <property name="title">Notes</property>
-  <property name="fields">
-   <element value="notes"/>
-  </property>
-  <property name="label">Notes</property>
-  <property name="label_edit">Notes</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <table>
-  <row>
-   <cell name="firstname"/>
-  </row>
-  <row>
-   <cell name="middlename"/>
-  </row>
-  <row>
-   <cell name="lastname"/>
-  </row>
-  <row>
-   <cell name="former_surname"/>
-  </row>
-  <row>
-   <cell name="sex"/>
-  </row>
-  <row>
-   <cell name="for_state"/>
-  </row>
-  <row>
-   <cell name="marit_stat"/>
-  </row>
-  <row>
-   <cell name="religion"/>
-  </row>
-  <row>
-   <cell name="perm_address"/>
-  </row>
-  <row>
-   <cell name="perm_city"/>
-  </row>
-  <row>
-   <cell name="campus_address"/>
-  </row>
-  <row>
-   <cell name="phone"/>
-  </row>
-  <row>
-   <cell name="email"/>
-  </row>
-  <row>
-   <cell name="next_kin_firstname"/>
-  </row>
-  <row>
-   <cell name="next_kin_middlename"/>
-  </row>
-  <row>
-   <cell name="next_kin_lastname"/>
-  </row>
-  <row>
-   <cell name="next_kin_relation"/>
-  </row>
-  <row>
-   <cell name="next_kin_address"/>
-  </row>
-  <row>
-   <cell name="next_kin_city"/>
-  </row>
-  <row>
-   <cell name="next_kin_state"/>
-  </row>
-  <row>
-   <cell name="next_kin_email"/>
-  </row>
-  <row>
-   <cell name="next_kin_phone"/>
-  </row>
-  <row>
-   <cell name="sponsor_firstname"/>
-  </row>
-  <row>
-   <cell name="sponsor_middlename"/>
-  </row>
-  <row>
-   <cell name="sponsor_lastname"/>
-  </row>
-  <row>
-   <cell name="sponsor_address"/>
-  </row>
-  <row>
-   <cell name="sponsor_city"/>
-  </row>
-  <row>
-   <cell name="sponsor_state"/>
-  </row>
-  <row>
-   <cell name="sponsor_email"/>
-  </row>
-  <row>
-   <cell name="sponsor_phone"/>
-  </row>
-  <row>
-   <cell name="fst_best_lang"/>
-  </row>
-  <row>
-   <cell name="scd_best_lang"/>
-  </row>
-  <row>
-   <cell name="mother_tongue"/>
-  </row>
-  <row>
-   <cell name="hall"/>
-  </row>
-  <row>
-   <cell name="disabled"/>
-  </row>
-  <row>
-   <cell name="notes"/>
-  </row>
- </table>  
-</object>
Index: /WAeUP_SRP/trunk/skins/waeup_student/statistics_view.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/statistics_view.pt	(revision 1196)
+++ /WAeUP_SRP/trunk/skins/waeup_student/statistics_view.pt	(revision 1197)
@@ -1,14 +1,17 @@
-<metal:html tal:define="departments context/getStudentStatistics;
+                      
+  <metal:body use-macro="here/main_template/macros/master">
+
+
+    <metal:main fill-slot="main">
+
+  <metal:block tal:define="departments context/getStudentStatistics;
                         mtool here/portal_membership;
-                        member mtool/getAuthenticatedMember;"
-                        >
-  <span tal:condition="not: departments">
-    <span tal:content="here/illegal_view" />
-  </span>
-<metal:block tal:condition="departments">                         
-  <metal:body use-macro="here/main_template/macros/master">
-    <metal:main fill-slot="main">
-      <span tal:condition="isAnon">
-      </span>  
+                        member mtool/getAuthenticatedMember;">       
+
+      <span tal:condition="not: departments">
+        <span tal:content="here/illegal_view" />
+      </span>
+      <span tal:condition="departments">
+  
       <a href="search_students"><strong>Search Students</strong></a>
       <h3>Student Statistics</h3>
@@ -56,6 +59,8 @@
         </table>
       </span>
+      </span>
+</metal:block>      
     </metal:main>
+
   </metal:body>
-</metal:block>      
-</metal:html>
+      
Index: /WAeUP_SRP/trunk/skins/waeup_student/student_view.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/student_view.pt	(revision 1196)
+++ /WAeUP_SRP/trunk/skins/waeup_student/student_view.pt	(revision 1197)
@@ -1,4 +1,3 @@
 <metal:html tal:define="info context/getStudentFolderInfo;
-                is_so info/is_sectionofficer;
                 is_staff info/is_staff;
                 is_student info/is_student">
