Index: waeup_product/trunk/skins/waeup_default/getWAeUPLayouts.py
===================================================================
--- waeup_product/trunk/skins/waeup_default/getWAeUPLayouts.py	(revision 81)
+++ waeup_product/trunk/skins/waeup_default/getWAeUPLayouts.py	(revision 84)
@@ -85,10 +85,10 @@
     },
     'layout': {
-        'style_prefix': 'layout_default_',
+        'style_prefix': 'layout_waeup_',
         'rows': [
-            [{'widget_id': 'LanguageSelector'}],
+            #[{'widget_id': 'LanguageSelector'}],
             [{'widget_id': 'Title'},],
             [{'widget_id': 'Description'},],
-            [{'widget_id': 'LanguageSelectorCreation'}],
+            #[{'widget_id': 'LanguageSelectorCreation'}],
             ],
         },
@@ -790,4 +790,25 @@
 ###)
 
+department = { ###(
+   'widgets': {},
+   'layout': {
+        'style_prefix': 'layout_waeup_',
+        'flexible_widgets': (),
+        'ncols': 1,
+        'rows': [],
+    },
+}
+###)
+waeup_default = { ###(
+   'widgets': {},
+   'layout': {
+        'style_prefix': 'layout_waeup_',
+        'flexible_widgets': (),
+        'ncols': 1,
+        'rows': [],
+    },
+}
+###)
+
 course = { ###(
     'widgets': {
@@ -888,5 +909,5 @@
     },
    'layout': {
-        'style_prefix': 'layout_default_',
+        'style_prefix': 'layout_waeup_',
         'flexible_widgets': (),
         'ncols': 1,
@@ -904,4 +925,5 @@
 
 layouts = {}
+layouts['university'] = waeup_default
 layouts['waeup_common'] = common_layout
 layouts['student'] = student_layout
@@ -911,4 +933,6 @@
 layouts['jambcreate'] = jamb_layoutcreate
 layouts['jamb'] = jamb_layout
+layouts['faculty'] = waeup_default
+layouts['department'] = waeup_default
 layouts['course'] = course
 layouts['admission_status'] = admission_status
Index: waeup_product/trunk/skins/waeup_default/getWAeUPTypes.py
===================================================================
--- waeup_product/trunk/skins/waeup_default/getWAeUPTypes.py	(revision 81)
+++ waeup_product/trunk/skins/waeup_default/getWAeUPTypes.py	(revision 84)
@@ -6,4 +6,6 @@
 from Products.CMFCore.permissions import ModifyPortalContent
 from Products.CMFCore.permissions import AddPortalContent
+from Products.WAeUP.WAeUPPermissions import UniversityManage, StudentManage,FacultyManage,\
+                                            DepartmentManage,CourseManage
 ChangePermissions = 'Change permissions'
 
@@ -24,23 +26,24 @@
     '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',
+    'layouts': ['common', 'university'],
+    'layout_clusters': ['metadata:metadata'],
+    'cps_section_wf': 'waeup_section_wf',
+    'actions_add': ({'id': 'view',
                  'name': 'action_view',
                  'action': 'university_view',
-                 'permissions': (View,)},
-                {'id': 'new_content',
-                 'name': 'action_new_content',
+                 'permissions': (UniversityManage,)},
+                {'id': 'addFaculty',
+                 'name': 'Add a Faculty',
                  'action': 'folder_factories',
-                 'permissions': (AddPortalContent,)},
+                 'permissions': (UniversityManage,)},
                 {'id': 'contents',
                  'name': 'action_folder_contents',
                  'action': 'folder_contents',
-                 'permissions': (ModifyPortalContent,)},
+                 'permissions': (UniversityManage,)},
                 {'id': 'edit',
                  'name': 'action_edit',
                  'action': 'cpsdocument_edit_form',
-                 'permissions': (ModifyPortalContent,)},
+                 #'action': 'cpsdocument_edit_form',
+                 'permissions': (UniversityManage,)},
                 {'id': 'metadata',
                  'name': 'action_metadata',
@@ -79,33 +82,31 @@
                  'name': 'Students',
                  'action': 'students_folder_view',
-                 'permissions': (View,)},
+                 'permissions': (UniversityManage,)},
                 {
                 'id'        : 'add_content',
                 'name'      : 'Add Content',
                 'action'    : 'string:${object/absolute_url}/folder_factories',
-                'condition' : 'python: member and "Manager" in member.getRoles()',
-                'permissions': (AddPortalContent,)},
+                'permissions': (StudentManage,)},
                 {
                 'id'        : 'add_jamb',
                 'name'      : 'Add Student JAMB',
                 'action'    : 'string:${object/absolute_url}/create_jamb',
-                'condition' : 'python: member and "StudentManager" in member.getGroups()',
-                'permissions': (AddPortalContent,)},
+                'permissions': (UniversityManage,)},
                 {'id': 'contents',
                  'name': 'action_folder_contents',
                  'action': 'folder_contents',
-                 'permissions': (ModifyPortalContent,)},
+                 'permissions': (UniversityManage,)},
                 {'id': 'edit',
                  'name': 'action_edit',
                  'action': 'cpsdocument_edit_form',
-                 'permissions': (ModifyPortalContent,)},
+                 'permissions': (UniversityManage,)},
                 {'id': 'metadata',
                  'name': 'action_metadata',
                  'action': 'cpsdocument_metadata',
-                 'permissions': (ModifyPortalContent,)},
+                 'permissions': (UniversityManage,)},
                 {'id': 'localroles',
                  'name': 'action_local_roles',
                  'action': 'folder_localrole_form',
-                 'permissions': (ChangePermissions,)},
+                 'permissions': (UniversityManage,)},
     )
 }
