Index: WAeUP_SRP/trunk/profiles/default/types/StudentApplication.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/types/StudentApplication.xml	(revision 493)
+++ WAeUP_SRP/trunk/profiles/default/types/StudentApplication.xml	(revision 494)
@@ -22,14 +22,12 @@
   <element value="student_application"/>
  </property>
- <property name="layout_clusters">
-  <element value="adm_slip:student_application_fe"/>
- </property>
+ <property name="layout_clusters"/>
  <property name="flexible_layouts"/>
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="cpsdocument_view"/>
- <alias from="view" to="cpsdocument_view"/>
- <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsdocument_view" visible="True">
+ <alias from="(Default)" to="academics_contents"/>
+ <alias from="view" to="academics_contents"/>
+ <action title="Standard View" action_id="view" category="object" condition_expr=""
+    url_expr="string:${object_url}/academics_contents" visible="True">
   <permission value="View"/>
  </action>
@@ -39,3 +37,8 @@
   <permission value="Modify portal content"/>
  </action>
+ <action title="action_metadata" action_id="metadata" category="object"
+    condition_expr="python:member and 'Manager' in member.getRoles()"
+    url_expr="string:${object_url}/cpsdocument_metadata" visible="False">
+  <permission value="Modify portal content"/>
+ </action>
 </object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies.xml	(revision 493)
+++ WAeUP_SRP/trunk/profiles/default/vocabularies.xml	(revision 494)
@@ -8,8 +8,4 @@
  <object name="waeup_bed_letters" meta_type="CPS Vocabulary"/>
  <object name="nigerian_states" meta_type="CPS Vocabulary"/>
- <object name="range10" meta_type="CPS Vocabulary"/>
- <object name="range20" meta_type="CPS Vocabulary"/>
- <object name="range5" meta_type="CPS Vocabulary"/>
- <object name="range50" meta_type="CPS Vocabulary"/>
  <object name="semester_voc" meta_type="CPS Vocabulary"/>
  <object name="local_gov_areas" meta_type="CPS Vocabulary"/>
@@ -19,3 +15,4 @@
  <object name="religion" meta_type="CPS Vocabulary"/>
  <object name="exam_types" meta_type="CPS Vocabulary"/>
+ <object name="pin_prefixes" meta_type="CPS Vocabulary"/>
  </object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/cpsportlets_additem_display_voc.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/cpsportlets_additem_display_voc.xml	(revision 493)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<?xml version="1.0"?>
