Index: waeup_product/trunk/skins/waeup_default/getWAeUPLayouts.py
===================================================================
--- waeup_product/trunk/skins/waeup_default/getWAeUPLayouts.py	(revision 34)
+++ waeup_product/trunk/skins/waeup_default/getWAeUPLayouts.py	(revision 45)
@@ -4,4 +4,73 @@
 layouts = {}
 
+# common header layout
+common_layout = {
+    'widgets': {
+        'LanguageSelector': {
+            'type': 'Document Language Select Widget',
+            'data': {
+                'fields': ['Language'],
+            },
+        },
+        'Title': {
+            'type': 'Heading Widget',
+            'data': {
+                'fields': ['Title'],
+                'level': 1,
+                'is_i18n': 1,
+                'is_required': 1,
+                'label_edit': 'Name',
+                'display_width': 40,
+                'size_max': 200,
+            },
+        },
+        'Description': {
+            'type': 'Text Widget',
+            'data': {
+                'fields': ['Description'],
+                'is_i18n': 1,
+                'label_edit': 'cpsdoc_description_label_edit',
+                'label': '',
+                'css_class': 'ddescription',
+                'width': 72,
+                'height': 5,
+                'render_format': 'text',
+                'hidden_layout_modes': ('create','edit', 'view'),
+            },
+        },
+        'LanguageSelectorCreation': {
+            'type': 'Select Widget',
+            'data': {
+                'title': 'Language',
+                'fields': ('Language',),
+                'is_required': 0,
+                'label': 'label_language',
+                'label_edit': 'label_language',
+                'description': '',
+                'help': '',
+                'is_i18n': 0,
+                'readonly_layout_modes': (),
+                'hidden_layout_modes': ('create','edit', 'view'),
+                'hidden_readonly_layout_modes': (),
+                'hidden_empty': 0,
+                'hidden_if_expr': '',
+                'css_class': '',
+                'vocabulary': 'language_voc',
+            },
+        },
+    },
+    'layout': {
+        'style_prefix': 'layout_default_',
+        'rows': [
+            [{'widget_id': 'LanguageSelector'}],
+            [{'widget_id': 'Title'},],
+            [{'widget_id': 'Description'},],
+            [{'widget_id': 'LanguageSelectorCreation'}],
+            ],
+        },
+    }
+layouts['waeup_common'] = common_layout
+#
+#
 student_layout = {
     'widgets': {
@@ -108,5 +177,6 @@
 }
 layouts['student'] = student_layout
-
+#
+#
 scratch_card = {
     'widgets': {
Index: waeup_product/trunk/skins/waeup_default/getWAeUPSchemas.py
===================================================================
--- waeup_product/trunk/skins/waeup_default/getWAeUPSchemas.py	(revision 34)
+++ waeup_product/trunk/skins/waeup_default/getWAeUPSchemas.py	(revision 45)
@@ -1,2 +1,22 @@
+university_schema = {
+   'allow_discussion': {
+        'type': 'CPS Int Field',
+        'data': {
+            'default_expr': 'python:0',
+            'is_searchabletext': 0,
+        },
+    },
+}
+
+students_folder_schema = {
+   'allow_discussion': {
+        'type': 'CPS Int Field',
+        'data': {
+            'default_expr': 'python:0',
+            'is_searchabletext': 0,
+        },
+    },
+}
+
 student_schema = {
    'allow_discussion': {
@@ -300,4 +320,6 @@
 }
 schemas = {}
+schemas['university'] = university_schema
+schemas['students'] = students_folder_schema
 schemas['student'] = student_schema
 schemas['jamb'] = jamb_schema
Index: waeup_product/trunk/skins/waeup_default/getWAeUPTypes.py
===================================================================
--- waeup_product/trunk/skins/waeup_default/getWAeUPTypes.py	(revision 34)
+++ waeup_product/trunk/skins/waeup_default/getWAeUPTypes.py	(revision 45)
@@ -8,12 +8,59 @@
 ChangePermissions = 'Change permissions'
 
-student_folder_type = {
+university_type = {
+    'title': 'WAeUP Base Folder',
+    'description': 'The WAeUP Container',
+    'content_icon': 'students_folder.gif',
+    'content_meta_type': 'University',
+    'product': 'WAeUP',
+    'factory': 'addUniversity',
+    'immediate_view': 'folder_view',
+    'global_allow': 1,
+    'filter_content_types': 1,
+    'allowed_content_types': ('StudentsFolder'),
+    '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': 'action_view',
+                 'action': 'folder_view',
+                 'permissions': (View,)},
+                {'id': 'new_content',
+                 'name': 'action_new_content',
+                 'action': 'folder_factories',
+                 'permissions': (AddPortalContent,)},
+                {'id': 'contents',
+                 'name': 'action_folder_contents',
+                 'action': 'folder_contents',
+                 'permissions': (ModifyPortalContent,)},
+                {'id': 'edit',
+                 'name': 'action_edit',
+                 'action': 'cpsdocument_edit_form',
+                 'permissions': (ModifyPortalContent,)},
+                {'id': 'metadata',
+                 'name': 'action_metadata',
+                 'action': 'cpsdocument_metadata',
+                 'condition': 'not:portal/portal_membership/isAnonymousUser',
+                 'permissions': (View,)},
+                {'id': 'localroles',
+                 'name': 'action_local_roles',
+                 'action': 'folder_localrole_form',
+                 'permissions': (ChangePermissions,)},
+    )
+}
+
+students_folder_type = {
     'title': 'WAeUP Student Folder',
     'description': 'The WAeUP Student Folder',
     'content_icon': 'students_folder.gif',
-    'content_meta_type': 'Folder',
-    'product': 'CPSDefault',
-    'factory': 'addFolder',
-    'immediate_view': 'student_folder_view',
+    'content_meta_type': 'StudentsFolder',
+    'product': 'WAeUP',
+    'factory': 'addStudentsFolder',
+    'immediate_view': 'folder_view',
     'global_allow': 1,
     'filter_content_types': 1,
@@ -25,5 +72,5 @@
     'cps_proxy_type': 'folder',
     'schemas': ['metadata', 'common', 'folder'],
-    'layouts': ['folder'],
+    'layouts': ['waeup_common','folder'],
     'layout_clusters': ['metadata:metadata'],
     'cps_section_wf': 'waeup_section_wf',
@@ -36,8 +83,8 @@
                  'action': 'folder_factories',
                  'permissions': (AddPortalContent,)},
-##                {'id': 'contents',
-##                 'name': 'action_folder_contents',
-##                 'action': 'folder_contents',
-##                 'permissions': (ModifyPortalContent,)},
+                {'id': 'contents',
+                 'name': 'action_folder_contents',
+                 'action': 'folder_contents',
+                 'permissions': (ModifyPortalContent,)},
                 {'id': 'edit',
                  'name': 'action_edit',
@@ -55,12 +102,16 @@
     )
 }
+
 student_type = {
     'title': 'WAeUP Student',
     'description': '',
     'content_icon': 'student.gif',
-    'content_meta_type': 'CPS Document',
+    'content_meta_type': 'Student',
     'product': 'CPSDocument',
     'factory': 'addCPSDocument',
     'immediate_view': 'cpsdocument_view',
+    #'product': 'WAeUP',
+    #'factory': 'addStudent',
+    #'immediate_view': 'student_view',
     'global_allow': True,
     'filter_content_types': True,
@@ -70,6 +121,8 @@
     'cps_proxy_type': 'document',
     'cps_display_as_document_in_listing': True,
-    'schemas': ['student'],
-    'layouts': ['student'],
+    'schemas': ['metadata','common','student'],
+    'layouts': ['waeup_common','student'],
+    'flexible_layouts': (),
+    'layout_clusters': ['metadata:metadata'],
     'cps_workspace_wf': 'waeup_workspace_wf',
     'cps_section_wf': 'waeup_section_wf',
@@ -77,5 +130,6 @@
          {'id': 'view',
           'name': 'action_view',
-          'action': 'string:${object_url}/student_view',
+          #'action': 'string:${object_url}/student_view',
+          'action': 'string:${object_url}/cpsdocument_view',
           'condition': '',
           'permission': ('View',),
@@ -109,5 +163,5 @@
     'description': '',
     'content_icon': 'student.gif',
-    'content_meta_type': 'CPS Document',
+    'content_meta_type': 'Scratch Card',
     'product': 'CPSDocument',
     'factory': 'addCPSDocument',
@@ -183,5 +237,6 @@
 
 types = {}
-types['StudentFolder'] = student_folder_type
+types['University'] = university_type
+types['StudentsFolder'] = students_folder_type
 types['Student'] = student_type
 types['ScratchCard'] = scratch_card
