Index: waeup_product/trunk/skins/waeup_default/getWAeUPLayouts.py
===================================================================
--- waeup_product/trunk/skins/waeup_default/getWAeUPLayouts.py	(revision 171)
+++ waeup_product/trunk/skins/waeup_default/getWAeUPLayouts.py	(revision 173)
@@ -365,4 +365,12 @@
                 },
             }
+username_hidden = { ###(
+            'type': 'String Widget',
+            'data': {
+                'title': 'Username',
+                'fields': ('username',),
+                'hidden_layout_modes': ['create',],
+                },
+            }
 
 ###)
@@ -882,5 +890,5 @@
                 'javascript_expr': '',
                 'deletable': True,
-                'size_max': 40960,
+                'size_max': 204800,
                 'display_width': 90,
                 'display_height': 180,
@@ -912,5 +920,5 @@
                 'javascript_expr': '',
                 'deletable': True,
-                'size_max': 40960,
+                'size_max': 204800,
                 'display_width': 300,
                 'display_height':600,
@@ -939,5 +947,5 @@
                 'javascript_expr': '',
                 'deletable': True,
-                'size_max': 40960,
+                'size_max': 204800,
                 'display_width': 300,
                 'display_height':600,
@@ -966,5 +974,5 @@
                 'javascript_expr': '',
                 'deletable': True,
-                'size_max': 40960,
+                'size_max': 204800,
                 'display_width': 300,
                 'display_height':600,
@@ -1023,4 +1031,5 @@
         'sex': sex,
         'email': email,
+        'username': username_hidden,
         'pw': pw,
         'rpw': rpw,
@@ -1034,8 +1043,8 @@
             #[{'widget_id': 'middlename', 'ncols': 1},],
             #[{'widget_id': 'lastname', 'ncols': 1},],
-            #[{'widget_id': 'sex', 'ncols': 1},],
+            #[{'widget_id': 'username', 'ncols': 1},],
             [{'widget_id': 'email', 'ncols': 1},],
-            [{'widget_id': 'pw', 'ncols': 1},],
-            [{'widget_id': 'rpw', 'ncols': 1},],
+            #[{'widget_id': 'pw', 'ncols': 1},],
+            #[{'widget_id': 'rpw', 'ncols': 1},],
         ]
     },
@@ -1457,9 +1466,9 @@
                 'help': '',
                 'is_i18n': False,
-                'vocabulary': 'faculties',
+                'vocabulary': 'get_faculties_voc',
             },
         },
         'course': {
-            'type': 'String Widget',
+            'type': 'Select Widget',
             'data': {
                 'title': 'Study Course',
@@ -1470,4 +1479,5 @@
                 'description': '',
                 'help': 'The course to study',
+                'vocabulary': 'get_departments_voc',
                 'is_i18n': False,
             },
Index: waeup_product/trunk/skins/waeup_default/getWAeUPSchemas.py
===================================================================
--- waeup_product/trunk/skins/waeup_default/getWAeUPSchemas.py	(revision 171)
+++ waeup_product/trunk/skins/waeup_default/getWAeUPSchemas.py	(revision 173)
@@ -488,4 +488,10 @@
         'data': {
             'is_searchabletext': 1,
+        },
+    },
+     'username': {
+        'type': 'CPS String Field',
+        'data': {
+            'is_searchabletext': 0,
         },
     },
Index: waeup_product/trunk/skins/waeup_default/getWAeUPTypes.py
===================================================================
--- waeup_product/trunk/skins/waeup_default/getWAeUPTypes.py	(revision 171)
+++ waeup_product/trunk/skins/waeup_default/getWAeUPTypes.py	(revision 173)
@@ -73,4 +73,97 @@
 ###)
 
