Index: waeup_product/trunk/skins/waeup_student/create_jamb.py
===================================================================
--- waeup_product/trunk/skins/waeup_student/create_jamb.py	(revision 88)
+++ waeup_product/trunk/skins/waeup_student/create_jamb.py	(revision 89)
@@ -52,14 +52,14 @@
     noCPSMember = False
     try:
-        pr.addMember(s_id, 'UnSeT',roles=('Member','CPSMember'))
+        pr.addMember(s_id, 'UnSeT',roles=('Member','CPSMember','Student'))
     except:
         noCPSMember = True
     if noCPSMember:
         pr.addMember(s_id, 'UnSeT',roles=('Member',))
-    groups = context.portal_directories.groups
-    gm = list(groups.getEntry('Students')['members'])
-    gm.extend((s_id,))
-    groups.editEntry({'group': 'Students', 
-                      'members': gm})  
+##    groups = context.portal_directories.groups
+##    gm = list(groups.getEntry('Students')['members'])
+##    gm.extend((s_id,))
+##    groups.editEntry({'group': 'Students', 
+##                      'members': gm})  
     return context.students_folder_view_manager(psm=psm)
 ##    return context.create_jamb_form(rendered = res,
Index: waeup_product/trunk/skins/waeup_student/jamb_index_html.py
===================================================================
--- waeup_product/trunk/skins/waeup_student/jamb_index_html.py	(revision 88)
+++ waeup_product/trunk/skins/waeup_student/jamb_index_html.py	(revision 89)
@@ -7,6 +7,9 @@
 
 #return context.student_view_manager()
-if 'StudentManager' in member.getGroups():
-    return context.jamb_view_manager()
-elif 'Students' in member.getGroups():
-    return context.jamb_view_student()
+if member:
+    roles = member.getRoles()
+    if 'Manager' in roles:
+        return context.cpsdocument_view()
+    elif 'StudentManager' in roles:
+        return context.jamb_view_manager()
+return context.jamb_view_student()
Index: waeup_product/trunk/skins/waeup_student/student_folder_view_all.pt
===================================================================
--- waeup_product/trunk/skins/waeup_student/student_folder_view_all.pt	(revision 88)
+++ 	(revision )
@@ -1,27 +1,0 @@
-<html metal:use-macro="here/content_lib_master/macros/master">
-
-  <metal:block fill-slot="head_slot">
-    <tal:block tal:define="student here/getContent">
-    </tal:block>
-  </metal:block>
-
-  <metal:block fill-slot="css_slot">
-    <link rel="Stylesheet" type="text/css" href=""
-          tal:attributes="href string:${base_url}student.css" />
-  </metal:block>
-  <metal:block fill-slot="header">
-  </metal:block>
-
-  <metal:block fill-slot="main"
-               tal:define="student_folder here/getContent;
-               items here/contentValues"
-               >
-    <span tal:condition="python: mtool.isAnonymousUser()"> 
-      Please login or 
-      <br /><a href="" tal:attributes="href string:${context/absolute_url}/admission_status">check you Jambadmission</a>.
-      <br /><a href="" tal:attributes="href string:${context/absolute_url}/check_admission">check you Jambadmission</a>.
-    </span>
-  </metal:block>
-  <metal:block fill-slot="sub">
-  </metal:block>
-</html>
Index: waeup_product/trunk/skins/waeup_student/student_index_html.py
===================================================================
--- waeup_product/trunk/skins/waeup_student/student_index_html.py	(revision 88)
+++ waeup_product/trunk/skins/waeup_student/student_index_html.py	(revision 89)
@@ -8,8 +8,8 @@
 #return context.student_view_manager()
 if member:
-    if 'Manager' in member.getRoles():
+    roles = member.getRoles()
+    if 'Manager' in roles:
         return context.folder_view()
-    elif 'StudentManager' in member.getGroups():
+    elif 'StudentManager' in roles:
         return context.student_view_manager()
-    elif 'Students' in member.getGroups():
-        return context.student_view_student()
+return context.student_view_student()
Index: waeup_product/trunk/skins/waeup_student/student_personal_index_html.py
===================================================================
--- waeup_product/trunk/skins/waeup_student/student_personal_index_html.py	(revision 88)
+++ waeup_product/trunk/skins/waeup_student/student_personal_index_html.py	(revision 89)
@@ -7,6 +7,9 @@
 
 #return context.student_view_manager()
-if 'StudentManager' in member.getGroups():
-    return context.student_personal_view_manager()
-elif 'Students' in member.getGroups():
-    return context.student_personal_view_student()
+if member:
+    roles = member.getRoles()
+    if 'Manager' in roles:
+        return context.cpsdocument_view()
+    elif 'StudentManager' in roles:
+        return context.student_personal_view_manager()
+return context.student_personal_view_student()
Index: waeup_product/trunk/skins/waeup_student/students_folder_view.py
===================================================================
--- waeup_product/trunk/skins/waeup_student/students_folder_view.py	(revision 88)
+++ waeup_product/trunk/skins/waeup_student/students_folder_view.py	(revision 89)
@@ -9,5 +9,10 @@
 member = context.portal_membership.getAuthenticatedMember()
 if member:
-    if 'Manager' in member.getRoles():
+    roles = member.getRoles()
+    if 'Manager' in roles:
         return context.folder_view()
+    elif 'StudentManager' in roles:
+        return context.students_folder_view_manager(psm=psm)
+    elif 'Student' in roles:
+        return context.students_folder_view_student(psm=psm)
 return context.students_folder_view_all(psm=psm)
Index: waeup_product/trunk/skins/waeup_student/students_folder_view_all.pt
===================================================================
--- waeup_product/trunk/skins/waeup_student/students_folder_view_all.pt	(revision 89)
+++ waeup_product/trunk/skins/waeup_student/students_folder_view_all.pt	(revision 89)
@@ -0,0 +1,27 @@
+<html metal:use-macro="here/content_lib_master/macros/master">
+
+  <metal:block fill-slot="head_slot">
+    <tal:block tal:define="student here/getContent">
+    </tal:block>
+  </metal:block>
+
+  <metal:block fill-slot="css_slot">
+    <link rel="Stylesheet" type="text/css" href=""
+          tal:attributes="href string:${base_url}student.css" />
+  </metal:block>
+  <metal:block fill-slot="header">
+  </metal:block>
+
+  <metal:block fill-slot="main"
+               tal:define="student_folder here/getContent;
+               items here/contentValues"
+               >
+    <span tal:condition="python: mtool.isAnonymousUser()"> 
+      Please login or 
+      <br /><a href="" tal:attributes="href string:${context/absolute_url}/admission_status">check you Jambadmission</a>.
+      <br /><a href="" tal:attributes="href string:${context/absolute_url}/check_admission">check you Jambadmission</a>.
+    </span>
+  </metal:block>
+  <metal:block fill-slot="sub">
+  </metal:block>
+</html>
