Index: WAeUP_SRP/base/skins/waeup_academics/academics_view.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_academics/academics_view.pt	(revision 3346)
+++ WAeUP_SRP/base/skins/waeup_academics/academics_view.pt	(revision 3473)
@@ -1,4 +1,4 @@
-<metal:html tal:define="info context/getFacultiesInfo;
-            is_so context/isSectionOfficer;"
+<metal:html tal:define="info context/getFolderObjectsInfo;
+            is_so info/is_sectionofficer;"
             >
   <metal:body use-macro="here/main_template/macros/master">
Index: WAeUP_SRP/base/skins/waeup_academics/courses_view.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_academics/courses_view.pt	(revision 3346)
+++ WAeUP_SRP/base/skins/waeup_academics/courses_view.pt	(revision 3473)
@@ -10,7 +10,6 @@
         Up one level
       </a>
-      <h3 tal:content="here/title_or_id">
-        Page Title
-      </h3>
+      <h3 tal:content="here/aq_parent/LongTitle|here/aq_parent/title_or_id" />
+      <h4 tal:content="here/title_or_id" />
       <div tal:condition="python:0" tal:content="info/container_path"/>
       <div tal:condition="python:0" tal:content="info/dep_id"/>
Index: WAeUP_SRP/base/skins/waeup_academics/department_view.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_academics/department_view.pt	(revision 3346)
+++ WAeUP_SRP/base/skins/waeup_academics/department_view.pt	(revision 3473)
@@ -9,6 +9,5 @@
         Up one level
       </a>
-      <h3 tal:content="here/title_or_id" />
-      <div tal:condition="nothing" tal:content="info/container_path"/>
+      <h3 tal:content="info/doc/LongTitle|here/title_or_id" />
       <br />
     </metal:block>
Index: WAeUP_SRP/base/skins/waeup_academics/faculty_view.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_academics/faculty_view.pt	(revision 3346)
+++ WAeUP_SRP/base/skins/waeup_academics/faculty_view.pt	(revision 3473)
@@ -1,4 +1,4 @@
-<metal:html tal:define="info context/getDepartmentsInfo;
-            is_so context/isSectionOfficer;"
+<metal:html tal:define="info context/getFolderObjectsInfo;
+            is_so info/is_sectionofficer;"
             >
   <metal:body use-macro="here/main_template/macros/master">
@@ -9,6 +9,5 @@
         Up one level
       </a>
-      <h3 tal:content="here/title_or_id" />
-      <div tal:condition="python:0" tal:content="info/container_path"/>
+      <h3 tal:content="info/doc/LongTitle|here/title_or_id" />
       <br />
     </metal:block>
Index: WAeUP_SRP/base/skins/waeup_academics/getAcademicsInfo.py
===================================================================
--- WAeUP_SRP/base/skins/waeup_academics/getAcademicsInfo.py	(revision 3346)
+++ 	(revision )
@@ -1,40 +1,0 @@
-## Script (Python) "getAcademicsInfo"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=student=None
-##title=
-##
-# $Id$
-"""
-return Info about the current Student
-"""
-request = context.REQUEST
-
-wf = context.portal_workflow
-mtool = context.portal_membership
-member = mtool.getAuthenticatedMember()
-path_info = request.get('PATH_INFO').split('/')
-
-info = {}
-member_id = str(member)
-##if member_id not in path_info:
-##    return None
-if student is None:
-    students = getattr(context,'students',None)
-    if students is None:
-        students = getattr(context.campus,'students',None)
-    student = getattr(students,member_id,None)
-    if student is None:
-        return None
-info['review_state'] = wf.getInfoFor(student,'review_state','keiner')
-#info['wf_state'] = 'keiner'
-info['student'] = student
-info['student_doc'] = student.getContent()
-info['app'] = student.application
-info['app_doc'] = student.application.getContent()
-info['per'] = student.personal
-info['per_doc'] = student.personal.getContent()
-return info
Index: WAeUP_SRP/base/skins/waeup_academics/getCoursesCertificatesInfo.py
===================================================================
--- WAeUP_SRP/base/skins/waeup_academics/getCoursesCertificatesInfo.py	(revision 3346)
+++ WAeUP_SRP/base/skins/waeup_academics/getCoursesCertificatesInfo.py	(revision 3473)
@@ -10,5 +10,5 @@
 # $Id$
 """
-return Info about the Faculties
+return Info about a Department
 """
 request = context.REQUEST
@@ -17,36 +17,10 @@
 path_info = request.get('PATH_INFO').split('/')
 
-info = {}
+#info = context.waeup_tool.getAccessInfo(context)
+info = context.certificates.getFolderObjectsInfo()
 info['action'] = "%s/faculty_view" % context.absolute_url()
 info['choosen_ids'] = request.get('ids',[])
 info['doc'] = context.getContent()
