Index: WAeUP_SRP/trunk/profiles/default/layouts.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts.xml	(revision 294)
+++ WAeUP_SRP/trunk/profiles/default/layouts.xml	(revision 295)
@@ -15,4 +15,5 @@
  <object name="department" meta_type="CPS Layout"/>
  <object name="faculty" meta_type="CPS Layout"/>
+ <object name="faculty_row" meta_type="CPS Layout"/>
  <object name="jamb" meta_type="CPS Layout"/>
  <object name="jambcreate" meta_type="CPS Layout"/>
Index: WAeUP_SRP/trunk/profiles/default/skins.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/skins.xml	(revision 294)
+++ WAeUP_SRP/trunk/profiles/default/skins.xml	(revision 295)
@@ -3,4 +3,6 @@
    cookie_persistence="False" default_skin="CPSSkins"
    request_varname="portal_skin">
+ <object name="waeup_custom" meta_type="Filesystem Directory View"
+    directory="WAeUP_SRP/skins/waeup_custom"/>
  <object name="waeup_default" meta_type="Filesystem Directory View"
     directory="WAeUP_SRP/skins/waeup_default"/>
@@ -10,12 +12,14 @@
     directory="WAeUP_SRP/skins/waeup_student"/>
  <skin-path name="CPSSkins">
-  <layer name="waeup_default" insert-after="custom"/>
-  <layer name="waeup_student" insert-after="cps_default"/>
-  <layer name="waeup_academics" insert-after="cps_default"/>
+  <layer name="waeup_custom" insert-after="custom"/>
+  <layer name="waeup_default" insert-after="waeup_custom"/>
+  <layer name="waeup_student" insert-after="waeup_custom"/>
+  <layer name="waeup_academics" insert-after="waeup_custom"/>
  </skin-path>
  <skin-path name="CPSSkins-macroless">
-  <layer name="waeup_default" insert-after="custom"/>
-  <layer name="waeup_student" insert-after="cps_default"/>
-  <layer name="waeup_academics" insert-after="cps_default"/>
+  <layer name="waeup_custom" insert-after="custom"/>
+  <layer name="waeup_default" insert-after="waeup_custom"/>
+  <layer name="waeup_student" insert-after="waeup_custom"/>
+  <layer name="waeup_academics" insert-after="waeup_custom"/>
  </skin-path>
 </object>
Index: WAeUP_SRP/trunk/profiles/default/types.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/types.xml	(revision 294)
+++ WAeUP_SRP/trunk/profiles/default/types.xml	(revision 295)
@@ -5,5 +5,7 @@
  <object name="AccoFolder" meta_type="CPS Flexible Type Information"/>
  <object name="Accommodation" meta_type="CPS Flexible Type Information"/>
+ <object name="CertificatesFolder" meta_type="CPS Flexible Type Information"/>
  <object name="Certificate" meta_type="CPS Flexible Type Information"/>
+ <object name="CoursesFolder" meta_type="CPS Flexible Type Information"/>
  <object name="Course" meta_type="CPS Flexible Type Information"/>
  <object name="CertificateCourse" meta_type="CPS Flexible Type Information"/>
Index: WAeUP_SRP/trunk/profiles/default/types/Department.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/types/Department.xml	(revision 294)
+++ WAeUP_SRP/trunk/profiles/default/types/Department.xml	(revision 295)
@@ -12,6 +12,6 @@
  <property name="filter_content_types">True</property>
  <property name="allowed_content_types">
-  <element value="Certificate"/>
-  <element value="Course"/>
+  <element value="CertificatesFolder"/>
+  <element value="CoursesFolder"/>
  </property>
  <property name="allow_discussion">False</property>
@@ -42,21 +42,16 @@
  <action title="action_edit" action_id="edit" category="object"
     condition_expr="python:member and 'Manager' in member.getRoles()"
-    url_expr="string:${object_url}/cpsdocument_edit_form" visible="True">
-  <permission value=""/>
- </action>
+    url_expr="string:${object_url}/cpsdocument_edit_form" visible="True"/>
  <action title="Add Course" action_id="create_course" category="object"
-    condition_expr="" url_expr="string:${object/absolute_url}/content_create?type_name=Course"
-    visible="True">
-  <permission value=""/>
- </action>
- <action title="Add Certificate" action_id="create_certificate" category="object"
-    condition_expr="" url_expr="string:${object/absolute_url}/content_create?type_name=Certificate"
-    visible="True">
- </action>
+    condition_expr=""
+    url_expr="string:${object/absolute_url}/content_create?type_name=Course"
+    visible="False"/>
+ <action title="Add Certificate" action_id="create_certificate"
+    category="object" condition_expr=""
+    url_expr="string:${object/absolute_url}/content_create?type_name=Certificate"
+    visible="False"/>
  <action title="action_folder_contents" action_id="contents" category="object"
     condition_expr="python:member and 'Manager' in member.getRoles()"
