Index: WAeUP_SRP/trunk/skins/waeup_academics/certificate_view.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_academics/certificate_view.py	(revision 289)
+++ WAeUP_SRP/trunk/skins/waeup_academics/certificate_view.py	(revision 290)
@@ -11,6 +11,3 @@
 request = context.REQUEST
 url0 = request.get('URL0')
-cc = context.contentValues()
-
-cc.sort()
-return context.certificate_view_form(cc=cc)
+return context.certificate_view_form()
Index: WAeUP_SRP/trunk/skins/waeup_academics/certificate_view_form.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_academics/certificate_view_form.pt	(revision 289)
+++ WAeUP_SRP/trunk/skins/waeup_academics/certificate_view_form.pt	(revision 290)
@@ -15,5 +15,5 @@
                frontend python:'Student' in roles or isAnon;
                folder here/getContent;
-               items options/cc;"
+               items here/contentValues"
                >
     <h1> <span tal:content="context/title_or_id" /></h1>      
Index: WAeUP_SRP/trunk/skins/waeup_default/cpsdocument_edit_form.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_default/cpsdocument_edit_form.pt	(revision 289)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<tal:block define="res python:here.editCPSDocument(REQUEST=request);
-                   rendered_main python: res[0];
-                   portal_status_message python: res[1];
-                   edition python:1;
-  ">
-<metal:block define-macro="edit_form">
-<metal:block use-macro="here/content_lib_master/macros/master">
-  <metal:block fill-slot="css_slot">
-    <link rel="Stylesheet" type="text/css" href=""
-      tal:attributes="href string:${base_url}document.css" />
-
-    <metal:block define-macro="widgets_javascript">
-    <!-- XXX this has to move to CPSSchemas -->
-    <style type="text/css"
-      tal:content="string:@import url(${base_url}calendar-win2k-1.css);"></style>
-    <script type="text/javascript" src="calendar.js"
-      tal:attributes="src string:${base_url}calendar.js"></script>
-    <script type="text/javascript" src="lang/calendar-en.js"
-      tal:define="local cpsmcat/getSelectedLanguage"
-      tal:attributes="src string:${base_url}lang/calendar-${local}.js"></script>
-    <script type="text/javascript" src="calendar-setup.js"
-      tal:attributes="src string:${base_url}calendar-setup.js"></script>
-
-    <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+'&label_edit='+escape(label_edit);
-       popup = window.open('popup_rte_form'+args, input_id, 'toolbar=0, scrollbars=0, location=0, statusbar=0, menubar=0, resizable=1, dependent=1, width=640, height=480')
-       if(!popup.opener)
-         popup.opener = window;
-       return false;
-   }
-   //-->
-   </script>
-   </metal:block>
-  </metal:block>
-
-  <metal:block fill-slot="header"
-    tal:define="creation creation|nothing;
-                edition edition|nothing;
-                metadata metadata|nothing">
-    <h1 tal:condition="creation" i18n:translate="">
-      Create a document of type
-      <tal:block i18n:name="type_name" i18n:translate=""
-            tal:define="type_name request/type_name;
-                        type_info python:here.portal_types[type_name]"
-            tal:content="type_info/Title">Type Title</tal:block>
-    </h1>
-    <h1 tal:condition="not:creation">
-      <img tal:replace="structure python:here.getImgTag('/'+here.getIcon(), base_url='')">
-      <tal:block condition="edition"
-        i18n:translate="">Edit <span i18n:name="title"
-        tal:content="here/title_or_id">Page Title</span></tal:block>
-      <tal:block tal:condition="metadata"
-        i18n:translate="">heading_metadata_edit</tal:block>
-    </h1>
-  </metal:block>
-
-  <metal:block fill-slot="main">
-    <div tal:replace="structure rendered_main" />
-  </metal:block>
-  <metal:block fill-slot="sub">
-  </metal:block>
-
-</metal:block>
-</metal:block>
-</tal:block>
Index: WAeUP_SRP/trunk/skins/waeup_default/create_common.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_default/create_common.py	(revision 289)
+++ WAeUP_SRP/trunk/skins/waeup_default/create_common.py	(revision 290)
@@ -16,5 +16,5 @@
 
 res,psm,ds = lt.renderLayout(layout_id= type_name.lower(),
-                      schema_id= 'metadata',
+                      schema_id= type_name.lower(),
                       context=context,
                       mapping=validate and REQUEST,
Index: WAeUP_SRP/trunk/skins/waeup_default/getCreatableItems.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_default/getCreatableItems.py	(revision 289)
+++ WAeUP_SRP/trunk/skins/waeup_default/getCreatableItems.py	(revision 290)
@@ -12,6 +12,6 @@
 base_url = utool.getBaseUrl()
 
-if context.getPortalTypeName() == 'Portal':
-    return items
+##if context.getPortalTypeName() == 'Portal':
+##    return items
 
 content_types = context.getSortedContentTypes(allowed=1)
Index: WAeUP_SRP/trunk/skins/waeup_default/layout_waeup_create.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_default/layout_waeup_create.pt	(revision 289)
+++ WAeUP_SRP/trunk/skins/waeup_default/layout_waeup_create.pt	(revision 290)
@@ -1,2 +1,2 @@
 <tal:block define="global creation python:1" />
-<metal:block use-macro="here/waeup_layout_lib/macros/common_edit" />
+<metal:block use-macro="here/layout_lib_default_edit/macros/default_edit" />
Index: WAeUP_SRP/trunk/skins/waeup_default/layout_waeup_edit.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_default/layout_waeup_edit.pt	(revision 289)
+++ WAeUP_SRP/trunk/skins/waeup_default/layout_waeup_edit.pt	(revision 290)
@@ -1,1 +1,1 @@
-<metal:block use-macro="here/waeup_layout_lib/macros/default_edit" />
+<metal:block use-macro="here/layout_lib_default_edit/macros/default_edit" />
Index: WAeUP_SRP/trunk/skins/waeup_default/temporary_view_all.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_default/temporary_view_all.py	(revision 289)
+++ WAeUP_SRP/trunk/skins/waeup_default/temporary_view_all.py	(revision 290)
@@ -5,23 +5,22 @@
 """
 
-member = context.portal_membership.getAuthenticatedMember()
-uname = str(member)
-roles = member.getRoles()
-cat = context.portal_catalog
-request = context.REQUEST
-url0 = request.get('URL0')
-#return context.temporary_view_all_form(psm=psm)
-if context.portal_membership.isAnonymousUser():
-    if not url0.endswith('chat'):
-        return context.students.student_view_all_form(psm=psm)
-    return context.Chat()
-else:
-    return context.temporary_view_all_form(psm=psm)
-    if url0.find(uname) > 0 or 'DepartmentManager' in roles or 'Manager' in roles:
-        return context.temporary_view_all_form(psm=psm)
-    elif 'Student' in roles and 'StudentManager' not in roles:
-        res = cat(pathindex="/portal/sections/students/%s" % uname)
-        for r in res:
-            if r.getPath().endswith("students/%s" % uname):
-                return r.getObject().student_view_student_form(psm=psm)
-        return context.students.student_view_all_form(psm=psm)
+return context.temporary_view_all_form(psm=psm)
+##member = context.portal_membership.getAuthenticatedMember()
+##uname = str(member)
+##roles = member.getRoles()
+##cat = context.portal_catalog
+##request = context.REQUEST
+##url0 = request.get('URL0')
+##if context.portal_membership.isAnonymousUser():
+##    if not url0.endswith('chat'):
+##        return context.students.student_view_all_form(psm=psm)
+##    return context.Chat()
+##else:
+##    if url0.find(uname) > 0 or 'DepartmentManager' in roles or 'Manager' in roles:
+##        return context.temporary_view_all_form(psm=psm)
+##    elif 'Student' in roles and 'StudentManager' not in roles:
+##        res = cat(pathindex="/portal/sections/students/%s" % uname)
+##        for r in res:
+##            if r.getPath().endswith("students/%s" % uname):
+##                return r.getObject().student_view_student_form(psm=psm)
+##        return context.students.student_view_all_form(psm=psm)
