Index: waeup_product/trunk/Extensions/install.py
===================================================================
--- waeup_product/trunk/Extensions/install.py	(revision 28)
+++ waeup_product/trunk/Extensions/install.py	(revision 45)
@@ -29,5 +29,5 @@
         if CPSSubscriptions:
             ptypes = "('Portal', 'CPSMailAccess Message', 'CPSMailAccess Box', 'CPSMailAccess Folder',"\
-                     +  "'StudentFolder', 'Student', 'Jamb')"
+                     +  "'University', 'StudentsFolder', 'Student', 'Jamb')"
             condition = "object.portal_type not in %s" % ptypes
     
@@ -42,5 +42,5 @@
             self.verifyAction('portal_subscriptions', **action)
         if CPSForum:
-            ptypes = "('StudentFolder', 'Student', 'Jamb')"
+            ptypes = "('University', 'StudentsFolder', 'Student', 'Jamb')"
             condition = "object.portal_type not in %s" % ptypes
     
@@ -70,7 +70,7 @@
                         'id'        : 'new_student',
                         'name'      : 'Add Student',
-                        'action'    : 'string:${object/absolute_url}/create_student',
+                        'action'    : 'string:${object/absolute_url}/create_student_form',
                         'permission': (View),
-                        'condition' : 'python: member and here.portal_type == "StudentFolder"',
+                        'condition' : 'python: member and here.portal_type == "StudentsFolder"',
                         'category'  : 'student',
                         'visible'   : 1,
@@ -88,5 +88,5 @@
                         'id'        : 'add_jamb',
                         'name'      : 'Add Jamb Data',
-                        'action'    : 'string:${object/absolute_url}/create_jamb',
+                        'action'    : 'string:${object/absolute_url}/create_jamb_form',
                         'permission': (),
                         'condition' : 'python:here.portal_type != "Jamb" and len(object.contentItems()) == 0',
@@ -119,19 +119,24 @@
         dtypes = portal.getWAeUPTypes()
         self.verifyFlexibleTypes(dtypes)
-        self.allowContentTypes('StudentFolder', ('Workspace','Section',))
+        self.allowContentTypes('University', ('Workspace','Section',))
         #self.allowContentTypes('Student', ('Workspace', 'Section'))
-        ptypes = {
-                  'StudentFolder' : {
-                  'allowed_content_types': ('Student',),
-                  'typeinfo_name': 'WAeUP: StudentFolder',
-                  'add_meta_type': 'Factory-based Type Information',
-                  },
-                  'Student' : {
-                  'allowed_content_types': ('Jamb',),
-                  'typeinfo_name': 'WAeUP: Student',
-                  'add_meta_type': 'Factory-based Type Information',
-                  },
-                 }
-        self.verifyContentTypes(ptypes)
+##        ptypes = {
+##                  'University' : {
+##                  'allowed_content_types': ('StudentsFolder',),
+##                  'typeinfo_name': 'University',
+##                  'add_meta_type': 'Factory-based Type Information',
+##                  },
+##                  'StudentsFolder' : {
+##                  'allowed_content_types': ('Student',),
+##                  'typeinfo_name': 'StudentFolder',
+##                  'add_meta_type': 'Factory-based Type Information',
+##                  },
+##                  'Student' : {
+##                  'allowed_content_types': ('Jamb',),
+##                  'typeinfo_name': 'Student',
+##                  'add_meta_type': 'Factory-based Type Information',
+##                  },
+##                 }
+##        self.verifyContentTypes(ptypes)
         ##########################################
         # Schemas
@@ -179,5 +184,6 @@
                       }
 
-        se_chains = { 'StudentFolder': 'waeup_section_wf',
+        se_chains = { 'University': 'waeup_section_wf',
+                      'StudentsFolder': 'waeup_section_wf',
                       'Student': 'waeup_section_wf',
                       'Jamb': 'waeup_section_wf',
