Index: /WAeUP_SRP/trunk/profiles/default/actions.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/actions.xml	(revision 4116)
+++ /WAeUP_SRP/trunk/profiles/default/actions.xml	(revision 4117)
@@ -41,5 +41,5 @@
   </action>
   <action title="Import Data" action_id="import" category="global"
-     condition_expr="python:member and member.has_role('Manager')" url_expr="string:${portal_url}/import"
+     condition_expr="python:member and member.has_role('Manager') and str(member) == 'admin'" url_expr="string:${portal_url}/import"
      visible="True">
    <permission>View</permission>
Index: /WAeUP_SRP/trunk/profiles/nau/layouts/readme.txt
===================================================================
--- /WAeUP_SRP/trunk/profiles/nau/layouts/readme.txt	(revision 4117)
+++ /WAeUP_SRP/trunk/profiles/nau/layouts/readme.txt	(revision 4117)
@@ -0,0 +1,1 @@
+student_personal_fe.xml has only been customized for NAU, it has not been removed from the default profile.
Index: /WAeUP_SRP/trunk/profiles/nau/layouts/student_personal_fe.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/nau/layouts/student_personal_fe.xml	(revision 4117)
+++ /WAeUP_SRP/trunk/profiles/nau/layouts/student_personal_fe.xml	(revision 4117)
@@ -0,0 +1,560 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="layout.xsl"?>
+<object name="student_personal_fe" meta_type="CPS Layout">
+ <property name="layout_create_method"></property>
+ <property name="layout_edit_method"></property>
+ <property name="layout_view_method"></property>
+ <property name="style_prefix">layout_personal_</property>
+ <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">select</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">First Name</property>
+  <property name="fields">
+   <element value="firstname"/>
+  </property>
+  <property name="label">First Name</property>
+  <property name="label_edit">First Name</property>
+  <property name="readonly_layout_modes">
+   <element value="edit"/>
+  </property>
+  <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="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">Surname / Full Name</property>
+  <property name="fields">
+   <element value="lastname"/>
+  </property>
+  <property name="label">Surname / Full Name</property>
+  <property name="label_edit">Surname / Full Name</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">select</property>
+ </widget>
+ <widget name="middlename" meta_type="String Widget">
+  <property name="title">Middle Name</property>
+  <property name="fields">
+   <element value="middlename"/>
+  </property>
+  <property name="label">Middle Name</property>
+  <property name="label_edit">Middle Name</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 First Name</property>
+  <property name="fields">
+   <element value="next_kin_firstname"/>
+  </property>
+  <property name="label">Next of Kin First Name</property>
+  <property name="label_edit">Next of Kin First Name</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 Last Name</property>
+  <property name="fields">
+   <element value="next_kin_lastname"/>
+  </property>
+  <property name="label">Next of Kin Last Name</property>
+  <property name="label_edit">Next of Kin Last Name</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 Middle Name</property>
+  <property name="fields">
+   <element value="next_kin_middlename"/>
+  </property>
+  <property name="label">Next of Kin Middle Name</property>
+  <property name="label_edit">Next of Kin Middle Name</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>
+  <property name="fields">
+   <element value="sex"/>
+  </property>
+  <property name="label">Sex</property>
+  <property name="label_edit">Sex</property>
+  <property name="readonly_layout_modes">
+  </property>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="label_false">male</property>
+  <property name="label_true">female</property>
+  <property name="render_format">select</property>
+ </widget>
+ <widget name="blood_group" meta_type="String Widget">
+  <property name="title">Blood Group</property>
+  <property name="fields">
+   <element value="blood_group"/>
+  </property>
+  <property name="label">Blood Group</property>
+  <property name="label_edit">Blood Group</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_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 First Name</property>
+  <property name="fields">
+   <element value="sponsor_firstname"/>
+  </property>
+  <property name="label">Sponsor First Name</property>
+  <property name="label_edit">Sponsor First Name</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="sponsor_lastname" meta_type="String Widget">
+  <property name="title">Sponsor Last Name</property>
+  <property name="fields">
+   <element value="sponsor_lastname"/>
+  </property>
+  <property name="label">Sponsor Last Name</property>
+  <property name="label_edit">Sponsor Last Name</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 Middle Name</property>
+  <property name="fields">
+   <element value="sponsor_middlename"/>
+  </property>
+  <property name="label">Sponsor Middle Name</property>
+  <property name="label_edit">Sponsor Middle Name</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>
+  <property name="fields">
+   <element value="sponsor_state"/>
+  </property>
+  <property name="label">Sponsor State</property>
+  <property name="label_edit">Sponsor State</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="blood_group"/>
+  </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_upload/uploads_form.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_upload/uploads_form.pt	(revision 4116)
+++ /WAeUP_SRP/trunk/skins/waeup_upload/uploads_form.pt	(revision 4117)
@@ -118,5 +118,5 @@
                  % (cpsmcat('button_select_all'), cpsmcat('button_deselect_all'))"
                  />
-          <input type="submit" name="edit" value="Edit"
+          <input type="submit" name="edit" value="Save"
                  class="destructive" i18n:attributes="value"
                  />
@@ -172,5 +172,5 @@
                  (cpsmcat('description_confirm_delete'), )" 
                  />
-          <input type="submit" name="goto_edit" value="Re-edit"
+          <input type="submit" name="goto_edit" value="Edit File Header"
                  class="destructive" i18n:attributes="value"
                  />
Index: /WAeUP_SRP/trunk/skins/waeup_upload/uploads_index.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_upload/uploads_index.py	(revision 4116)
+++ /WAeUP_SRP/trunk/skins/waeup_upload/uploads_index.py	(revision 4117)
@@ -110,5 +110,5 @@
 info['imported'] = imported
 info['importable'] = importable
-info['import_allowed'] = str(member) in ('admin','joachim',)
+info['import_allowed'] = str(member) in ('admin',)
 
 validate = "upload" in request.keys()
