Index: /WAeUP_SRP/trunk/profiles/default/types/Certificate.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/types/Certificate.xml	(revision 312)
+++ /WAeUP_SRP/trunk/profiles/default/types/Certificate.xml	(revision 313)
@@ -33,8 +33,8 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="academics_contents"/>
- <alias from="view" to="academics_contents"/>
+ <alias from="(Default)" to="certificate_view"/>
+ <alias from="view" to="certificate_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/academics_contents" visible="True">
+    url_expr="string:${object_url}/certificate_view" visible="True">
   <permission value="View"/>
  </action>
Index: /WAeUP_SRP/trunk/profiles/default/types/CertificatesFolder.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/types/CertificatesFolder.xml	(revision 312)
+++ /WAeUP_SRP/trunk/profiles/default/types/CertificatesFolder.xml	(revision 313)
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
-<object name="Certificate" meta_type="CPS Flexible Type Information"
+<object name="CertificatesFolder" meta_type="CPS Flexible Type Information"
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title">WAeUP Certificate</property>
@@ -33,10 +33,19 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="certificate_view"/>
- <alias from="view" to="certificate_view"/>
+ <alias from="(Default)" to="academics_contents"/>
+ <alias from="view" to="academics_contents"/>
  <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/certificate_view" visible="True">
+    url_expr="string:${object_url}/academics_contents" visible="True">
   <permission value="View"/>
  </action>
+ <action title="delegate" action_id="localroles" category="object"
+    condition_expr="" url_expr="string:${object_url}/folder_localrole_form"
+    visible="True">
+  <permission value="Modify portal content"/>
+ </action>
+ <action title="Add Certificate" action_id="new_entry" category="object"
+    condition_expr=""
+    url_expr="string:${object/absolute_url}/content_create?type_name=Certificate"
+    visible="True"/>
  <action title="action_edit" action_id="edit" category="object"
     condition_expr="python:member and 'Manager' in member.getRoles()"
@@ -49,8 +58,3 @@
   <permission value="Modify portal content"/>
  </action>
- <action title="delegate" action_id="localroles" category="object"
-    condition_expr="" url_expr="string:${object_url}/folder_localrole_form"
-    visible="True">
-  <permission value="Modify portal content"/>
- </action>
 </object>
Index: /WAeUP_SRP/trunk/skins/waeup_academics/get_departments_voc.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_academics/get_departments_voc.py	(revision 312)
+++ /WAeUP_SRP/trunk/skins/waeup_academics/get_departments_voc.py	(revision 313)
@@ -11,5 +11,4 @@
 if res:
     return res[-1].Title
-return "unknown Department"
+return "unknown Department %s" % key
 
-return dep.Titlel
Index: /WAeUP_SRP/trunk/skins/waeup_academics/get_faculties_voc.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_academics/get_faculties_voc.py	(revision 312)
+++ /WAeUP_SRP/trunk/skins/waeup_academics/get_faculties_voc.py	(revision 313)
@@ -11,3 +11,3 @@
 if res:
     return [-1].Title
-return "unknown Faculty"
+return "unknown Faculty %s" % key
