Index: WAeUP_SRP/trunk/skins/waeup_academics/academics_index.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_academics/academics_index.py	(revision 600)
+++ WAeUP_SRP/trunk/skins/waeup_academics/academics_index.py	(revision 603)
@@ -21,5 +21,4 @@
 
 campus = context.portal_catalog(meta_type = "University")[-1].getObject()
-member = pm.getAuthenticatedMember()
 
 if context.isManager():
Index: WAeUP_SRP/trunk/skins/waeup_academics/academics_index_view.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_academics/academics_index_view.pt	(revision 600)
+++ WAeUP_SRP/trunk/skins/waeup_academics/academics_index_view.pt	(revision 603)
@@ -35,5 +35,14 @@
               <strong tal:content="row/title" /></a> </td>
             <td tal:content="row/id"> </td>
-            <td><a href="edit" tal:attributes="href string:${row/url}/cpsdocument_edit_form">[edit]</a></td>
+            
+            <td> 
+            <a tal:condition="row/is_editable"
+                href="edit" tal:attributes="href string:${row/url}/external_edit_form"
+                target="edit"
+                onclick="javascript:window.open('','edit','width=600, height=700, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')">
+                [edit]
+                </a> 
+            </td>
+            
           </tr>
         </table>
Index: WAeUP_SRP/trunk/skins/waeup_academics/courses_index_view.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_academics/courses_index_view.pt	(revision 600)
+++ WAeUP_SRP/trunk/skins/waeup_academics/courses_index_view.pt	(revision 603)
@@ -66,5 +66,12 @@
                 <td tal:content="row/id"> </td>
                 <td tal:condition="row/is_editable" tal:content="row/review_state"> </td>
-                <td tal:condition="row/is_editable"><a href="edit" tal:attributes="href string:${row/url}/cpsdocument_edit_form">[edit]</a></td>
+                <td> 
+                <a tal:condition="row/is_editable"
+                    href="edit" tal:attributes="href string:${row/url}/external_edit_form"
+                    target="edit"
+                    onclick="javascript:window.open('','edit','width=600, height=700, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')">
+                    [edit]
+                    </a> 
+                </td>                
               </tr>
             </span>
Index: WAeUP_SRP/trunk/skins/waeup_academics/getCertificateInfo.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_academics/getCertificateInfo.py	(revision 600)
+++ WAeUP_SRP/trunk/skins/waeup_academics/getCertificateInfo.py	(revision 603)
@@ -15,11 +15,7 @@
 
 wf = context.portal_workflow
-mtool = context.portal_membership
-member = mtool.getAuthenticatedMember()
 path_info = request.get('PATH_INFO').split('/')
 
 info = {}
-member_id = str(member)
-roles = member.getRoles()
 info['is_manager'] = context.isManager()
 info['is_student'] = context.isStudent()
Index: WAeUP_SRP/trunk/skins/waeup_academics/getCoursesCertificatesInfo.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_academics/getCoursesCertificatesInfo.py	(revision 600)
+++ WAeUP_SRP/trunk/skins/waeup_academics/getCoursesCertificatesInfo.py	(revision 603)
@@ -15,11 +15,7 @@
 
 wf = context.portal_workflow
-mtool = context.portal_membership
-member = mtool.getAuthenticatedMember()
 path_info = request.get('PATH_INFO').split('/')
 
 info = {}
-member_id = str(member)
-roles = member.getRoles()
 info['is_manager'] = context.isManager()
 info['is_student'] = context.isStudent()
Index: WAeUP_SRP/trunk/skins/waeup_academics/getCoursesInfo.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_academics/getCoursesInfo.py	(revision 600)
+++ WAeUP_SRP/trunk/skins/waeup_academics/getCoursesInfo.py	(revision 603)
@@ -15,13 +15,10 @@
 
 wf = context.portal_workflow
+path_info = request.get('PATH_INFO').split('/')
 mtool = context.portal_membership
-member = mtool.getAuthenticatedMember()
-path_info = request.get('PATH_INFO').split('/')
 
 info = {}
-member_id = str(member)
 #dep_id = request.get('PATH_TRANSLATED').split('/')[-2]
 dep_id = context.aq_parent.getId()
-roles = member.getRoles()
 info['is_manager'] = context.isManager()
 info['is_student'] = context.isStudent()
Index: WAeUP_SRP/trunk/skins/waeup_academics/getDocumentInfo.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_academics/getDocumentInfo.py	(revision 600)
+++ WAeUP_SRP/trunk/skins/waeup_academics/getDocumentInfo.py	(revision 603)
@@ -15,13 +15,9 @@
 
 wf = context.portal_workflow
-mtool = context.portal_membership
-member = mtool.getAuthenticatedMember()
 path_info = request.get('PATH_INFO').split('/')
 
 info = {}
-member_id = str(member)
-roles = member.getRoles()
-info['is_manager'] = 'Manager' in roles or 'SectionManager' in roles
-info['is_student'] = 'Student' in roles 
+info['is_manager'] = context.isManager
+info['is_student'] = context.isStudent
 info['doc'] = context.getContent()
 return info