-brain = context.portal_catalog(meta_type="Department", id = context.getId())[-1]
-cp = brain.getPath()
-info['container_path'] = cp
-#res = context.portal_catalog(container_path="%s/courses" % cp)
-#items = []
-#for r in res:
-#    row = {}
-#    ro = r.getObject()
-#    rd = ro.getContent()
-#    row['id'] = r.getId
-#    row['title'] = rd.Title()
-#    row['url'] = ro.absolute_url()
-#    items.append(row)
-#info['courses'] = items
-res = context.portal_catalog(container_path="%s/certificates" % cp)
-items = []
-for r in res:
-    row = {}
-    try:
-        ro = r.getObject()
-        rd = ro.getContent()
-        row['id'] = r.getId
-        row['title'] = rd.Title()
-        row['url'] = ro.absolute_url()
-        items.append(row)
-    except AttributeError:
-        continue
-info['certificates'] = items
+info['certificates'] = info['items']
 return info
 
Index: WAeUP_SRP/base/skins/waeup_academics/getDepartmentsInfo.py
===================================================================
--- WAeUP_SRP/base/skins/waeup_academics/getDepartmentsInfo.py	(revision 3346)
+++ 	(revision )
@@ -1,46 +1,0 @@
-## Script (Python) "getDepartmentsInfo"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=student=None
-##title=
-##
-# $Id$
-"""
-return Info about the Faculties
-"""
-request = context.REQUEST
-
-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.getRolesInContext(context)
-info['action'] = "%s" % context.absolute_url()
-info['choosen_ids'] = request.get('ids',[])
-items = []
-info['doc'] = context.getContent()
-brain = context.portal_catalog(meta_type="Faculty", id = context.getId())[-1]
-cp = brain.getPath()
-info['container_path'] = cp
-res = context.portal_catalog(container_path=cp)
-for r in res:
-    row = {}
-    try:
-        ro = r.getObject()
-        rd = ro.getContent()
-        row['id'] = r.getId
-        row['title'] = rd.LongTitle()
-        row['url'] = ro.absolute_url()
-        row['is_editable'] = mtool.checkPermission('Modify portal content', ro)
-        items.append(row)
-    except AttributeError:
-        continue
-        
-info['items'] = items
-return info
Index: WAeUP_SRP/base/skins/waeup_academics/getDocumentInfo.py
===================================================================
--- WAeUP_SRP/base/skins/waeup_academics/getDocumentInfo.py	(revision 3346)
+++ 	(revision )
@@ -1,24 +1,0 @@
-## Script (Python) "getDocumentInfo"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=student=None
-##title=
-##
-# $Id:getDocumentInfo.py 486 2006-09-06 10:09:39Z joachim $
-"""
-return Info about the Faculties
-"""
-request = context.REQUEST
-
-wf = context.portal_workflow
-path_info = request.get('PATH_INFO').split('/')
-
-info = {}
-try:
-    info['doc'] = context.getContent()
-except:
-    return None
-return info
Index: WAeUP_SRP/base/skins/waeup_academics/getFacultiesInfo.py
===================================================================
--- WAeUP_SRP/base/skins/waeup_academics/getFacultiesInfo.py	(revision 3346)
+++ 	(revision )
@@ -1,47 +1,0 @@
-## Script (Python) "getFacultiesInfo"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=student=None
-##title=
-##
-# $Id:getFacultiesInfo.py 486 2006-09-06 10:09:39Z joachim $
-"""
-return Info about the Faculties
-"""
-request = context.REQUEST
-def cmp_id(a,b):
-    s1 = "%(id)s" % a
-    s2 = "%(id)s" % b
-    if s1 == s2:
-        return 0
-    if s1 > s2:
-        return 1
-    return -1
-
-wf = context.portal_workflow
-mtool = context.portal_membership
-path_info = request.get('PATH_INFO').split('/')
-
-info = {}
-info['action'] = "%s" % context.absolute_url()
-info['choosen_ids'] = request.get('ids',[])
-items = []
-facs = context.portal_catalog(portal_type='Faculty')
-for f in facs:
-    row = {}
-    try:
-        fo = f.getObject()
-        fd = fo.getContent()
-        row['id'] = fo.getId()
-        row['title'] = fd.LongTitle()
-        row['url'] = fo.absolute_url()
-        row['is_editable'] = mtool.checkPermission('Modify portal content', fo)
-        items.append(row)
-    except AttributeError:
-        continue
-items.sort(cmp_id)
-info['items'] = items
-return info
Index: WAeUP_SRP/base/skins/waeup_academics/getLevelInfo.py
===================================================================
--- WAeUP_SRP/base/skins/waeup_academics/getLevelInfo.py	(revision 3346)
+++ WAeUP_SRP/base/skins/waeup_academics/getLevelInfo.py	(revision 3473)
@@ -10,6 +10,11 @@
 # $Id$
 """
-return Info about the Faculties
+return Info about the Level
 """
+try:
+    from Products.zdb import set_trace
+except:
+    def set_trace():
+        pass
 request = context.REQUEST
 
@@ -39,4 +44,5 @@
 second = []
 combined = []
+set_trace()
 for course_id,course in context.objectItems():
     row = {}