+academics_folder_type = { ###(
+    'title': 'WAeUP Academics Folder',
+    'description': 'The WAeUP Academics Folder',
+    'content_icon': '',
+    'content_meta_type': 'AcademicsFolder',
+    'product': 'CPSDefault',
+    'factory': 'addFolder',
+    'immediate_view': 'folder_view',
+    'global_allow': 1,
+    'filter_content_types': 1,
+    'allowed_content_types': ('Faculty',),
+    'allow_discussion': 0,
+    'cps_is_searchable': 1,
+    'cps_display_as_document_in_listing': 1,
+    'cps_proxy_type': 'folder',
+    'schemas': ['metadata', 'common', 'folder'],
+    'layouts': ['waeup_common','folder'],
+    'layout_clusters': ['metadata:metadata'],
+    'cps_section_wf': 'waeup_section_wf',
+    'actions': ({'id': 'view',
+                 'name': 'Standard View',
+                 #'action': 'academics_view',
+                 'action': 'temporary_view_all',
+                 'condition': "",
+                 'permissions': (View,)},
+                {'id': 'add_faculty',
+                 'name': 'Add Faculty',
+                 'condition': "python:member and 'UniversityManager'in member.getRoles()",
+                 'action'    : 'string:${object/absolute_url}/create_common?type_name=Faculty',
+                 'permissions': (UniversityManage,)},
+                 {'id': 'localroles',
+                 'name': 'delegate',
+                 'action': 'folder_localrole_form',
+                 'permissions': (UniversityManage,),
+                 'visible': False,
+                 },
+                )
+      }
+###)
+
+scratch_card = { ###(
+    'title': 'WAeUP Scratchcard',
+    'description': '',
+    'content_icon': 'student.gif',
+    'content_meta_type': 'Scratch Card',
+    'product': 'CPSDocument',
+    'factory': 'addCPSDocument',
+    'immediate_view': 'cpsdocument_view',
+    'global_allow': True,
+    'filter_content_types': True,
+    'allowed_content_types': (),
+    'allow_discussion': False,
+    'cps_is_searchable': True,
+    'cps_proxy_type': 'document',
+    'cps_display_as_document_in_listing': True,
+    'schemas': ('scratch_card'),
+    'layouts': ('scratch_card'),
+    'cps_workspace_wf': 'waeup_workspace_wf',
+    'cps_section_wf': 'waeup_section_wf',
+##    'actions': (
+##         {'id': 'view',
+##          'name': 'Standard View',
+##          'action': 'string:${object_url}/document_view',
+##          'condition': '',
+##          'permission': ('View',),
+##          'category': 'object',
+##          'visible': True,},
+##         {'id': 'new_content',
+##          'name': 'Add a scratch card',
+##          'action': 'string:${object_url}/folder_factories',
+##          'condition': "python:len(object.contentItems()) == 0 ",
+##          'permission': ('Modify portal content',),
+##          'category': 'object',
+##          'visible': True,},
+##         {'id': 'contents',
+##          'name': 'action_folder_contents',
+##          'action': 'string:${object_url}/folder_contents',
+##          'condition': "python:object.getTypeInfo().cps_proxy_type != 'document'",
+##          'permission': ('Modify portal content',),
+##          'category': 'object',
+##          'visible': True,},
+##         {'id': 'edit',
+##          'name': 'action_edit',
+##          'action': 'string:${object_url}/cpsdocument_edit_form',
+##          'condition': '',
+##          'permission': ('Modify portal content',),
+##          'category': 'object',
+##          'visible': True,},
+##    )
+}
+#
+###)
+
 students_folder_type = { ###(
     'title': 'WAeUP Student Folder',
@@ -116,6 +209,6 @@
                 {
                 'id'        : 'admission_list',
-                'name'      : 'Clearence Elegibility Process',
-                'action'    : 'string:${object/absolute_url}/clearence',
+                'name'      : 'Clearance Eligibility Process',
+                'action'    : 'string:${object/absolute_url}/clearance',
                 'condition':  'object/portal_membership/isAnonymousUser',
                 'permission': (View,)},
@@ -152,97 +245,4 @@
 ###)
 
-academics_folder_type = { ###(
-    'title': 'WAeUP Academics Folder',
-    'description': 'The WAeUP Academics Folder',
-    'content_icon': '',
-    'content_meta_type': 'AcademicsFolder',
-    'product': 'CPSDefault',
-    'factory': 'addFolder',
-    'immediate_view': 'folder_view',
-    'global_allow': 1,
-    'filter_content_types': 1,
-    'allowed_content_types': ('Faculty',),
-    'allow_discussion': 0,
-    'cps_is_searchable': 1,
-    'cps_display_as_document_in_listing': 1,
-    'cps_proxy_type': 'folder',
-    'schemas': ['metadata', 'common', 'folder'],
-    'layouts': ['waeup_common','folder'],
-    'layout_clusters': ['metadata:metadata'],
-    'cps_section_wf': 'waeup_section_wf',
-    'actions': ({'id': 'view',
-                 'name': 'Standard View',
-                 #'action': 'academics_view',
-                 'action': 'temporary_view_all',
-                 'condition': "",
-                 'permissions': (View,)},
-                {'id': 'add_faculty',
-                 'name': 'Add Faculty',
-                 'condition': "python:member and 'UniversityManager'in member.getRoles()",
-                 'action'    : 'string:${object/absolute_url}/create_common?type_name=Faculty',
-                 'permissions': (UniversityManage,)},
-                 {'id': 'localroles',
-                 'name': 'delegate',
-                 'action': 'folder_localrole_form',
-                 'permissions': (UniversityManage,),
-                 'visible': False,
-                 },
-                )
-      }
-###)
-
-scratch_card = { ###(
-    'title': 'WAeUP Scratchcard',
-    'description': '',
-    'content_icon': 'student.gif',
-    'content_meta_type': 'Scratch Card',
-    'product': 'CPSDocument',
-    'factory': 'addCPSDocument',
-    'immediate_view': 'cpsdocument_view',
-    'global_allow': True,
-    'filter_content_types': True,
-    'allowed_content_types': (),
-    'allow_discussion': False,
-    'cps_is_searchable': True,
-    'cps_proxy_type': 'document',
-    'cps_display_as_document_in_listing': True,
-    'schemas': ('scratch_card'),
-    'layouts': ('scratch_card'),
-    'cps_workspace_wf': 'waeup_workspace_wf',
-    'cps_section_wf': 'waeup_section_wf',
-##    'actions': (
-##         {'id': 'view',
-##          'name': 'Standard View',
-##          'action': 'string:${object_url}/document_view',
-##          'condition': '',
-##          'permission': ('View',),
-##          'category': 'object',
-##          'visible': True,},
-##         {'id': 'new_content',
-##          'name': 'Add a scratch card',
-##          'action': 'string:${object_url}/folder_factories',
-##          'condition': "python:len(object.contentItems()) == 0 ",
-##          'permission': ('Modify portal content',),
-##          'category': 'object',
-##          'visible': True,},
-##         {'id': 'contents',
-##          'name': 'action_folder_contents',
-##          'action': 'string:${object_url}/folder_contents',
-##          'condition': "python:object.getTypeInfo().cps_proxy_type != 'document'",
-##          'permission': ('Modify portal content',),
-##          'category': 'object',
-##          'visible': True,},
-##         {'id': 'edit',
-##          'name': 'action_edit',
-##          'action': 'string:${object_url}/cpsdocument_edit_form',
-##          'condition': '',
-##          'permission': ('Modify portal content',),
-##          'category': 'object',
-##          'visible': True,},
-##    )
-}
-#
-###)
-
 student_type = { ###(
     'title': 'WAeUP Student',
@@ -271,5 +271,5 @@
           #'action': 'string:${object_url}/student_index_html',
           'action': 'string:${object_url}/temporary_view_all',
-          'condition':  "python:object.getContent().memberIsOwner() or 'UniversityManager'in member.getRoles()",
+          'condition':  "python:object.getContent().memberIsOwner() or (member and 'UniversityManager'in member.getRoles())",
           'permission': (View,),
           'category': 'object',
Index: waeup_product/trunk/skins/waeup_default/getWAeUPVocabularies.py
===================================================================
--- waeup_product/trunk/skins/waeup_default/getWAeUPVocabularies.py	(revision 171)
+++ waeup_product/trunk/skins/waeup_default/getWAeUPVocabularies.py	(revision 173)
@@ -76,4 +76,16 @@
 vocabularies['faculties'] = faculties
 ###)
+get_faculties_voc = { ###(
+        'type': 'CPS Method Vocabulary',
+        'data': {'get_vocabulary_method': 'get_faculties_voc',}
+        }
+vocabularies['get_faculties_voc'] = get_faculties_voc
+###)
+get_departments_voc = { ###(
+        'type': 'CPS Method Vocabulary',
+        'data': {'get_vocabulary_method': 'get_departments_voc',}
+        }
+vocabularies['get_departments_voc'] = get_departments_voc
+###)
 
 level = { ###(