Index: WAeUP_SRP/trunk/skins/waeup_academics/getFacultiesInfo.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_academics/getFacultiesInfo.py	(revision 600)
+++ WAeUP_SRP/trunk/skins/waeup_academics/getFacultiesInfo.py	(revision 603)
@@ -16,12 +16,9 @@
 wf = context.portal_workflow
 mtool = context.portal_membership
-member = mtool.getAuthenticatedMember()
 path_info = request.get('PATH_INFO').split('/')
 
 info = {}
-member_id = str(member)
-roles = member.getRoles()
 info['is_manager'] = context.isManager()
-info['is_student'] = context.isStudent() 
+info['is_student'] = context.isStudent()
 info['action'] = "%s" % context.campus.absolute_url()
 info['choosen_ids'] = request.get('ids',[])
@@ -35,4 +32,5 @@
     row['title'] = fd.LongTitle()
     row['url'] = fo.absolute_url()
+    row['is_editable'] = mtool.checkPermission('Modify portal content', fo)
     items.append(row)
 info['items'] = items
Index: WAeUP_SRP/trunk/skins/waeup_academics/getLevelInfo.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_academics/getLevelInfo.py	(revision 600)
+++ WAeUP_SRP/trunk/skins/waeup_academics/getLevelInfo.py	(revision 603)
@@ -15,6 +15,4 @@
 
 wf = context.portal_workflow
-mtool = context.portal_membership
-member = mtool.getAuthenticatedMember()
 path_info = request.get('PATH_INFO').split('/')
 try:
@@ -24,5 +22,4 @@
     p = 1
 info = {}
-member_id = str(member)
 pt = request.get('PATH_TRANSLATED').split('/')
 
@@ -30,5 +27,4 @@
 cert_id = pt[-(2+p)]
 level_id = pt[-(1+p)]
-roles = member.getRoles()
 info['is_manager'] = context.isManager()
 info['is_student'] = context.isStudent()
@@ -51,5 +47,5 @@
     row['id'] = r.getId
     row['title'] = rd.Title()
-    row['core'] = rd.core_or_elective 
+    row['core'] = rd.core_or_elective
     row['semester'] = rd.semester
     row['url'] = ro.absolute_url()
Index: WAeUP_SRP/trunk/skins/waeup_academics/level_index_view.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_academics/level_index_view.pt	(revision 600)
+++ WAeUP_SRP/trunk/skins/waeup_academics/level_index_view.pt	(revision 603)
@@ -41,5 +41,12 @@
                 <td tal:content="python: test(row['core'],'core','elective')"></td>
                 <td tal:condition="row/is_editable" tal:content="row/review_state"> </td>
-                <td tal:condition="row/is_editable" ><a href="edit" tal:attributes="href string:${row/url}/cpsdocument_edit_form">[edit]</a></td>
+                <td> 
+                <a tal:condition="row/is_editable"
+                    href="edit" tal:attributes="href string:${row/url}/external_edit_form"
+                    target="edit"
+                    onclick="javascript:window.open('','edit','width=600, height=700, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')">
+                    [edit]
+                    </a> 
+                </td>
               </tr>
             </span>
Index: WAeUP_SRP/trunk/skins/waeup_academics/searchAcademics.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_academics/searchAcademics.py	(revision 600)
+++ WAeUP_SRP/trunk/skins/waeup_academics/searchAcademics.py	(revision 603)
@@ -18,18 +18,15 @@
 wf = context.portal_workflow
 catalog = context.portal_catalog
-mtool = context.portal_membership
-member = mtool.getAuthenticatedMember()
 lt = context.portal_layouts
 pr = context.portal_registration
 path_info = request.get('PATH_INFO').split('/')
-roles = member.getRoles()
-is_manager = 'Manager' in roles or 'SectionManager' in roles
+is_manager = context.isManager
 validate = request.has_key("cpsdocument_edit_button")
 items = []
-default = {'search_mode': 'course', 
-        'review_state': 'unchecked', 
+default = {'search_mode': 'course',
+        'review_state': 'unchecked',
         'search_string': ''
         }
-        
+
 rend,psm,ds = lt.renderLayout(layout_id= 'academics_search',
                       schema_id= 'academics_search',
@@ -52,5 +49,5 @@
 if state == " ----- ":
     state = ''
-if not term and what in ('student_edit','jamb_id','name','matric_no'):
+if not term and what in ('student_edit','jamb_reg_no','name','matric_no'):
     return context.academics_search_view(rendered = rend,
                              psm = "You must specify a search string",
@@ -69,5 +66,5 @@
     res = catalog(portal_type='Student',
                   id = term.strip())
-elif what == "jamb_id":
+elif what == "jamb_reg_no":
     res = catalog(portal_type='StudentApplication',
                   SearchableText="%s*" % term.strip().lower())