@@ -139,5 +140,5 @@
           #'action': 'string:${object_url}/cpsdocument_view',
           'condition': '',
-          'permission': ('View',),
+          'permission': (View,),
           'category': 'object',
           'visible': True,},
@@ -294,5 +295,5 @@
     'cps_display_as_document_in_listing': True,
     'schemas': ['metadata','common','faculty'],
-    'layouts': ['waeup_common',],
+    'layouts': ['common','faculty'],
     'flexible_layouts': (),
     'layout_clusters': ['metadata:metadata'],
@@ -304,5 +305,12 @@
           'action': 'string:${object_url}/faculty_index_html',
           'condition': '',
-          'permission': ('View',),
+          'permission': (View,),
+          'category': 'object',
+          'visible': True,},
+         {'id': 'edit',
+          'name': 'action_edit',
+          'action': 'string:${object_url}/waeup_edit_form',
+          'condition': '',
+          'permission': (UniversityManage,),
           'category': 'object',
           'visible': True,},
@@ -327,5 +335,5 @@
     'cps_display_as_document_in_listing': True,
     'schemas': ['metadata','common','department'],
-    'layouts': ['waeup_common',],
+    'layouts': ['department','common',],
     'flexible_layouts': (),
     'layout_clusters': ['metadata:metadata'],
@@ -338,4 +346,11 @@
           'condition': '',
           'permission': ('View',),
+          'category': 'object',
+          'visible': True,},
+         {'id': 'edit',
+          'name': 'action_edit',
+          'action': 'string:${object_url}/waeup_edit_form',
+          'condition': '',
+          'permission': (FacultyManage,),
           'category': 'object',
           'visible': True,},
@@ -360,5 +375,5 @@
     'cps_display_as_document_in_listing': True,
     'schemas': ['metadata','common','course'],
-    'layouts': ['waeup_common','course'],
+    'layouts': ['common','course'],
     'flexible_layouts': (),
     'layout_clusters': ['metadata:metadata'],
@@ -371,4 +386,11 @@
           'condition': '',
           'permission': ('View',),
+          'category': 'object',
+          'visible': True,},
+         {'id': 'edit',
+          'name': 'action_edit',
+          'action': 'string:${object_url}/waeup_edit_form',
+          'condition': '',
+          'permission': (CourseManage,),
           'category': 'object',
           'visible': True,},