-    url_expr="string:${object_url}/folder_contents" visible="True">
-  <permission value=""/>
- </action>
+    url_expr="string:${object_url}/folder_contents" visible="True"/>
  <action title="action_metadata" action_id="metadata" category="object"
     condition_expr="python:member and 'Manager' in member.getRoles()"
Index: WAeUP_SRP/trunk/profiles/default/workflows.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/workflows.xml	(revision 294)
+++ WAeUP_SRP/trunk/profiles/default/workflows.xml	(revision 295)
@@ -2,17 +2,4 @@
 <object name="portal_workflow" meta_type="CPS Workflow Tool">
  <property name="title"></property>
- <object name="blog_entry_wf" meta_type="CPS Workflow"/>
- <object name="blog_section_wf" meta_type="CPS Workflow"/>
- <object name="blog_workspace_wf" meta_type="CPS Workflow"/>
- <object name="chat_item_section_wf" meta_type="CPS Workflow"/>
- <object name="chat_item_workspace_wf" meta_type="CPS Workflow"/>
- <object name="chat_section_wf" meta_type="CPS Workflow"/>
- <object name="chat_workspace_wf" meta_type="CPS Workflow"/>
- <object name="forum_permissions_dummy_wf" meta_type="CPS Workflow"/>
- <object name="forum_post_wf" meta_type="CPS Workflow"/>
- <object name="section_content_wf" meta_type="CPS Workflow"/>
- <object name="section_folder_wf" meta_type="CPS Workflow"/>
- <object name="section_forum_wf" meta_type="CPS Workflow"/>
- <object name="section_wiki_wf" meta_type="CPS Workflow"/>
  <object name="waeup_academics_wf" meta_type="CPS Workflow"/>
  <object name="waeup_accommodation_wf" meta_type="CPS Workflow"/>
@@ -26,10 +13,4 @@
  <object name="waeup_student_wf" meta_type="CPS Workflow"/>
  <object name="waeup_workspace_wf" meta_type="CPS Workflow"/>
- <object name="workspace_calendar_wf" meta_type="CPS Workflow"/>
- <object name="workspace_content_wf" meta_type="CPS Workflow"/>
- <object name="workspace_folder_wf" meta_type="CPS Workflow"/>
- <object name="workspace_folderish_content_wf" meta_type="CPS Workflow"/>
- <object name="workspace_forum_wf" meta_type="CPS Workflow"/>
- <object name="workspace_wiki_wf" meta_type="CPS Workflow"/>
  <bindings>
   <default/>
@@ -43,4 +24,7 @@
    <bound-workflow workflow_id="waeup_accommodation_wf"/>
   </type>
+  <type type_id="CertificatesFolder">
+   <bound-workflow workflow_id="waeup_base_wf"/>
+  </type>
   <type type_id="Certificate">
    <bound-workflow workflow_id="waeup_certificate_wf"/>
@@ -49,6 +33,6 @@
    <bound-workflow workflow_id="waeup_certificate_course_wf"/>
   </type>
-  <type type_id="CPS Calendar">
-   <bound-workflow workflow_id="workspace_calendar_wf"/>
+  <type type_id="CoursesFolder">
+   <bound-workflow workflow_id="waeup_base_wf"/>
   </type>
   <type type_id="Course">
@@ -67,11 +51,5 @@
    <bound-workflow workflow_id="waeup_base_wf"/>
   </type>
-  <type type_id="Members Workspace">
-   <bound-workflow workflow_id="workspace_folder_wf"/>
-  </type>
   <type type_id="SCFolder">
-   <bound-workflow workflow_id="section_folder_wf"/>
-  </type>
-  <type type_id="Section">
    <bound-workflow workflow_id="section_folder_wf"/>
   </type>
@@ -83,7 +61,4 @@
   </type>
   <type type_id="StudentDocuments">
-   <bound-workflow workflow_id="waeup_base_wf"/>
-  </type>
-  <type type_id="StudentElegibility">
    <bound-workflow workflow_id="waeup_base_wf"/>
   </type>
@@ -102,8 +77,5 @@
   <type type_id="University">
    <bound-workflow workflow_id="section_folder_wf"/>
-  </type>
-  <type type_id="Workspace">
-   <bound-workflow workflow_id="workspace_folder_wf"/>
-  </type>
+  </type>A
  </bindings>
 </object>