-<object name="cpsportlets_additem_display_voc" meta_type="CPS Vocabulary">
- <property name="title"></property>
- <property name="title_msgid"></property>
- <property name="description"></property>
- <property name="acl_write_roles">Manager</property>
- <item key="dropdown_list"
-    msgid="cpsportlets_additem_dropdown_list_label">Dropdown list</item>
- <item key="standard_menu"
-    msgid="cpsportlets_additem_standard_menu_label">Standard menu</item>
-</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/cpsportlets_bcs_display_voc.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/cpsportlets_bcs_display_voc.xml	(revision 493)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<?xml version="1.0"?>
-<object name="cpsportlets_bcs_display_voc" meta_type="CPS Vocabulary">
- <property name="title"></property>
- <property name="title_msgid"></property>
- <property name="description"></property>
- <property name="acl_write_roles">Manager</property>
- <item key="dropdown_list"
-    msgid="cpsportlets_bcs_display_dropdown_list_label">Drop down list</item>
- <item key="horizontal_trail"
-    msgid="cpsportlets_bcs_display_horizontal_trail_label">Horizontal trail</item>
-</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/cpsportlets_content_portal_types_voc.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/cpsportlets_content_portal_types_voc.xml	(revision 493)
+++ 	(revision )
@@ -1,13 +1,0 @@
-<?xml version="1.0"?>
-<object name="cpsportlets_content_portal_types_voc"
-   meta_type="CPS Method Vocabulary">
- <property name="title"></property>
- <property name="title_msgid"></property>
- <property name="description"></property>
- <property
-    name="get_vocabulary_method">getSearchableTypesVocabulary</property>
- <property name="add_empty_key">False</property>
- <property name="empty_key_pos">first</property>
- <property name="empty_key_value"></property>
- <property name="empty_key_value_i18n"></property>
-</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/cpsportlets_content_search_voc.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/cpsportlets_content_search_voc.xml	(revision 493)
+++ 	(revision )
@@ -1,22 +1,0 @@
-<?xml version="1.0"?>
-<object name="cpsportlets_content_search_voc" meta_type="CPS Vocabulary">
- <property name="title"></property>
- <property name="title_msgid"></property>
- <property name="description"></property>
- <property name="acl_write_roles">Manager</property>
- <item key="all"
-    msgid="cpsportlets_content_search_all_label">All documents</item>
- <item key="related"
-    msgid="cpsportlets_content_search_related_label">Related</item>
- <item key="pending"
-    msgid="cpsportlets_content_search_pending_label">Pending</item>
- <item key="last_modified"
-    msgid="cpsportlets_content_search_last_modified_label">Last modified</item>
- <item key="last_published"
-    msgid="cpsportlets_content_search_last_published_label">Last published</item>
- <item key="recent"
-    msgid="cpsportlets_content_search_recent_label">Recent</item>
- <item key="upcoming"
-    msgid="cpsportlets_content_search_upcoming_label">Upcoming</item>
- <item key="today" msgid="cpsportlets_content_search_today_label">Today</item>
-</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/cpsportlets_content_sort_on_voc.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/cpsportlets_content_sort_on_voc.xml	(revision 493)
+++ 	(revision )
@@ -1,14 +1,0 @@
-<?xml version="1.0"?>
-<object name="cpsportlets_content_sort_on_voc" meta_type="CPS Vocabulary">
- <property name="title"></property>
- <property name="title_msgid"></property>
- <property name="description"></property>
- <property name="acl_write_roles">Manager</property>
- <item key="Title"
-    msgid="cpsportlets_content_sort_on_Title_label">Title</item>
- <item key="Date" msgid="cpsportlets_content_sort_on_Date_label">Date</item>
- <item key="review_state"
-    msgid="cpsportlets_content_sort_on_review_state_label">Review state</item>
- <item key="Creator"
-    msgid="cpsportlets_content_sort_on_Creator_label">Creator</item>
-</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/cpsportlets_language_action_voc.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/cpsportlets_language_action_voc.xml	(revision 493)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<?xml version="1.0"?>
-<object name="cpsportlets_language_action_voc" meta_type="CPS Vocabulary">
- <property name="title"></property>
- <property name="title_msgid"></property>
- <property name="description"></property>
- <property name="acl_write_roles">Manager</property>
- <item key="translate"
-    msgid="cpsportlets_language_action_translate_label">Translate</item>
- <item key="delete_translation"
-    msgid="cpsportlets_language_action_delete_translation_label">Delete translation</item>
- <item key="switch_language"
-    msgid="cpsportlets_language_action_switch_language_label">Switch language</item>
- <item key="change"
-    msgid="cpsportlets_language_action_change_label">Change language</item>
-</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/cpsportlets_navigation_display_voc.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/cpsportlets_navigation_display_voc.xml	(revision 493)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0"?>
-<object name="cpsportlets_navigation_display_voc" meta_type="CPS Vocabulary">
- <property name="title"></property>
- <property name="title_msgid"></property>
- <property name="description"></property>
- <property name="acl_write_roles">Manager</property>
- <item key="navigation_tree"
-    msgid="cpsportlets_nav_display_navtree_menu_label">Navigation tree</item>
- <item key="folder_contents"
-    msgid="cpsportlets_nav_display_folder_contents_menu_label">Folder contents</item>
- <item key="folder_contents_dropdown_list"
-    msgid="cpsportlets_nav_display_folder_contents_dropdown_list_label">Folder contents (drop-down list)</item>
- <item key="collapsible_menu"
-    msgid="cpsportlets_nav_display_collapsible_menu_label">Collapsible menu</item>
- <item key="site_map"
-    msgid="cpsportlets_nav_display_site_map_label">Site map</item>
- <item key="extended_site_map"
-    msgid="cpsportlets_nav_display_extended_site_map_label">Extended site map</item>
- <item key="vertical_breadcrumbs_menu"
-    msgid="cpsportlets_nav_display_vertical_breadcrumbs_menu_label">Vertical breadcrumbs menu</item>
- <item key="subfolder_contents"
-    msgid="cpsportlets_nav_display_subfolder_contents_menu_label">Sub-folder contents</item>
- <item key="up_to_parent"
-    msgid="cpsportlets_nav_display_up_to_parent_label">Up to parent folder</item>
-</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/cpsportlets_rss_channels_voc.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/cpsportlets_rss_channels_voc.xml	(revision 493)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<?xml version="1.0"?>
-<object name="cpsportlets_rss_channels_voc" meta_type="CPS Method Vocabulary">
- <property name="title"></property>
- <property name="title_msgid"></property>
- <property name="description"></property>
- <property name="get_vocabulary_method">getRSSChannelsVocabulary</property>
- <property name="add_empty_key">False</property>
- <property name="empty_key_pos">first</property>
- <property name="empty_key_value"></property>
- <property name="empty_key_value_i18n"></property>
-</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/cpsportlets_syndication_formats_voc.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/cpsportlets_syndication_formats_voc.xml	(revision 493)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<?xml version="1.0"?>
-<object name="cpsportlets_syndication_formats_voc" meta_type="CPS Vocabulary">
- <property name="title"></property>
- <property name="title_msgid"></property>
- <property name="description"></property>
- <property name="acl_write_roles">Manager</property>
- <item key="rss_1_0" msgid="cpsportlets_syndication_rss_1_0_label">RSS</item>
- <item key="rss_2_0" msgid="cpsportlets_syndication_rss_2_0_label">RSS</item>
- <item key="atom_0_3"
-    msgid="cpsportlets_syndication_atom_0_3_label">ATOM</item>
-</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/cpsportlets_visibility_range_voc.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/cpsportlets_visibility_range_voc.xml	(revision 493)
+++ 	(revision )
@@ -1,13 +1,0 @@
-<?xml version="1.0"?>
-<object name="cpsportlets_visibility_range_voc" meta_type="CPS Vocabulary">
- <property name="title"></property>
- <property name="title_msgid"></property>
- <property name="description"></property>
- <property name="acl_write_roles">Manager</property>
- <item key="0-0"
-    msgid="cpsportlets_visibility_range_0-0_label">In this folder and in all subfolders</item>
- <item key="0-1"
-    msgid="cpsportlets_visibility_range_0-1_label">Only in this folder</item>
- <item key="1-0"
-    msgid="cpsportlets_visibility_range_1-0_label">Only in subfolders</item>
-</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/dummy_voc.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/dummy_voc.xml	(revision 493)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<?xml version="1.0"?>
-<object name="dummy_voc" meta_type="CPS Vocabulary">
- <property name="title"></property>
- <property name="title_msgid"></property>
- <property name="description"></property>
- <property name="acl_write_roles">Manager</property>
- <item key="news" msgid="">News</item>
- <item key="society" msgid="">Society</item>
- <item key="technology" msgid="">Technology</item>
-</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/forum_tree_voc.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/forum_tree_voc.xml	(revision 493)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<?xml version="1.0"?>
-<object name="forum_tree_voc" meta_type="CPS Vocabulary">
- <property name="title"></property>
- <property name="title_msgid"></property>
- <property name="description"></property>
- <property name="acl_write_roles">Manager</property>
- <item key="title" msgid="forum_label_display_title">Title</item>
- <item key="200fc" msgid="forum_label_display_200_fc">200FirstChars</item>
- <item key="msg" msgid="forum_label_display_msg">Message</item>
-</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/forum_wf_display_voc.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/forum_wf_display_voc.xml	(revision 493)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<?xml version="1.0"?>
-<object name="forum_wf_display_voc" meta_type="CPS Vocabulary">
- <property name="title"></property>
- <property name="title_msgid"></property>
- <property name="description"></property>
- <property name="acl_write_roles">Manager</property>
- <item key="wf_icon" msgid="forum_label_display_wf_icon">Icons</item>
- <item key="wf_txt"
-    msgid="forum_label_display_wf_txt">Text (additional column)</item>
-</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/groups.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/groups.xml	(revision 493)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<?xml version="1.0"?>
-<object name="groups" meta_type="CPS Directory Vocabulary">
- <property name="title"></property>
- <property name="title_msgid"></property>
- <property name="description"></property>
- <property name="directory">groups</property>
- <property name="add_empty_key">False</property>
- <property name="empty_key_pos">first</property>
- <property name="empty_key_value"></property>
-</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/language_voc.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/language_voc.xml	(revision 493)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<?xml version="1.0"?>
-<object name="language_voc" meta_type="CPS Vocabulary">
- <property name="title"></property>
- <property name="title_msgid"></property>
- <property name="description"></property>
- <property name="acl_write_roles">Manager</property>
- <item key="fr" msgid="label_language_fr">Français</item>
- <item key="en" msgid="label_language_en">English</item>
- <item key="es" msgid="label_language_es">Castellano</item>
- <item key="de" msgid="label_language_de">Deutsch</item>
- <item key="it" msgid="label_language_it">Italiano</item>
- <item key="nl" msgid="label_language_nl">Nederlands</item>
- <item key="pt_BR" msgid="label_language_pt_BR">Brasileiro</item>
- <item key="mg" msgid="label_language_mg">Malagasy</item>
- <item key="ro" msgid="label_language_ro">Romana</item>
- <item key="eu" msgid="label_language_eu">Euskara</item>
-</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/members.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/members.xml	(revision 493)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<?xml version="1.0"?>
-<object name="members" meta_type="CPS Directory Vocabulary">
- <property name="title"></property>
- <property name="title_msgid"></property>
- <property name="description"></property>
- <property name="directory">members</property>
- <property name="add_empty_key">False</property>
- <property name="empty_key_pos">first</property>
- <property name="empty_key_value"></property>
-</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/navigation_display_mode.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/navigation_display_mode.xml	(revision 493)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<?xml version="1.0"?>
-<object name="navigation_display_mode" meta_type="CPS Vocabulary">
- <property name="title"></property>
- <property name="title_msgid"></property>
- <property name="description"></property>
- <property name="acl_write_roles">Manager</property>
- <item key="tree">Navigation</item>
- <item key="search">Search</item>
- <item key="options">Options</item>
-</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/navigation_filter_listing_ptypes.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/navigation_filter_listing_ptypes.xml	(revision 493)
+++ 	(revision )
@@ -1,13 +1,0 @@
-<?xml version="1.0"?>
-<object name="navigation_filter_listing_ptypes"
-   meta_type="CPS Method Vocabulary">
- <property name="title"></property>
- <property name="title_msgid"></property>
- <property name="description"></property>
- <property
-    name="get_vocabulary_method">getVocabularyListingFilterTypes</property>
- <property name="add_empty_key">False</property>
- <property name="empty_key_pos">first</property>
- <property name="empty_key_value"></property>
- <property name="empty_key_value_i18n"></property>
-</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/navigation_filter_review_state.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/navigation_filter_review_state.xml	(revision 493)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<?xml version="1.0"?>
-<object name="navigation_filter_review_state" meta_type="CPS Vocabulary">
- <property name="title"></property>
- <property name="title_msgid"></property>
- <property name="description"></property>
- <property name="acl_write_roles">Manager</property>
- <item key="" msgid="choose">choose</item>
- <item key="work" msgid="work">Work</item>
- <item key="pending" msgid="pending">Pending</item>
- <item key="published" msgid="published">Published</item>
-</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/navigation_filter_tree_ptypes.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/navigation_filter_tree_ptypes.xml	(revision 493)
+++ 	(revision )
@@ -1,13 +1,0 @@
-<?xml version="1.0"?>
-<object name="navigation_filter_tree_ptypes"
-   meta_type="CPS Method Vocabulary">
- <property name="title"></property>
- <property name="title_msgid"></property>
- <property name="description"></property>
- <property
-    name="get_vocabulary_method">getVocabularyTreeFilterTypes</property>
- <property name="add_empty_key">False</property>
- <property name="empty_key_pos">first</property>
- <property name="empty_key_value"></property>
- <property name="empty_key_value_i18n"></property>
-</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/navigation_sort_direction.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/navigation_sort_direction.xml	(revision 493)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<?xml version="1.0"?>
-<object name="navigation_sort_direction" meta_type="CPS Vocabulary">
- <property name="title"></property>
- <property name="title_msgid"></property>
- <property name="description"></property>
- <property name="acl_write_roles">Manager</property>
- <item key="">choose</item>
- <item key="asc">Ascendant</item>
- <item key="desc">Descendant</item>
-</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/navigation_sort_listing_by.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/navigation_sort_listing_by.xml	(revision 493)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<?xml version="1.0"?>
-<object name="navigation_sort_listing_by" meta_type="CPS Vocabulary">
- <property name="title"></property>
- <property name="title_msgid"></property>
- <property name="description"></property>
- <property name="acl_write_roles">Manager</property>
- <item key="">choose</item>
- <item key="date">Modified date</item>
- <item key="time">Last workflow transition</item>
- <item key="review_state">Review State</item>
- <item key="Title">Title</item>
- <item key="Subject">Subject</item>
- <item key="Creator">Creator</item>
- <item key="portal_type">Type</item>
-</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/navigation_sort_tree_by.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/navigation_sort_tree_by.xml	(revision 493)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<?xml version="1.0"?>
-<object name="navigation_sort_tree_by" meta_type="CPS Vocabulary">
- <property name="title"></property>
- <property name="title_msgid"></property>
- <property name="description"></property>
- <property name="acl_write_roles">Manager</property>
- <item key="">choose</item>
- <item key="id">Id</item>
- <item key="title">Title</item>
-</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/pin_pefixes.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/pin_pefixes.xml	(revision 494)
+++ WAeUP_SRP/trunk/profiles/default/vocabularies/pin_pefixes.xml	(revision 494)
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<object name="pin_prefixes" meta_type="CPS Vocabulary">
+    <property name="title"></property>
+    <property name="title_msgid"></property>
+    <property name="description"></property>
+    <property name="acl_write_roles">Manager</property>
+
+    <item key="APP" msgid="">Application</item>
+    <item key="CLR" msgid="">Clearance</item>
+    <item key="HOS" msgid="">Hostel Application</item>
+    <item key="HMU" msgid="">Old Hostels (Halls 1, 2, 3, 4)</item>
+    <item key="HMF" msgid="">New Hostel (Hall 5)</item>
+    <item key="HMP" msgid="">Postgraduate Hostel</item>
+    <item key="GWN" msgid="">Gown Hiring</item>
+    
+    <item key="AGR" msgid="">Agriculture</item>
+    <item key="ART" msgid="">Arts</item>
+    <item key="BMS" msgid="">Basic Medical Sc.</item>
+    <item key="DEN" msgid="">Dentistry</item>
+    <item key="EDU" msgid="">Education</item>
+    <item key="ENG" msgid="">Engineering</item>
+    <item key="LAW" msgid="">Law</item>
+    <item key="LSC" msgid="">Life Science</item>
+    <item key="PSC" msgid="">Physical</item>
+    <item key="PHA" msgid="">Pharmacy</item>
+    <item key="MED" msgid="">Medicine</item>
+    <item key="SSC" msgid="">Social Sciences</item>
+    
+    <item key="MBA" msgid="">Masters in Bus. Admin.</item>
+    <item key="MPA" msgid="">Masters in Public Admin</item>
+    <item key="MBF" msgid="">Masters Banking & Fin.</item>
+    <item key="LLM" msgid="">Masters in Law</item>
+    <item key="MPH" msgid="">Masters in Public Health</item>
+    <item key="BPA" msgid="">Bachelors in Public Adm</item>
+    <item key="BIA" msgid="">Bachelors in Accounting</item>
+    <item key="BSW" msgid="">Bachelors in Social Wks</item>
+    <item key="DPA" msgid="">Diploma in Public Adm</item>
+    <item key="DIL" msgid="">Diploma in Law</item>
+    <item key="DDP" msgid="">Diploma in Data Proc.</item>
+    <item key="DCE" msgid="">Diploma in Comp. Eng</item>
+    
+    <item key="MBANEW" msgid="">Masters in Bus. Admin. (New Students)</item>
+    <item key="MPANEW" msgid="">Masters in Public Admin (New Students)</item>
+    <item key="MBFNEW" msgid="">Masters Banking & Fin. (New Students)</item>
+    <item key="LLMNEW" msgid="">Masters in Law (New Students)</item>
+    <item key="MPHNEW" msgid="">Masters in Public Health (New Students)</item>
+    <item key="BPANEW" msgid="">Bachelors in Public Adm (New Students)</item>
+    <item key="BIANEW" msgid="">Bachelors in Accounting (New Students)</item>
+    <item key="BSWNEW" msgid="">Bachelors in Social Wks (New Students)</item>
+    <item key="DPANEW" msgid="">Diploma in Public Adm (New Students)</item>
+    <item key="DILNEW" msgid="">Diploma in Law (New Students)</item>
+    <item key="DDPNEW" msgid="">Diploma in Data Proc. (New Students)</item>
+    <item key="DCENEW" msgid="">Diploma in Comp. Eng (New Students)</item>
+
+</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/range10.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/range10.xml	(revision 493)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<?xml version="1.0"?>
-<object name="range10" meta_type="CPS Vocabulary">
- <property name="title"></property>
- <property name="title_msgid"></property>
- <property name="description"></property>
- <property name="acl_write_roles">Manager</property>
- <item key="1" msgid="">1</item>
- <item key="2" msgid="">2</item>
- <item key="3" msgid="">3</item>
- <item key="4" msgid="">4</item>
- <item key="5" msgid="">5</item>
- <item key="6" msgid="">6</item>
- <item key="7" msgid="">7</item>
- <item key="8" msgid="">8</item>
- <item key="9" msgid="">9</item>
- <item key="10" msgid="">10</item>
-</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/range20.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/range20.xml	(revision 493)
+++ 	(revision )
@@ -1,27 +1,0 @@
-<?xml version="1.0"?>
-<object name="range20" meta_type="CPS Vocabulary">
- <property name="title"></property>
- <property name="title_msgid"></property>
- <property name="description"></property>
- <property name="acl_write_roles">Manager</property>
- <item key="1" msgid="">1</item>
- <item key="2" msgid="">2</item>
- <item key="3" msgid="">3</item>
- <item key="4" msgid="">4</item>
- <item key="5" msgid="">5</item>
- <item key="6" msgid="">6</item>
- <item key="7" msgid="">7</item>
- <item key="8" msgid="">8</item>
- <item key="9" msgid="">9</item>
- <item key="10" msgid="">10</item>
- <item key="11" msgid="">11</item>
- <item key="12" msgid="">12</item>
- <item key="13" msgid="">13</item>
- <item key="14" msgid="">14</item>
- <item key="15" msgid="">15</item>
- <item key="16" msgid="">16</item>
- <item key="17" msgid="">17</item>
- <item key="18" msgid="">18</item>
- <item key="19" msgid="">19</item>
- <item key="20" msgid="">20</item>
-</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/range5.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/range5.xml	(revision 493)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<?xml version="1.0"?>
-<object name="range5" meta_type="CPS Vocabulary">
- <property name="title"></property>
- <property name="title_msgid"></property>
- <property name="description"></property>
- <property name="acl_write_roles">Manager</property>
- <item key="1" msgid="">1</item>
- <item key="2" msgid="">2</item>
- <item key="3" msgid="">3</item>
- <item key="4" msgid="">4</item>
- <item key="5" msgid="">5</item>
-</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/range50.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/range50.xml	(revision 493)
+++ 	(revision )
@@ -1,57 +1,0 @@
-<?xml version="1.0"?>
-<object name="range50" meta_type="CPS Vocabulary">
- <property name="title"></property>
- <property name="title_msgid"></property>
- <property name="description"></property>
- <property name="acl_write_roles">Manager</property>
- <item key="1" msgid="">1</item>
- <item key="2" msgid="">2</item>
- <item key="3" msgid="">3</item>
- <item key="4" msgid="">4</item>
- <item key="5" msgid="">5</item>
- <item key="6" msgid="">6</item>
- <item key="7" msgid="">7</item>
- <item key="8" msgid="">8</item>
- <item key="9" msgid="">9</item>
- <item key="10" msgid="">10</item>
- <item key="11" msgid="">11</item>
- <item key="12" msgid="">12</item>
- <item key="13" msgid="">13</item>
- <item key="14" msgid="">14</item>
- <item key="15" msgid="">15</item>
- <item key="16" msgid="">16</item>
- <item key="17" msgid="">17</item>
- <item key="18" msgid="">18</item>
- <item key="19" msgid="">19</item>
- <item key="20" msgid="">20</item>
- <item key="21" msgid="">21</item>
- <item key="22" msgid="">22</item>
- <item key="23" msgid="">23</item>
- <item key="24" msgid="">24</item>
- <item key="25" msgid="">25</item>
- <item key="26" msgid="">26</item>
- <item key="27" msgid="">27</item>
- <item key="28" msgid="">28</item>
- <item key="29" msgid="">29</item>
- <item key="30" msgid="">30</item>
- <item key="31" msgid="">31</item>
- <item key="32" msgid="">32</item>
- <item key="33" msgid="">33</item>
- <item key="34" msgid="">34</item>
- <item key="35" msgid="">35</item>
- <item key="36" msgid="">36</item>
- <item key="37" msgid="">37</item>
- <item key="38" msgid="">38</item>
- <item key="39" msgid="">39</item>
- <item key="40" msgid="">40</item>
- <item key="41" msgid="">41</item>
- <item key="42" msgid="">42</item>
- <item key="43" msgid="">43</item>
- <item key="44" msgid="">44</item>
- <item key="45" msgid="">45</item>
- <item key="46" msgid="">46</item>
- <item key="47" msgid="">47</item>
- <item key="48" msgid="">48</item>
- <item key="49" msgid="">49</item>
- <item key="50" msgid="">50</item>
-</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/roles.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/roles.xml	(revision 493)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<?xml version="1.0"?>
-<object name="roles" meta_type="CPS Directory Vocabulary">
- <property name="title"></property>
- <property name="title_msgid"></property>
- <property name="description"></property>
- <property name="directory">roles</property>
- <property name="add_empty_key">False</property>
- <property name="empty_key_pos">first</property>
- <property name="empty_key_value"></property>
-</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/search_portal_type_voc.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/search_portal_type_voc.xml	(revision 493)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<?xml version="1.0"?>
-<object name="search_portal_type_voc" meta_type="CPS Method Vocabulary">
- <property name="title"></property>
- <property name="title_msgid"></property>
- <property name="description"></property>
- <property
-    name="get_vocabulary_method">getVocabularySearchPortalType</property>
- <property name="add_empty_key">False</property>
- <property name="empty_key_pos">first</property>
- <property name="empty_key_value"></property>
- <property name="empty_key_value_i18n"></property>
-</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/search_review_state_voc.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/search_review_state_voc.xml	(revision 493)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<?xml version="1.0"?>
-<object name="search_review_state_voc" meta_type="CPS Method Vocabulary">
- <property name="title"></property>
- <property name="title_msgid"></property>
- <property name="description"></property>
- <property
-    name="get_vocabulary_method">getVocabularySearchReviewState</property>
- <property name="add_empty_key">False</property>
- <property name="empty_key_pos">first</property>
- <property name="empty_key_value"></property>
- <property name="empty_key_value_i18n"></property>
-</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/search_sort_results_by.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/search_sort_results_by.xml	(revision 493)
+++ 	(revision )
@@ -1,16 +1,0 @@
-<?xml version="1.0"?>
-<object name="search_sort_results_by" meta_type="CPS Vocabulary">
- <property name="title"></property>
- <property name="title_msgid"></property>
- <property name="description"></property>
- <property name="acl_write_roles">Manager</property>
- <item key="" msgid="label_sort_by">No sort</item>
- <item key="title_asc" msgid="label_title_asc">Title ascending</item>
- <item key="title_desc" msgid="label_title_desc">Title descending</item>
- <item key="date_asc" msgid="label_date_asc">Date ascending</item>
- <item key="date_desc" msgid="label_date_desc">Date descending</item>
- <item key="status_asc" msgid="label_status_asc">Status ascending</item>
- <item key="status_desc" msgid="label_status_desc">Status descending</item>
- <item key="author_asc" msgid="label_author_asc">Author ascending</item>
- <item key="author_desc" msgid="label_author_desc">Author descending</item>
-</object>
Index: WAeUP_SRP/trunk/profiles/default/vocabularies/subject_voc.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/vocabularies/subject_voc.xml	(revision 493)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0"?>
-<object name="subject_voc" meta_type="CPS Vocabulary">
- <property name="title"></property>
- <property name="title_msgid"></property>
- <property name="description"></property>
- <property name="acl_write_roles">Manager</property>
- <item key="Arts" msgid="label_subject_Arts">Arts</item>
- <item key="Business" msgid="label_subject_Business">Business</item>
- <item key="Computers" msgid="label_subject_Computers">Computers</item>
- <item key="Games" msgid="label_subject_Games">Games</item>
- <item key="Health" msgid="label_subject_Health">Health</item>
- <item key="Home" msgid="label_subject_Home">Home</item>
- <item key="Kids and Teens"
-    msgid="label_subject_Kids and Teens">Kids and Teens</item>
- <item key="News" msgid="label_subject_News">News</item>
- <item key="Recreation" msgid="label_subject_Recreation">Recreation</item>
- <item key="Reference" msgid="label_subject_Reference">Reference</item>
- <item key="Regional" msgid="label_subject_Regional">Regional</item>
- <item key="Science" msgid="label_subject_Science">Science</item>
- <item key="Shopping" msgid="label_subject_Shopping">Shopping</item>
- <item key="Society" msgid="label_subject_Society">Society</item>
- <item key="Sports" msgid="label_subject_Sports">Sports</item>
-</object>
Index: WAeUP_SRP/trunk/skins/waeup_student/application_slip.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/application_slip.pt	(revision 493)
+++ WAeUP_SRP/trunk/skins/waeup_student/application_slip.pt	(revision 494)
@@ -7,4 +7,5 @@
       tal:attributes="href string:${base_url}document.css" />
   </metal:block>
+  
   <metal:block fill-slot="header">
   </metal:block>
@@ -18,5 +19,5 @@
       <tal:block tal:define="application_data python:context.getContent();">
       
-      <span tal:content="here/passport" />
+      <span tal:content="structure here/passport" />
       
       <table width="" cellpadding="2" cellspacing="0" summary="Form layout">
