Index: WAeUP_SRP/trunk/skins/waeup_accommodation/hall_delete.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_accommodation/hall_delete.py	(revision 2011)
+++ WAeUP_SRP/trunk/skins/waeup_accommodation/hall_delete.py	(revision 2013)
@@ -19,6 +19,4 @@
 from Products.CMFCore.utils import getToolByName
 here = context
-if context.portal_type == "University":
-    here = context.academics
 
 ti = getToolByName(here, 'portal_types').getTypeInfo(here.portal_type)
Index: WAeUP_SRP/trunk/skins/waeup_custom/folder_delete.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_custom/folder_delete.py	(revision 2011)
+++ WAeUP_SRP/trunk/skins/waeup_custom/folder_delete.py	(revision 2013)
@@ -13,12 +13,18 @@
 """
 
+import logging
+logger = logging.getLogger('Skins.folder_delete')
+member_id = str(context.portal_membership.getAuthenticatedMember())
+
 from Products.CMFCore.utils import getToolByName
 here = context
-if context.portal_type == "University":
-    here = context.academics
+
+#if context.portal_type == "University":
+#    here = context.academics
 
 ti = getToolByName(here, 'portal_types').getTypeInfo(here.portal_type)
 meth_id = ti.queryMethodID('view', 'folder_contents')
 ret_url = here.absolute_url() + '/' + meth_id
+
 
 
Index: WAeUP_SRP/trunk/skins/waeup_default/getDocumentInfo.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_default/getDocumentInfo.py	(revision 2013)
+++ WAeUP_SRP/trunk/skins/waeup_default/getDocumentInfo.py	(revision 2013)
@@ -0,0 +1,29 @@
+## 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('/')
+
+mtool = context.portal_membership
+if mtool.isAnonymousUser():
+    return None
+
+info = {}
+try:
+    info['doc'] = context.getContent()
+except:
+    return None
+return info
+
Index: WAeUP_SRP/trunk/skins/waeup_default/waeup_document_create_do.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_default/waeup_document_create_do.py	(revision 2011)
+++ WAeUP_SRP/trunk/skins/waeup_default/waeup_document_create_do.py	(revision 2013)
@@ -10,5 +10,6 @@
 from Products.CMFCore.utils import getToolByName
 request = context.REQUEST
-if type_name in ("StudyLevel","StudentStudyLevel"):
+
+if type_name in ("StudyLevel","StudentStudyLevel","WAeUPDocument"):
     id = datamodel.get('code')
 else:
Index: WAeUP_SRP/trunk/skins/waeup_default/waeup_edit_form.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_default/waeup_edit_form.pt	(revision 2011)
+++ WAeUP_SRP/trunk/skins/waeup_default/waeup_edit_form.pt	(revision 2013)
@@ -13,4 +13,36 @@
 <metal:block define-macro="edit_form">
 <metal:block use-macro=template>
+
+
+  <metal:block fill-slot="style_slot">
+    <link rel="Stylesheet" type="text/css" href=""
+      tal:attributes="href string:${base_url}document.css" />
+
+    <metal:block define-macro="widgets_javascript">
+
+    <tal:block condition="python:modules['Products.CPSUtil.integration'].isProductPresent('Products.FCKeditor')">
+      <script type="text/javascript">
+        var popup_editor_form = 'popup_fckeditor_form';
+        var width = 640;
+        var height = 520;
+      </script>
+    </tal:block>
+
+    <script type="text/javascript">
+     function popup_rte(input_id, label_edit) {
+       var args, value;
+       value = document.getElementById(input_id).value;
+       args = '?input_id='+input_id+'&amp;label_edit='+escape(label_edit);
+       str_window_features = 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=1,dependent=1,width=' + width + ',height=' + height;
+       popup = window.open(popup_editor_form + args, input_id, str_window_features);
+       if (!popup.opener) {
+         popup.opener = window;
+       }
+       return false;
+     }
+   </script>
+   </metal:block>
+  </metal:block>
+
   
   <metal:block fill-slot="header">
Index: WAeUP_SRP/trunk/skins/waeup_documents/documents_index.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_documents/documents_index.py	(revision 2013)
+++ WAeUP_SRP/trunk/skins/waeup_documents/documents_index.py	(revision 2013)
@@ -0,0 +1,23 @@
+## Script (Python) "documents_index"
+##bind container=container
+##bind context=context
+##bind namespace=
+##bind script=script
+##bind subpath=traverse_subpath
+##parameters=batch=None
+##title=
+##
+# $Id: documents_index.py 937 2006-11-25 09:00:34Z henrik $
+"""
+return the appropriate page in the documents section
+"""
+
+request = context.REQUEST
+redirect = request.RESPONSE.redirect
+pm = context.portal_membership
+
+if pm.isAnonymousUser():
+    return redirect("%s/srp_anonymous_view" % context.portal_url())
+else:
+    return context.documents_view()
+
Index: WAeUP_SRP/trunk/skins/waeup_documents/documents_view.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_documents/documents_view.pt	(revision 2013)
+++ WAeUP_SRP/trunk/skins/waeup_documents/documents_view.pt	(revision 2013)
@@ -0,0 +1,83 @@
+<metal:html tal:define="info context/getDocumentsInfo;
+            is_so context/isSectionOfficer;"
+            >
+  <metal:body use-macro="here/main_template/macros/master">
+    <metal:block fill-slot="header">
+      <a href=""
+         tal:attributes="href string:${here/academicsParent}">
+        <img tal:attributes="src string:${here/portal_url}/arrow_up.gif"/>
+        Up one level
+      </a>
+      <h3 tal:content="here/title_or_id" />
+      <div tal:condition="python:0" tal:content="info/container_path"/>
+      <br />
+    </metal:block>
+    <metal:main fill-slot="main">
+      <span tal:omit-tag=""  
+            tal:content="structure python: info['doc'].render(layout_mode='view')" />
+      
+      <form action="" method="post" class="group"
+            tal:attributes="action info/action"
+            tal:define="rows python: info['items'];"
+            >
+        <span tal:condition="python: 0" tal:content="structure rows" />
+        <table tal:condition="python: 1" class="contentListing" width="100%" summary="content layout" id="folder_content">      
+          <tr tal:repeat="row rows"
+            tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
+            <td align="left" valign="middle" style="width: 5px;" 
+                tal:condition="is_so">
+              <input type="checkbox" name="ids:list" value="" id="" class="noborder"
+                     tal:condition="is_so"
+                     tal:define="id row/id"
+                     tal:attributes="value id;
+                     id python:'cb_' + id;
+                     checked python:id in info['choosen_ids'];" 
+                     />
+            </td>
+            <td><a href="view" tal:attributes="href string:${row/url}">
+              <strong tal:content="row/title" /></a> </td>
+            <td tal:content="row/id"> </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>
+        <table width="100%" cellspacing="0" cellpadding="2"
+               summary="contents of the folder"
+               class="folderButtons">
+          <tr>
+            <td align="left" valign="top" rowspan="3"></td>
+            <td align="left" valign="top">
+              <span tal:condition="is_so">
+                <input type="button" value="button_select_all" class="context"
+                       onclick="someJavaScriptFunctionThatWillBeReplaced"
+                       i18n:attributes="value"
+                       tal:attributes="onclick python:'toggleSelect(this, \'%s\', \'%s\')'
+                       % (cpsmcat('button_select_all'), cpsmcat('button_deselect_all'))"
+                       />
+                <input type="submit" name="folder_delete:method" value="button_delete"
+                       class="destructive" i18n:attributes="value"
+                       tal:attributes="onclick python:'return window.confirm(\'%s\')' %
+                       (cpsmcat('description_confirm_delete'), )" 
+                       />
+                <input tal:condition="python: context.portal_type not in ('Semester','Certificate')"
+                       type="submit" name="id_rename_form:method"
+                       class="context" value="Change Object ID" i18n:attributes="value" 
+                       />
+              </span>
+            </td>
+          </tr>
+        </table>
+      </form>
+    </metal:main>
+    
+    <metal:sub fill-slot="sub"/>
+  </metal:body>
+</metal:html>
Index: WAeUP_SRP/trunk/skins/waeup_documents/getDocumentsInfo.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_documents/getDocumentsInfo.py	(revision 2013)
+++ WAeUP_SRP/trunk/skins/waeup_documents/getDocumentsInfo.py	(revision 2013)
@@ -0,0 +1,46 @@
+## Script (Python) "getDocumentsInfo"
+##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',[])
+info['doc'] = context.getContent()
+
+items = []
+facs = context.portal_catalog(portal_type='WAeUPDocument')
+for f in facs:
+    row = {}
+    fo = f.getObject()
+    fd = fo.getContent()
+    row['id'] = fo.getId()
+    row['title'] = fd.Title()
+    row['url'] = fo.absolute_url()
+    row['is_editable'] = mtool.checkPermission('Modify portal content', fo)
+    items.append(row)
+items.sort(cmp_id)
+info['items'] = items
+return info
Index: WAeUP_SRP/trunk/skins/waeup_student/clearance_edit.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/clearance_edit.py	(revision 2011)
+++ WAeUP_SRP/trunk/skins/waeup_student/clearance_edit.py	(revision 2013)
@@ -76,5 +76,5 @@
     info['clear_doc'].edit(mapping = {'cleared_date': current,})
     wftool.doActionFor(info['student'],'clear_and_validate')
-    psm = "Clearance and eligibility record is validated and and student is cleared!"
+    psm = "Clearance and eligibility record is validated and student is cleared!"
 elif clear_and_validate_button and info['review_state'] == "cleared_and_validated":
     psm = "This student is already cleared!"