Index: waeup_product/trunk/skins/waeup_default/portlet_main_navigation.pt
===================================================================
--- waeup_product/trunk/skins/waeup_default/portlet_main_navigation.pt	(revision 84)
+++ waeup_product/trunk/skins/waeup_default/portlet_main_navigation.pt	(revision 84)
@@ -0,0 +1,21 @@
+<tal:block define="mtool here/portal_membership;
+                   anonymous mtool/isAnonymousUser;
+                   user python: mtool.getAuthenticatedMember();
+                   folder_id python:str(user)"
+                   >
+  <tal:block condition="python: 'Students' in user.getGroups()">
+    <a href="" i18n:translate=""
+       tal:attributes="href string:${here/portal_url}/sections/waeup/students/${folder_id}"
+       tal:content="string: Personal area for JAMB Registration ${folder_id}"></a>
+  </tal:block>
+  <tal:block condition="python: 'StudentManager' in user.getGroups()">
+    <a href="" i18n:translate=""
+       tal:attributes="href string:${here/portal_url}/sections/waeup/students"
+       >Studentadministration</a> | 
+    <a href="" i18n:translate=""
+       tal:attributes="href string:${here/portal_url}/sections/waeup/faculties"
+       >Faculties</a> 
+  </tal:block>
+  <tal:block condition="anonymous">
+  </tal:block>
+</tal:block>
Index: waeup_product/trunk/skins/waeup_default/portlet_session_info.pt
===================================================================
--- waeup_product/trunk/skins/waeup_default/portlet_session_info.pt	(revision 81)
+++ waeup_product/trunk/skins/waeup_default/portlet_session_info.pt	(revision 84)
@@ -6,5 +6,6 @@
     <span i18n:translate="">You are currently logged in as
       <em i18n:name="member"
-          tal:content="member" /><br />
+          tal:content="member" /><br />with Basic Roles <span tal:content="member/getRoles" /><br />
+      <span tal:condition="python: 0" tal:content="python:mtool.getCPSCandidateLocalRoles(context)" />
       <a href="" tal:condition="python: 'Students' in member.getGroups()" 
          tal:attributes="href string:${here/portal_url}/sections/waeup/students/${member}">goto your personal area</a>
Index: waeup_product/trunk/skins/waeup_default/portlet_studentnavigation.pt
===================================================================
--- waeup_product/trunk/skins/waeup_default/portlet_studentnavigation.pt	(revision 81)
+++ 	(revision )
@@ -1,18 +1,0 @@
-<tal:block define="mtool here/portal_membership;
-                   anonymous mtool/isAnonymousUser;
-                   user python: mtool.getAuthenticatedMember();
-                   folder_id python:str(user)"
-                   >
-  <tal:block condition="python: 'Students' in user.getGroups()">
-    <a href="" i18n:translate=""
-       tal:attributes="href string:${here/portal_url}/sections/waeup/students/${folder_id}"
-       tal:content="string: Personal area for JAMB Registration ${folder_id}"></a>
-  </tal:block>
-  <tal:block condition="python: 'StudentManager' in user.getGroups()">
-    <a href="" i18n:translate=""
-       tal:attributes="href string:${here/portal_url}/sections/waeup/students"
-       >Student Administration</a>
-  </tal:block>
-  <tal:block condition="anonymous">
-  </tal:block>
-</tal:block>
Index: waeup_product/trunk/skins/waeup_default/university_view.py
===================================================================
--- waeup_product/trunk/skins/waeup_default/university_view.py	(revision 81)
+++ waeup_product/trunk/skins/waeup_default/university_view.py	(revision 84)
@@ -12,4 +12,4 @@
         return context.students.students_folder_view_student(psm=psm,groups=groups)
     elif 'StudentManager' in member.getGroups():
-        return context.students.student_folder_view_manager(psm=psm,groups=groups)
+        return context.waeup_view_manager(psm=psm,groups=groups)
 return context.students.students_folder_view_anon(psm=psm,groups=groups)
