Index: waeup_product/trunk/profiles/default/import_steps.xml
===================================================================
--- waeup_product/trunk/profiles/default/import_steps.xml	(revision 199)
+++ waeup_product/trunk/profiles/default/import_steps.xml	(revision 200)
@@ -4,5 +4,5 @@
               handler="Products.WAeUP.exportimport.importWAeUP"
               title="WAeUP">
-  <dependency step="toolset"/>
+  <dependency step="toolset" />
   Import WAeUP and its configuration.
  </import-step>
Index: waeup_product/trunk/profiles/default/skins.xml
===================================================================
--- waeup_product/trunk/profiles/default/skins.xml	(revision 199)
+++ waeup_product/trunk/profiles/default/skins.xml	(revision 200)
@@ -9,178 +9,13 @@
  <object name="waeup_student" meta_type="Filesystem Directory View"
     directory="WAeUP/skins/waeup_student"/>
- <skin-path name="Basic">
-  <layer name="custom"/>
-  <layer name="waeup_default"/>
-  <layer name="waeup_student"/>
-  <layer name="waeup_faculty"/>
-  <layer name="cpswfht_scripts"/>
-  <layer name="cpswfht_templates"/>
-  <layer name="cpsportlets_types"/>
-  <layer name="cpsportlets_default"/>
-  <layer name="cpsportlets_widgets"/>
-  <layer name="cpsportlets_layouts"/>
-  <layer name="cpsportlets_schemas"/>
-  <layer name="cpsportlets_vocabularies"/>
-  <layer name="cpsooo"/>
-  <layer name="cps_wiki"/>
-  <layer name="cps_newsletters"/>
-  <layer name="cps_subscriptions_installer"/>
-  <layer name="cps_subscriptions"/>
-  <layer name="cpsnavigation_images"/>
-  <layer name="cpsnavigation_default"/>
-  <layer name="cpsnavigation_devel"/>
-  <layer name="cps_directory"/>
-  <layer name="cps_chat"/>
-  <layer name="cps_forum"/>
-  <layer name="cps_rss"/>
-  <layer name="epoz"/>
-  <layer name="mimetypes_icons"/>
-  <layer name="cps_jscalendar"/>
-  <layer name="cps_schemas"/>
-  <layer name="cps_document"/>
-  <layer name="cps_document_images"/>
-  <layer name="cps_collector"/>
-  <layer name="cps_javascript"/>
-  <layer name="cps_default"/>
-  <layer name="cps_default_installer"/>
-  <layer name="cps_images"/>
-  <layer name="cmf_calendar"/>
-  <layer name="cps_boxes"/>
-  <layer name="cps_nuxeo_style"/>
-  <layer name="cmf_zpt_calendar"/>
-  <layer name="cps_styles"/>
-  <layer name="cps_devel"/>
-  <layer name="zpt_topic"/>
-  <layer name="zpt_calendar"/>
-  <layer name="zpt_content"/>
-  <layer name="zpt_generic"/>
-  <layer name="zpt_control"/>
-  <layer name="Images"/>
- </skin-path>
  <skin-path name="CPSSkins">
-  <layer name="custom"/>
-  <layer name="waeup_default"/>
-  <layer name="waeup_student"/>
-  <layer name="waeup_faculty"/>
-  <layer name="cpswfht_scripts"/>
-  <layer name="cpswfht_templates"/>
-  <layer name="CPSSkins"/>
-  <layer name="cpsskins_icons"/>
-  <layer name="cpsskins_cps3"/>
-  <layer name="cpsskins_cmf"/>
-  <layer name="cpsportlets_types"/>
-  <layer name="cpsportlets_default"/>
-  <layer name="cpsportlets_widgets"/>
-  <layer name="cpsportlets_layouts"/>
-  <layer name="cpsportlets_schemas"/>
-  <layer name="cpsportlets_vocabularies"/>
-  <layer name="cpsooo"/>
-  <layer name="cps_wiki"/>
-  <layer name="cps_newsletters"/>
-  <layer name="cps_subscriptions_installer"/>
-  <layer name="cps_subscriptions"/>
-  <layer name="cpsnavigation_images"/>
-  <layer name="cpsnavigation_default"/>
-  <layer name="cpsnavigation_devel"/>
-  <layer name="cps_directory"/>
-  <layer name="cps_chat"/>
-  <layer name="cps_forum"/>
-  <layer name="cps_rss"/>
-  <layer name="epoz"/>
-  <layer name="mimetypes_icons"/>
-  <layer name="cps_jscalendar"/>
-  <layer name="cps_schemas"/>
-  <layer name="cps_document"/>
-  <layer name="cps_document_images"/>
-  <layer name="cps_collector"/>
-  <layer name="cps_javascript"/>
-  <layer name="cps_default"/>
-  <layer name="cps_default_installer"/>
-  <layer name="cps_images"/>
-  <layer name="cmf_calendar"/>
-  <layer name="cps_boxes"/>
-  <layer name="cps_nuxeo_style"/>
-  <layer name="cmf_zpt_calendar"/>
-  <layer name="cps_styles"/>
-  <layer name="cps_devel"/>
-  <layer name="zpt_topic"/>
-  <layer name="zpt_calendar"/>
-  <layer name="zpt_content"/>
-  <layer name="zpt_generic"/>
-  <layer name="zpt_control"/>
-  <layer name="Images"/>
+  <layer name="waeup_default" insert-after="cps_default"/>
+  <layer name="waeup_student" insert-after="cps_default"/>
+  <layer name="waeup_faculty" insert-after="cps_default"/>
  </skin-path>
  <skin-path name="CPSSkins-macroless">
-  <layer name="custom"/>
-  <layer name="CPSSkins"/>
-  <layer name="cpsskins_icons"/>
-  <layer name="cpsskins_cps3_macroless"/>
-  <layer name="cpsskins_cps3"/>
-  <layer name="cpsskins_cmf"/>
-  <layer name="cpsportlets_types"/>
-  <layer name="cpsportlets_default"/>
-  <layer name="cpsportlets_widgets"/>
-  <layer name="cpsportlets_layouts"/>
-  <layer name="cpsportlets_schemas"/>
-  <layer name="cpsportlets_vocabularies"/>
-  <layer name="cpsooo"/>
-  <layer name="cps_wiki"/>
-  <layer name="cps_newsletters"/>
-  <layer name="cps_subscriptions_installer"/>
-  <layer name="cps_subscriptions"/>
-  <layer name="cpsnavigation_images"/>
-  <layer name="cpsnavigation_default"/>
-  <layer name="cpsnavigation_devel"/>
-  <layer name="cps_directory"/>
-  <layer name="cps_chat"/>
-  <layer name="cps_forum"/>
-  <layer name="cps_rss"/>
-  <layer name="epoz"/>
-  <layer name="mimetypes_icons"/>
-  <layer name="cps_jscalendar"/>
-  <layer name="cps_schemas"/>
-  <layer name="cps_document"/>
-  <layer name="cps_document_images"/>
-  <layer name="cps_collector"/>
-  <layer name="cps_javascript"/>
-  <layer name="cps_default"/>
-  <layer name="cps_default_installer"/>
-  <layer name="cps_images"/>
-  <layer name="cmf_calendar"/>
-  <layer name="cps_boxes"/>
-  <layer name="cps_nuxeo_style"/>
-  <layer name="cmf_zpt_calendar"/>
-  <layer name="cps_styles"/>
-  <layer name="cps_devel"/>
-  <layer name="zpt_topic"/>
-  <layer name="zpt_calendar"/>
-  <layer name="zpt_content"/>
-  <layer name="zpt_generic"/>
-  <layer name="zpt_control"/>
-  <layer name="Images"/>
- </skin-path>
- <skin-path name="No CSS">
-  <layer name="no_css"/>
-  <layer name="custom"/>
-  <layer name="epoz"/>
-  <layer name="mimetypes_icons"/>
-  <layer name="topic"/>
-  <layer name="calendar"/>
-  <layer name="content"/>
-  <layer name="generic"/>
-  <layer name="control"/>
-  <layer name="Images"/>
- </skin-path>
- <skin-path name="Nouvelle">
-  <layer name="nouvelle"/>
-  <layer name="custom"/>
-  <layer name="epoz"/>
-  <layer name="mimetypes_icons"/>
-  <layer name="topic"/>
-  <layer name="calendar"/>
-  <layer name="content"/>
-  <layer name="generic"/>
-  <layer name="control"/>
-  <layer name="Images"/>
+  <layer name="waeup_default" insert-after="cps_default"/>
+  <layer name="waeup_student" insert-after="cps_default"/>
+  <layer name="waeup_faculty" insert-after="cps_default"/>
  </skin-path>
 </object>
Index: waeup_product/trunk/profiles/default/types.xml
===================================================================
--- waeup_product/trunk/profiles/default/types.xml	(revision 199)
+++ waeup_product/trunk/profiles/default/types.xml	(revision 200)
@@ -5,122 +5,10 @@
  <object name="AccoFolder" meta_type="CPS Flexible Type Information"/>
  <object name="Accommodation" meta_type="CPS Flexible Type Information"/>
- <object name="Action Box" meta_type="Factory-based Type Information"/>
- <object name="Action Box Templet"
-    meta_type="Factory-based Type Information"/>
- <object name="Actions Portlet" meta_type="CPS Flexible Type Information"/>
- <object name="Add Item Portlet" meta_type="CPS Flexible Type Information"/>
- <object name="Area Color" meta_type="Factory-based Type Information"/>
- <object name="Area Shape" meta_type="Factory-based Type Information"/>
- <object name="Base Box" meta_type="Factory-based Type Information"/>
- <object name="Book" meta_type="CPS Flexible Type Information"/>
- <object name="Box Corners" meta_type="Factory-based Type Information"/>
- <object name="Breadcrumbs Portlet"
-    meta_type="CPS Flexible Type Information"/>
- <object name="Breadcrumbs Templet"
-    meta_type="Factory-based Type Information"/>
- <object name="CPS Calendar" meta_type="Factory-based Type Information"/>
- <object name="CPS Proxy BTree Folder"
-    meta_type="Factory-based Type Information"/>
- <object name="CPS Proxy BTree Folderish Document"
-    meta_type="Factory-based Type Information"/>
- <object name="CPS Proxy Document"
-    meta_type="Factory-based Type Information"/>
- <object name="CPS Proxy Folder" meta_type="Factory-based Type Information"/>
- <object name="CPS Proxy Folderish Document"
-    meta_type="Factory-based Type Information"/>
- <object name="CPSForum" meta_type="CPS Flexible Type Information"/>
- <object name="Calendar Style" meta_type="Factory-based Type Information"/>
- <object name="Calendar Templet" meta_type="Factory-based Type Information"/>
- <object name="Cell Block" meta_type="Factory-based Type Information"/>
- <object name="Cell Hider" meta_type="Factory-based Type Information"/>
- <object name="Cell Sizer" meta_type="Factory-based Type Information"/>
- <object name="Cell Styler" meta_type="Factory-based Type Information"/>
- <object name="Chapter" meta_type="CPS Flexible Type Information"/>
- <object name="Chat" meta_type="Factory-based Type Information"/>
- <object name="ChatItem" meta_type="Factory-based Type Information"/>
- <object name="Collapsible Menu Style"
-    meta_type="Factory-based Type Information"/>
- <object name="Collapsible Menu Templet"
-    meta_type="Factory-based Type Information"/>
- <object name="Collector Document" meta_type="CPS Flexible Type Information"/>
- <object name="Content Box" meta_type="Factory-based Type Information"/>
- <object name="Content Portlet" meta_type="CPS Flexible Type Information"/>
  <object name="Course" meta_type="CPS Flexible Type Information"/>
  <object name="CourseTicket" meta_type="CPS Flexible Type Information"/>
- <object name="Custom Portlet" meta_type="CPS Flexible Type Information"/>
  <object name="Department" meta_type="CPS Flexible Type Information"/>
- <object name="Discussion Item" meta_type="Factory-based Type Information"/>
- <object name="Doc Render Box" meta_type="Factory-based Type Information"/>
- <object name="Document" meta_type="CPS Flexible Type Information"/>
- <object name="Document Info Templet"
-    meta_type="Factory-based Type Information"/>
- <object name="Document Portlet" meta_type="CPS Flexible Type Information"/>
- <object name="Dummy Portlet" meta_type="CPS Flexible Type Information"/>
- <object name="Event" meta_type="Factory-based Type Information"/>
- <object name="Event Calendar Box"
-    meta_type="Factory-based Type Information"/>
- <object name="EventDoc" meta_type="CPS Flexible Type Information"/>
- <object name="FAQ" meta_type="CPS Flexible Type Information"/>
- <object name="FAQitem" meta_type="CPS Flexible Type Information"/>
  <object name="Faculty" meta_type="CPS Flexible Type Information"/>
- <object name="Favorite" meta_type="Factory-based Type Information"/>
- <object name="File" meta_type="CPS Flexible Type Information"/>
- <object name="Flash Animation" meta_type="CPS Flexible Type Information"/>
- <object name="Flash Box" meta_type="Factory-based Type Information"/>
- <object name="Flash Box Templet" meta_type="Factory-based Type Information"/>
- <object name="Flexible" meta_type="CPS Flexible Type Information"/>
- <object name="Folder" meta_type="Factory-based Type Information"/>
- <object name="Font Color" meta_type="Factory-based Type Information"/>
- <object name="Font Shape" meta_type="Factory-based Type Information"/>
- <object name="Form Style" meta_type="Factory-based Type Information"/>
- <object name="ForumPost" meta_type="CPS Flexible Type Information"/>
- <object name="Glossary" meta_type="CPS Flexible Type Information"/>
- <object name="GlossaryItem" meta_type="CPS Flexible Type Information"/>
- <object name="Image" meta_type="CPS Flexible Type Information"/>
- <object name="Image Box" meta_type="Factory-based Type Information"/>
- <object name="Image Box Templet" meta_type="Factory-based Type Information"/>
- <object name="Image Portlet" meta_type="CPS Flexible Type Information"/>
- <object name="ImageGallery" meta_type="CPS Flexible Type Information"/>
- <object name="Internal Links Portlet"
-    meta_type="CPS Flexible Type Information"/>
- <object name="InternalLinks Box" meta_type="Factory-based Type Information"/>
  <object name="Jamb" meta_type="CPS Flexible Type Information"/>
- <object name="Language Portlet" meta_type="CPS Flexible Type Information"/>
- <object name="Language Templet" meta_type="Factory-based Type Information"/>
- <object name="Link" meta_type="CPS Flexible Type Information"/>
- <object name="Main Content Templet"
-    meta_type="Factory-based Type Information"/>
- <object name="Navigation Portlet" meta_type="CPS Flexible Type Information"/>
- <object name="News Item" meta_type="CPS Flexible Type Information"/>
- <object name="NewsLetter" meta_type="CPS Flexible Type Information"/>
- <object name="OOoDocbookDocument" meta_type="CPS Flexible Type Information"/>
- <object name="Page" meta_type="CPS Flexible Type Information"/>
- <object name="Page Block" meta_type="Factory-based Type Information"/>
- <object name="Palette Border" meta_type="Factory-based Type Information"/>
- <object name="Palette Color" meta_type="Factory-based Type Information"/>
- <object name="Portal Box Color" meta_type="Factory-based Type Information"/>
- <object name="Portal Box Group Templet"
-    meta_type="Factory-based Type Information"/>
- <object name="Portal Box Shape" meta_type="Factory-based Type Information"/>
- <object name="Portal Box Templet"
-    meta_type="Factory-based Type Information"/>
- <object name="Portal Tab Style" meta_type="Factory-based Type Information"/>
- <object name="Portal Tab Templet"
-    meta_type="Factory-based Type Information"/>
- <object name="Portal Theme" meta_type="Factory-based Type Information"/>
- <object name="Portlet Box Templet"
-    meta_type="Factory-based Type Information"/>
- <object name="Press Release" meta_type="CPS Flexible Type Information"/>
- <object name="Quiz Document" meta_type="CPS Flexible Type Information"/>
- <object name="RSS Box" meta_type="Factory-based Type Information"/>
- <object name="RSS Portlet" meta_type="CPS Flexible Type Information"/>
- <object name="Rotating Image Portlet"
-    meta_type="CPS Flexible Type Information"/>
- <object name="Schedule" meta_type="CPS Flexible Type Information"/>
  <object name="ScratchCard" meta_type="CPS Flexible Type Information"/>
- <object name="Search Box Templet"
-    meta_type="Factory-based Type Information"/>
- <object name="Search Portlet" meta_type="CPS Flexible Type Information"/>
- <object name="Section" meta_type="CPS Flexible Type Information"/>
  <object name="Semester" meta_type="CPS Flexible Type Information"/>
  <object name="Student" meta_type="CPS Flexible Type Information"/>
@@ -130,17 +18,4 @@
  <object name="StudentsFolder" meta_type="CPS Flexible Type Information"/>
  <object name="StudyLevel" meta_type="CPS Flexible Type Information"/>
- <object name="Text Box" meta_type="Factory-based Type Information"/>
- <object name="Text Box Templet" meta_type="Factory-based Type Information"/>
- <object name="Text Portlet" meta_type="CPS Flexible Type Information"/>
- <object name="Theme Chooser Templet"
-    meta_type="Factory-based Type Information"/>
- <object name="Theme Folder" meta_type="Factory-based Type Information"/>
- <object name="Theme Page" meta_type="Factory-based Type Information"/>
- <object name="Topic" meta_type="Factory-based Type Information"/>
- <object name="Tree Box" meta_type="Factory-based Type Information"/>
  <object name="University" meta_type="CPS Flexible Type Information"/>
- <object name="Wiki" meta_type="Factory-based Type Information"/>
- <object name="Wiki Page" meta_type="Factory-based Type Information"/>
- <object name="Workspace" meta_type="CPS Flexible Type Information"/>
- <object name="ZippedHtml" meta_type="CPS Flexible Type Information"/>
 </object>
Index: waeup_product/trunk/profiles/default/types/AcademicsFolder.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/AcademicsFolder.xml	(revision 199)
+++ waeup_product/trunk/profiles/default/types/AcademicsFolder.xml	(revision 200)
@@ -24,5 +24,5 @@
  </property>
  <property name="layouts">
-  <element value="waeup_common"/>
+  <element value="common"/>
   <element value="folder"/>
  </property>
@@ -33,4 +33,5 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
+ <alias from="(Default)" to="temporary_view_all"/>
  <alias from="view" to="temporary_view_all"/>
  <action title="Standard View" action_id="view" category="object"
@@ -40,5 +41,5 @@
  </action>
  <action title="Add Faculty" action_id="add_faculty" category="object"
-    condition_expr="python:member and 'UniversityManager'in member.getRoles()"
+    condition_expr="python:True or member and 'UniversityManager'in member.getRoles()"
     url_expr="string:${object/absolute_url}/create_common?type_name=Faculty"
     visible="True">
Index: waeup_product/trunk/profiles/default/types/AccoFolder.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/AccoFolder.xml	(revision 199)
+++ waeup_product/trunk/profiles/default/types/AccoFolder.xml	(revision 200)
@@ -23,5 +23,5 @@
  </property>
  <property name="layouts">
-  <element value="waeup_common"/>
+  <element value="common"/>
  </property>
  <property name="layout_clusters">
Index: waeup_product/trunk/profiles/default/types/Accommodation.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/Accommodation.xml	(revision 199)
+++ waeup_product/trunk/profiles/default/types/Accommodation.xml	(revision 200)
@@ -14,5 +14,5 @@
  <property name="allow_discussion">False</property>
  <property name="cps_is_searchable">True</property>
- <property name="cps_proxy_type">cpsdocument</property>
+ <property name="cps_proxy_type">folder</property>
  <property name="cps_display_as_document_in_listing">True</property>
  <property name="schemas">
Index: waeup_product/trunk/profiles/default/types/Area_Color.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/Area_Color.xml	(revision 199)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version="1.0"?>
-<object name="Area Color" meta_type="Factory-based Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title"></property>
- <property name="description">_areacolor_description_</property>
- <property name="content_icon">area_color.png</property>
- <property name="content_meta_type">Area Color</property>
- <property name="product">CPSSkins</property>
- <property name="factory">addAreaColor</property>
- <property name="immediate_view">cpsskins_edit_form</property>
- <property name="global_allow">False</property>
- <property name="filter_content_types">False</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">False</property>
- <property name="cps_proxy_type"></property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="cps_is_portalbox">False</property>
- <alias from="(Default)" to="cpsskins_style_view"/>
- <alias from="delete" to="cpsskins_object_delete"/>
- <alias from="edit" to="cpsskins_edit_form"/>
- <alias from="edit_form" to="cpsskins_edit_form"/>
- <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_style_view" visible="True"/>
- <action title="Edit" action_id="edit" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_edit_form" visible="True">
-  <permission value="Manage Themes"/>
- </action>
- <action title="Delete" action_id="delete" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_object_delete" visible="False">
-  <permission value="Manage Themes"/>
- </action>
- <action title="isportalstyle" action_id="isportalstyle" category="object"
-    condition_expr="" url_expr="string:${object_url}/isPortalStyle"
-    visible="False"/>
-</object>
Index: waeup_product/trunk/profiles/default/types/Book.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/Book.xml	(revision 199)
+++ 	(revision )
@@ -1,74 +1,0 @@
-<?xml version="1.0"?>
-<object name="Book" meta_type="CPS Flexible Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">portal_type_Book_title</property>
- <property name="description">portal_type_Book_description</property>
- <property name="content_icon">book_icon.png</property>
- <property name="content_meta_type">CPS Document</property>
- <property name="product">CPSDocument</property>
- <property name="factory">addCPSDocument</property>
- <property name="immediate_view">cpsdocument_view</property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">True</property>
- <property name="allowed_content_types">
-  <element value="Page"/>
-  <element value="Chapter"/>
- </property>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">True</property>
- <property name="cps_proxy_type">folderishdocument</property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="schemas">
-  <element value="metadata"/>
-  <element value="common"/>
-  <element value="book"/>
- </property>
- <property name="layouts">
-  <element value="common"/>
-  <element value="book"/>
- </property>
- <property name="layout_clusters">
-  <element value="metadata:metadata"/>
- </property>
- <property name="flexible_layouts"/>
- <property name="storage_methods"/>
- <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="cpsdocument_view"/>
- <alias from="view" to="cpsdocument_view"/>
- <action title="action_view" action_id="view" category="object"
-    condition_expr="" url_expr="string:${object_url}/cpsdocument_view"
-    visible="True">
-  <permission value="View"/>
- </action>
- <action title="action_new_content" action_id="new_content" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_factories" visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_folder_contents" action_id="contents" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_contents" visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_edit" action_id="edit" category="object"
-    condition_expr="" url_expr="string:${object_url}/cpsdocument_edit_form"
-    visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_metadata" action_id="metadata" category="object"
-    condition_expr="not:portal/portal_membership/isAnonymousUser"
-    url_expr="string:${object_url}/cpsdocument_metadata" visible="True">
-  <permission value="View"/>
- </action>
- <action title="action_local_roles" action_id="localroles" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_localrole_form" visible="True">
-  <permission value="Change permissions"/>
- </action>
- <action title="action_status_history" action_id="status_history"
-    category="workflow"
-    condition_expr="not:portal/portal_membership/isAnonymousUser"
-    url_expr="string:${object_url}/content_status_history" visible="True">
-  <permission value="View"/>
- </action>
-</object>
Index: waeup_product/trunk/profiles/default/types/CPS_Calendar.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/CPS_Calendar.xml	(revision 199)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0"?>
-<object name="CPS Calendar" meta_type="Factory-based Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">portal_type_Calendar_title</property>
- <property name="description">portal_type_Calendar_description</property>
- <property name="content_icon">++resource++cpssharedcalendar.png</property>
- <property name="content_meta_type">CPS Calendar</property>
- <property name="product">CPSSharedCalendar</property>
- <property name="factory">manage_addCpsCalendar</property>
- <property name="immediate_view">calendar.html</property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">False</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">False</property>
- <property name="cps_proxy_type"></property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="cps_is_portalbox">False</property>
- <alias from="(Default)" to="calendar.html"/>
- <alias from="view" to="calendar.html"/>
- <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/calendar.html" visible="False">
-  <permission value="View"/>
- </action>
-</object>
Index: waeup_product/trunk/profiles/default/types/CPS_Proxy_Document.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/CPS_Proxy_Document.xml	(revision 199)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0"?>
-<object name="CPS Proxy Document" meta_type="Factory-based Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title"></property>
- <property name="description">A proxy to a document.</property>
- <property name="content_icon">document_icon.png</property>
- <property name="content_meta_type">CPS Proxy Document</property>
- <property name="product">CPSCore</property>
- <property name="factory">addProxyDocument</property>
- <property name="immediate_view"></property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">True</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">False</property>
- <property name="cps_proxy_type"></property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="cps_is_portalbox">False</property>
- <alias from="(Default)" to="(Default)"/>
- <alias from="view" to="(Default)"/>
-</object>
Index: waeup_product/trunk/profiles/default/types/CPS_Proxy_Folder.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/CPS_Proxy_Folder.xml	(revision 199)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0"?>
-<object name="CPS Proxy Folder" meta_type="Factory-based Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title"></property>
- <property name="description">A proxy to a folder.</property>
- <property name="content_icon">folder_icon.png</property>
- <property name="content_meta_type">CPS Proxy Folder</property>
- <property name="product">CPSCore</property>
- <property name="factory">addProxyFolder</property>
- <property name="immediate_view"></property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">True</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">False</property>
- <property name="cps_proxy_type"></property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="cps_is_portalbox">False</property>
- <alias from="(Default)" to="(Default)"/>
- <alias from="view" to="(Default)"/>
-</object>
Index: waeup_product/trunk/profiles/default/types/CPS_Proxy_Folderish_Document.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/CPS_Proxy_Folderish_Document.xml	(revision 199)
+++ 	(revision )
@@ -1,22 +1,0 @@
-<?xml version="1.0"?>
-<object name="CPS Proxy Folderish Document"
-   meta_type="Factory-based Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title"></property>
- <property name="description">A proxy to a folderish document.</property>
- <property name="content_icon">folder_icon.png</property>
- <property name="content_meta_type">CPS Proxy Folderish Document</property>
- <property name="product">CPSCore</property>
- <property name="factory">addProxyFolderishDocument</property>
- <property name="immediate_view"></property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">True</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">False</property>
- <property name="cps_proxy_type"></property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="cps_is_portalbox">False</property>
- <alias from="(Default)" to="(Default)"/>
- <alias from="view" to="(Default)"/>
-</object>
Index: waeup_product/trunk/profiles/default/types/Calendar_Style.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/Calendar_Style.xml	(revision 199)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version="1.0"?>
-<object name="Calendar Style" meta_type="Factory-based Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title"></property>
- <property name="description">_calendarstyle_description_</property>
- <property name="content_icon">calendar_style.png</property>
- <property name="content_meta_type">Calendar Style</property>
- <property name="product">CPSSkins</property>
- <property name="factory">addCalendarStyle</property>
- <property name="immediate_view">cpsskins_edit_form</property>
- <property name="global_allow">False</property>
- <property name="filter_content_types">False</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">False</property>
- <property name="cps_proxy_type"></property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="cps_is_portalbox">False</property>
- <alias from="(Default)" to="cpsskins_style_view"/>
- <alias from="delete" to="cpsskins_object_delete"/>
- <alias from="edit" to="cpsskins_edit_form"/>
- <alias from="edit_form" to="cpsskins_edit_form"/>
- <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_style_view" visible="True"/>
- <action title="Edit" action_id="edit" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_edit_form" visible="True">
-  <permission value="Manage Themes"/>
- </action>
- <action title="Delete" action_id="delete" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_object_delete" visible="False">
-  <permission value="Manage Themes"/>
- </action>
- <action title="isportalstyle" action_id="isportalstyle" category="object"
-    condition_expr="" url_expr="string:${object_url}/isPortalStyle"
-    visible="False"/>
-</object>
Index: waeup_product/trunk/profiles/default/types/Calendar_Templet.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/Calendar_Templet.xml	(revision 199)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<?xml version="1.0"?>
-<object name="Calendar Templet" meta_type="Factory-based Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title"></property>
- <property name="description">_calendar_templet_description_</property>
- <property name="content_icon">calendar_templet.png</property>
- <property name="content_meta_type">Calendar Templet</property>
- <property name="product">CPSSkins</property>
- <property name="factory">addCalendar</property>
- <property name="immediate_view">cpsskins_edit_form</property>
- <property name="global_allow">False</property>
- <property name="filter_content_types">False</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">False</property>
- <property name="cps_proxy_type"></property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="cps_is_portalbox">False</property>
- <alias from="(Default)" to="index_html"/>
- <alias from="edit" to="cpsskins_edit_form"/>
- <alias from="edit_form" to="cpsskins_edit_form"/>
- <alias from="view" to="cpsskins_templet_view"/>
- <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_templet_view" visible="True"/>
- <action title="Edit" action_id="edit" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_edit_form" visible="True">
-  <permission value="Manage Themes"/>
- </action>
- <action title="isportaltemplet" action_id="isportaltemplet" category="object"
-    condition_expr="" url_expr="string:${object_url}/isPortalTemplet"
-    visible="False"/>
-</object>
Index: waeup_product/trunk/profiles/default/types/Cell_Hider.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/Cell_Hider.xml	(revision 199)
+++ 	(revision )
@@ -1,33 +1,0 @@
-<?xml version="1.0"?>
-<object name="Cell Hider" meta_type="Factory-based Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title"></property>
- <property name="description">_cellhider_description_</property>
- <property name="content_icon">cell_hider.png</property>
- <property name="content_meta_type">Cell Hider</property>
- <property name="product">CPSSkins</property>
- <property name="factory">addCellHider</property>
- <property name="immediate_view">cpsskins_edit_form</property>
- <property name="global_allow">False</property>
- <property name="filter_content_types">False</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">False</property>
- <property name="cps_proxy_type"></property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="cps_is_portalbox">False</property>
- <alias from="(Default)" to="cpsskins_default_view"/>
- <alias from="edit" to="cpsskins_edit_form"/>
- <alias from="edit_form" to="cpsskins_edit_form"/>
- <alias from="view" to="cpsskins_default_view"/>
- <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_default_view" visible="True"/>
- <action title="Edit" action_id="edit" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_edit_form" visible="True">
-  <permission value="Manage Themes"/>
- </action>
- <action title="Delete" action_id="delete" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_object_delete" visible="False">
-  <permission value="Manage Themes"/>
- </action>
-</object>
Index: waeup_product/trunk/profiles/default/types/Content_Box.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/Content_Box.xml	(revision 199)
+++ 	(revision )
@@ -1,31 +1,0 @@
-<?xml version="1.0"?>
-<object name="Content Box" meta_type="Factory-based Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">portal_type_ContentBox_title</property>
- <property name="description">portal_type_ContentBox_description</property>
- <property name="content_icon">box.png</property>
- <property name="content_meta_type">Content Box</property>
- <property name="product">CPSBoxes</property>
- <property name="factory">addContentBox</property>
- <property name="immediate_view">contentbox_edit_form</property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">False</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">False</property>
- <property name="cps_proxy_type"></property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="cps_is_portalbox">True</property>
- <alias from="(Default)" to="basebox_view"/>
- <alias from="view" to="basebox_view"/>
- <action title="action_view" action_id="view" category="object"
-    condition_expr="" url_expr="string:${object_url}/basebox_view"
-    visible="True">
-  <permission value="View"/>
- </action>
- <action title="action_edit" action_id="edit" category="object"
-    condition_expr="" url_expr="string:${object_url}/contentbox_edit_form"
-    visible="True">
-  <permission value="Modify portal content"/>
- </action>
-</object>
Index: waeup_product/trunk/profiles/default/types/Department.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/Department.xml	(revision 199)
+++ waeup_product/trunk/profiles/default/types/Department.xml	(revision 200)
@@ -33,4 +33,5 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
+ <alias from="(Default)" to="temporary_view_all"/>
  <alias from="view" to="temporary_view_all"/>
  <action title="Standard View" action_id="view" category="object"
@@ -40,7 +41,7 @@
  </action>
  <action title="action_edit" action_id="edit" category="object"
-    condition_expr="" url_expr="string:${object_url}/waeup_edit_form"
-    visible="True">
-  <permission value="University Manage"/>
+    condition_expr="python:member and 'Manager' in member.getRoles()"
+    url_expr="string:${object_url}/cpsdocument_edit_form" visible="True">
+  <permission value="Modify portal content"/>
  </action>
  <action title="Add Course" action_id="create_course" category="object"
@@ -52,9 +53,4 @@
     condition_expr="python:member and 'Manager' in member.getRoles()"
     url_expr="string:${object_url}/folder_contents" visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <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="Modify portal content"/>
  </action>
Index: waeup_product/trunk/profiles/default/types/EventDoc.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/EventDoc.xml	(revision 199)
+++ 	(revision )
@@ -1,71 +1,0 @@
-<?xml version="1.0"?>
-<object name="EventDoc" meta_type="CPS Flexible Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">portal_type_Event_title</property>
- <property name="description">portal_type_Event_description</property>
- <property name="content_icon">event_icon.png</property>
- <property name="content_meta_type">CPS Document</property>
- <property name="product">CPSDocument</property>
- <property name="factory">addCPSDocument</property>
- <property name="immediate_view">cpsdocument_view</property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">True</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">True</property>
- <property name="cps_proxy_type">document</property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="schemas">
-  <element value="metadata"/>
-  <element value="common"/>
-  <element value="event"/>
- </property>
- <property name="layouts">
-  <element value="common"/>
-  <element value="event"/>
- </property>
- <property name="layout_clusters">
-  <element value="metadata:metadata"/>
- </property>
- <property name="flexible_layouts"/>
- <property name="storage_methods"/>
- <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="cpsdocument_view"/>
- <alias from="view" to="cpsdocument_view"/>
- <action title="action_view" action_id="view" category="object"
-    condition_expr="" url_expr="string:${object_url}/cpsdocument_view"
-    visible="True">
-  <permission value="View"/>
- </action>
- <action title="action_new_content" action_id="new_content" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_factories" visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_folder_contents" action_id="contents" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_contents" visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_edit" action_id="edit" category="object"
-    condition_expr="" url_expr="string:${object_url}/cpsdocument_edit_form"
-    visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_metadata" action_id="metadata" category="object"
-    condition_expr="not:portal/portal_membership/isAnonymousUser"
-    url_expr="string:${object_url}/cpsdocument_metadata" visible="True">
-  <permission value="View"/>
- </action>
- <action title="action_local_roles" action_id="localroles" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_localrole_form" visible="True">
-  <permission value="Change permissions"/>
- </action>
- <action title="action_status_history" action_id="status_history"
-    category="workflow"
-    condition_expr="not:portal/portal_membership/isAnonymousUser"
-    url_expr="string:${object_url}/content_status_history" visible="True">
-  <permission value="View"/>
- </action>
-</object>
Index: waeup_product/trunk/profiles/default/types/FAQ.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/FAQ.xml	(revision 199)
+++ 	(revision )
@@ -1,72 +1,0 @@
-<?xml version="1.0"?>
-<object name="FAQ" meta_type="CPS Flexible Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">portal_type_FAQ_title</property>
- <property name="description">portal_type_FAQ_description</property>
- <property name="content_icon">faqs_icon.png</property>
- <property name="content_meta_type">CPS Document</property>
- <property name="product">CPSDocument</property>
- <property name="factory">addCPSDocument</property>
- <property name="immediate_view">cpsdocument_view</property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">True</property>
- <property name="allowed_content_types">
-  <element value="FAQitem"/>
- </property>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">True</property>
- <property name="cps_proxy_type">folderishdocument</property>
- <property name="cps_display_as_document_in_listing">True</property>
- <property name="schemas">
-  <element value="metadata"/>
-  <element value="common"/>
- </property>
- <property name="layouts">
-  <element value="common"/>
-  <element value="faq"/>
- </property>
- <property name="layout_clusters">
-  <element value="metadata:metadata"/>
- </property>
- <property name="flexible_layouts"/>
- <property name="storage_methods"/>
- <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="cpsdocument_view"/>
- <alias from="view" to="cpsdocument_view"/>
- <action title="action_view" action_id="view" category="object"
-    condition_expr="" url_expr="string:${object_url}/cpsdocument_view"
-    visible="True">
-  <permission value="View"/>
- </action>
- <action title="action_new_content" action_id="new_content" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_factories" visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_folder_contents" action_id="contents" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_contents" visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_edit" action_id="edit" category="object"
-    condition_expr="" url_expr="string:${object_url}/cpsdocument_edit_form"
-    visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_metadata" action_id="metadata" category="object"
-    condition_expr="not:portal/portal_membership/isAnonymousUser"
-    url_expr="string:${object_url}/cpsdocument_metadata" visible="True">
-  <permission value="View"/>
- </action>
- <action title="action_local_roles" action_id="localroles" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_localrole_form" visible="True">
-  <permission value="Change permissions"/>
- </action>
- <action title="action_status_history" action_id="status_history"
-    category="workflow"
-    condition_expr="not:portal/portal_membership/isAnonymousUser"
-    url_expr="string:${object_url}/content_status_history" visible="True">
-  <permission value="View"/>
- </action>
-</object>
Index: waeup_product/trunk/profiles/default/types/Faculty.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/Faculty.xml	(revision 199)
+++ waeup_product/trunk/profiles/default/types/Faculty.xml	(revision 200)
@@ -11,8 +11,10 @@
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
- <property name="allowed_content_types">Department</property>
+ <property name="allowed_content_types">
+  <element value="Department"/>
+ </property>
  <property name="allow_discussion">False</property>
  <property name="cps_is_searchable">True</property>
- <property name="cps_proxy_type">folder</property>
+ <property name="cps_proxy_type">btreefolderishdocument</property>
  <property name="cps_display_as_document_in_listing">True</property>
  <property name="schemas">
@@ -30,4 +32,5 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
+ <alias from="(Default)" to="temporary_view_all"/>
  <alias from="view" to="temporary_view_all"/>
  <action title="Standard View" action_id="view" category="object"
@@ -37,7 +40,7 @@
  </action>
  <action title="action_edit" action_id="edit" category="object"
-    condition_expr="" url_expr="string:${object_url}/waeup_edit_form"
-    visible="True">
-  <permission value="University Manage"/>
+    condition_expr="python:member and 'Manager' in member.getRoles()"
+    url_expr="string:${object_url}/cpsdocument_edit_form" visible="True">
+  <permission value="Modify portal content"/>
  </action>
  <action title="Add Department" action_id="add_department" category="object"
@@ -52,9 +55,4 @@
   <permission value="University Manage"/>
  </action>
- <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="Modify portal content"/>
- </action>
  <action title="action_metadata" action_id="metadata" category="object"
     condition_expr="python:member and 'Manager' in member.getRoles()"
@@ -67,3 +65,9 @@
   <permission value="Modify portal content"/>
  </action>
+ <action title="Add Faculty" action_id="add_faculty" category="object"
+    condition_expr="python:member and 'UniversityManager'in member.getRoles()"
+    url_expr="string:${object/absolute_url}/create_common?type_name=Faculty"
+    visible="True">
+  <permission value="University Manage"/>
+ </action>
 </object>
Index: waeup_product/trunk/profiles/default/types/Favorite.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/Favorite.xml	(revision 199)
+++ 	(revision )
@@ -1,35 +1,0 @@
-<?xml version="1.0"?>
-<object name="Favorite" meta_type="Factory-based Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title"></property>
- <property
-    name="description">A Favorite is a Link to an intra-portal resource.</property>
- <property name="content_icon">link_icon.gif</property>
- <property name="content_meta_type">Favorite</property>
- <property name="product">CMFDefault</property>
- <property name="factory">addFavorite</property>
- <property name="immediate_view">metadata_edit_form</property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">True</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">False</property>
- <property name="cps_proxy_type"></property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="cps_is_portalbox">False</property>
- <alias from="(Default)" to="favorite_view"/>
- <alias from="view" to="favorite_view"/>
- <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/favorite_view" visible="True">
-  <permission value="View"/>
- </action>
- <action title="Edit" action_id="edit" category="object" condition_expr=""
-    url_expr="string:${object_url}/link_edit_form" visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="Metadata" action_id="metadata" category="object"
-    condition_expr="" url_expr="string:${object_url}/metadata_edit_form"
-    visible="True">
-  <permission value="Modify portal content"/>
- </action>
-</object>
Index: waeup_product/trunk/profiles/default/types/File.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/File.xml	(revision 199)
+++ 	(revision )
@@ -1,76 +1,0 @@
-<?xml version="1.0"?>
-<object name="File" meta_type="CPS Flexible Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">portal_type_File_title</property>
- <property name="description">portal_type_File_description</property>
- <property name="content_icon">attachedfile_icon.png</property>
- <property name="content_meta_type">CPS Document</property>
- <property name="product">CPSDocument</property>
- <property name="factory">addCPSDocument</property>
- <property name="immediate_view">cpsdocument_view</property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">True</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">True</property>
- <property name="cps_proxy_type">document</property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="schemas">
-  <element value="metadata"/>
-  <element value="common"/>
-  <element value="file"/>
- </property>
- <property name="layouts">
-  <element value="common"/>
-  <element value="file"/>
- </property>
- <property name="layout_clusters">
-  <element value="metadata:metadata"/>
- </property>
- <property name="flexible_layouts"/>
- <property name="storage_methods"/>
- <property name="cps_is_portlet">False</property>
- <alias from="view" to="cpsdocument_view"/>
- <action title="action_view" action_id="view" category="object"
-    condition_expr="" url_expr="string:${object_url}/cpsdocument_view"
-    visible="True">
-  <permission value="View"/>
- </action>
- <action title="action_new_content" action_id="new_content" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_factories" visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_folder_contents" action_id="contents" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_contents" visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_edit" action_id="edit" category="object"
-    condition_expr="" url_expr="string:${object_url}/cpsdocument_edit_form"
-    visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_metadata" action_id="metadata" category="object"
-    condition_expr="not:portal/portal_membership/isAnonymousUser"
-    url_expr="string:${object_url}/cpsdocument_metadata" visible="True">
-  <permission value="View"/>
- </action>
- <action title="action_local_roles" action_id="localroles" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_localrole_form" visible="True">
-  <permission value="Change permissions"/>
- </action>
- <action title="action_edit_online" action_id="edit_online" category="object"
-    condition_expr="python:object is not None and object.getContent().file is not None and modules[&quot;Products.CPSUtil.integration&quot;].isProductPresent(&quot;Products.ExternalEditor&quot;)"
-    url_expr="python:portal.getExternalEditorPath(object, &quot;file&quot;, &quot;file&quot;)"
-    visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_status_history" action_id="status_history"
-    category="workflow"
-    condition_expr="not:portal/portal_membership/isAnonymousUser"
-    url_expr="string:${object_url}/content_status_history" visible="True">
-  <permission value="View"/>
- </action>
-</object>
Index: waeup_product/trunk/profiles/default/types/Flash_Box.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/Flash_Box.xml	(revision 199)
+++ 	(revision )
@@ -1,29 +1,0 @@
-<?xml version="1.0"?>
-<object name="Flash Box" meta_type="Factory-based Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">portal_type_FlashBox_title</property>
- <property name="description">portal_type_FlashBox_description</property>
- <property name="content_icon">box.png</property>
- <property name="content_meta_type">Flash Box</property>
- <property name="product">CPSBoxes</property>
- <property name="factory">addFlashBox</property>
- <property name="immediate_view">flashbox_edit_form</property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">False</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">False</property>
- <property name="cps_proxy_type"></property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="cps_is_portalbox">True</property>
- <alias from="(Default)" to="basebox_view"/>
- <alias from="view" to="basebox_view"/>
- <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/basebox_view" visible="True">
-  <permission value="View"/>
- </action>
- <action title="Edit" action_id="edit" category="object" condition_expr=""
-    url_expr="string:${object_url}/flashbox_edit_form" visible="True">
-  <permission value="Modify portal content"/>
- </action>
-</object>
Index: waeup_product/trunk/profiles/default/types/Flexible.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/Flexible.xml	(revision 199)
+++ 	(revision )
@@ -1,73 +1,0 @@
-<?xml version="1.0"?>
-<object name="Flexible" meta_type="CPS Flexible Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">portal_type_Flexible_title</property>
- <property name="description">portal_type_Flexible_description</property>
- <property name="content_icon">flexible_icon.png</property>
- <property name="content_meta_type">CPS Document</property>
- <property name="product">CPSDocument</property>
- <property name="factory">addCPSDocument</property>
- <property name="immediate_view">cpsdocument_edit_form</property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">True</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">True</property>
- <property name="cps_proxy_type">document</property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="schemas">
-  <element value="metadata"/>
-  <element value="common"/>
-  <element value="flexible_content"/>
- </property>
- <property name="layouts">
-  <element value="common"/>
-  <element value="flexible_content"/>
- </property>
- <property name="layout_clusters">
-  <element value="metadata:metadata"/>
- </property>
- <property name="flexible_layouts">
-  <element value="flexible_content:flexible_content"/>
- </property>
- <property name="storage_methods"/>
- <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="cpsdocument_view"/>
- <alias from="view" to="cpsdocument_view"/>
- <action title="action_view" action_id="view" category="object"
-    condition_expr="" url_expr="string:${object_url}/cpsdocument_view"
-    visible="True">
-  <permission value="View"/>
- </action>
- <action title="action_new_content" action_id="new_content" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_factories" visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_folder_contents" action_id="contents" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_contents" visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_edit" action_id="edit" category="object"
-    condition_expr="" url_expr="string:${object_url}/cpsdocument_edit_form"
-    visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_metadata" action_id="metadata" category="object"
-    condition_expr="not:portal/portal_membership/isAnonymousUser"
-    url_expr="string:${object_url}/cpsdocument_metadata" visible="True">
-  <permission value="View"/>
- </action>
- <action title="action_local_roles" action_id="localroles" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_localrole_form" visible="True">
-  <permission value="Change permissions"/>
- </action>
- <action title="action_status_history" action_id="status_history"
-    category="workflow"
-    condition_expr="not:portal/portal_membership/isAnonymousUser"
-    url_expr="string:${object_url}/content_status_history" visible="True">
-  <permission value="View"/>
- </action>
-</object>
Index: waeup_product/trunk/profiles/default/types/Font_Shape.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/Font_Shape.xml	(revision 199)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version="1.0"?>
-<object name="Font Shape" meta_type="Factory-based Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title"></property>
- <property name="description">_fontshape_description_</property>
- <property name="content_icon">fontshape.png</property>
- <property name="content_meta_type">Font Shape</property>
- <property name="product">CPSSkins</property>
- <property name="factory">addFontShape</property>
- <property name="immediate_view">cpsskins_edit_form</property>
- <property name="global_allow">False</property>
- <property name="filter_content_types">False</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">False</property>
- <property name="cps_proxy_type"></property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="cps_is_portalbox">False</property>
- <alias from="(Default)" to="cpsskins_style_view"/>
- <alias from="delete" to="cpsskins_object_delete"/>
- <alias from="edit" to="cpsskins_edit_form"/>
- <alias from="edit_form" to="cpsskins_edit_form"/>
- <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_style_view" visible="True"/>
- <action title="Edit" action_id="edit" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_edit_form" visible="True">
-  <permission value="Manage Themes"/>
- </action>
- <action title="Delete" action_id="delete" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_object_delete" visible="False">
-  <permission value="Manage Themes"/>
- </action>
- <action title="isportalstyle" action_id="isportalstyle" category="object"
-    condition_expr="" url_expr="string:${object_url}/isPortalStyle"
-    visible="False"/>
-</object>
Index: waeup_product/trunk/profiles/default/types/ForumPost.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/ForumPost.xml	(revision 199)
+++ 	(revision )
@@ -1,70 +1,0 @@
-<?xml version="1.0"?>
-<object name="ForumPost" meta_type="CPS Flexible Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">portal_type_ForumPost_title</property>
- <property name="description">portal_type_ForumPost_description</property>
- <property name="content_icon">discussionitem_icon.png</property>
- <property name="content_meta_type">CPS Document</property>
- <property name="product">CPSDocument</property>
- <property name="factory">addCPSDocument</property>
- <property name="immediate_view">cpsdocument_edit_form</property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">False</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">True</property>
- <property name="cps_proxy_type">document</property>
- <property name="cps_display_as_document_in_listing">True</property>
- <property name="schemas">
-  <element value="common"/>
-  <element value="metadata"/>
-  <element value="forumpost"/>
- </property>
- <property name="layouts">
-  <element value="forumpost"/>
- </property>
- <property name="layout_clusters">
-  <element value="metadata:metadata"/>
- </property>
- <property name="flexible_layouts"/>
- <property name="storage_methods"/>
- <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="cpsdocument_view"/>
- <alias from="view" to="cpsdocument_view"/>
- <action title="action_view" action_id="view" category="object"
-    condition_expr="" url_expr="string:${object_url}/cpsdocument_view"
-    visible="True">
-  <permission value="View"/>
- </action>
- <action title="action_new_content" action_id="new_content" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_factories" visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_folder_contents" action_id="contents" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_contents" visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_edit" action_id="edit" category="object"
-    condition_expr="" url_expr="string:${object_url}/cpsdocument_edit_form"
-    visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_metadata" action_id="metadata" category="object"
-    condition_expr="not:portal/portal_membership/isAnonymousUser"
-    url_expr="string:${object_url}/cpsdocument_metadata" visible="True">
-  <permission value="View"/>
- </action>
- <action title="action_local_roles" action_id="localroles" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_localrole_form" visible="True">
-  <permission value="Change permissions"/>
- </action>
- <action title="action_status_history" action_id="status_history"
-    category="workflow"
-    condition_expr="not:portal/portal_membership/isAnonymousUser"
-    url_expr="string:${object_url}/content_status_history" visible="True">
-  <permission value="View"/>
- </action>
-</object>
Index: waeup_product/trunk/profiles/default/types/Glossary.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/Glossary.xml	(revision 199)
+++ 	(revision )
@@ -1,73 +1,0 @@
-<?xml version="1.0"?>
-<object name="Glossary" meta_type="CPS Flexible Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">portal_type_Glossary_title</property>
- <property name="description">portal_type_Glossary_description</property>
- <property name="content_icon">glossaries_icon.png</property>
- <property name="content_meta_type">CPS Document</property>
- <property name="product">CPSDocument</property>
- <property name="factory">addCPSDocument</property>
- <property name="immediate_view">cpsdocument_view</property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">True</property>
- <property name="allowed_content_types">
-  <element value="GlossaryItem"/>
- </property>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">True</property>
- <property name="cps_proxy_type">folderishdocument</property>
- <property name="cps_display_as_document_in_listing">True</property>
- <property name="schemas">
-  <element value="metadata"/>
-  <element value="common"/>
-  <element value="glossary"/>
- </property>
- <property name="layouts">
-  <element value="common"/>
-  <element value="glossary"/>
- </property>
- <property name="layout_clusters">
-  <element value="metadata:metadata"/>
- </property>
- <property name="flexible_layouts"/>
- <property name="storage_methods"/>
- <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="cpsdocument_view"/>
- <alias from="view" to="cpsdocument_view"/>
- <action title="action_view" action_id="view" category="object"
-    condition_expr="" url_expr="string:${object_url}/cpsdocument_view"
-    visible="True">
-  <permission value="View"/>
- </action>
- <action title="action_new_content" action_id="new_content" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_factories" visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_folder_contents" action_id="contents" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_contents" visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_edit" action_id="edit" category="object"
-    condition_expr="" url_expr="string:${object_url}/cpsdocument_edit_form"
-    visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_metadata" action_id="metadata" category="object"
-    condition_expr="not:portal/portal_membership/isAnonymousUser"
-    url_expr="string:${object_url}/cpsdocument_metadata" visible="True">
-  <permission value="View"/>
- </action>
- <action title="action_local_roles" action_id="localroles" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_localrole_form" visible="True">
-  <permission value="Change permissions"/>
- </action>
- <action title="action_status_history" action_id="status_history"
-    category="workflow"
-    condition_expr="not:portal/portal_membership/isAnonymousUser"
-    url_expr="string:${object_url}/content_status_history" visible="True">
-  <permission value="View"/>
- </action>
-</object>
Index: waeup_product/trunk/profiles/default/types/GlossaryItem.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/GlossaryItem.xml	(revision 199)
+++ 	(revision )
@@ -1,70 +1,0 @@
-<?xml version="1.0"?>
-<object name="GlossaryItem" meta_type="CPS Flexible Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">portal_type_GlossaryItem_title</property>
- <property name="description">portal_type_GlossaryItem_description</property>
- <property name="content_icon">glossary_icon.png</property>
- <property name="content_meta_type">CPS Document</property>
- <property name="product">CPSDocument</property>
- <property name="factory">addCPSDocument</property>
- <property name="immediate_view">cpsdocument_view</property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">True</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">True</property>
- <property name="cps_proxy_type">document</property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="schemas">
-  <element value="metadata"/>
-  <element value="common"/>
- </property>
- <property name="layouts">
-  <element value="common"/>
-  <element value="glossaryitem"/>
- </property>
- <property name="layout_clusters">
-  <element value="metadata:metadata"/>
- </property>
- <property name="flexible_layouts"/>
- <property name="storage_methods"/>
- <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="cpsdocument_view"/>
- <alias from="view" to="cpsdocument_view"/>
- <action title="action_view" action_id="view" category="object"
-    condition_expr="" url_expr="string:${object_url}/cpsdocument_view"
-    visible="True">
-  <permission value="View"/>
- </action>
- <action title="action_new_content" action_id="new_content" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_factories" visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_folder_contents" action_id="contents" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_contents" visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_edit" action_id="edit" category="object"
-    condition_expr="" url_expr="string:${object_url}/cpsdocument_edit_form"
-    visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_metadata" action_id="metadata" category="object"
-    condition_expr="not:portal/portal_membership/isAnonymousUser"
-    url_expr="string:${object_url}/cpsdocument_metadata" visible="True">
-  <permission value="View"/>
- </action>
- <action title="action_local_roles" action_id="localroles" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_localrole_form" visible="True">
-  <permission value="Change permissions"/>
- </action>
- <action title="action_status_history" action_id="status_history"
-    category="workflow"
-    condition_expr="not:portal/portal_membership/isAnonymousUser"
-    url_expr="string:${object_url}/content_status_history" visible="True">
-  <permission value="View"/>
- </action>
-</object>
Index: waeup_product/trunk/profiles/default/types/Image_Box.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/Image_Box.xml	(revision 199)
+++ 	(revision )
@@ -1,29 +1,0 @@
-<?xml version="1.0"?>
-<object name="Image Box" meta_type="Factory-based Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">portal_type_ImageBox_title</property>
- <property name="description">portal_type_ImageBox_description</property>
- <property name="content_icon">box.png</property>
- <property name="content_meta_type">Image Box</property>
- <property name="product">CPSBoxes</property>
- <property name="factory">addImageBox</property>
- <property name="immediate_view">imagebox_edit_form</property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">False</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">False</property>
- <property name="cps_proxy_type"></property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="cps_is_portalbox">True</property>
- <alias from="(Default)" to="basebox_view"/>
- <alias from="view" to="basebox_view"/>
- <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/basebox_view" visible="True">
-  <permission value="View"/>
- </action>
- <action title="Edit" action_id="edit" category="object" condition_expr=""
-    url_expr="string:${object_url}/imagebox_edit_form" visible="True">
-  <permission value="Modify portal content"/>
- </action>
-</object>
Index: waeup_product/trunk/profiles/default/types/Image_Box_Templet.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/Image_Box_Templet.xml	(revision 199)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<?xml version="1.0"?>
-<object name="Image Box Templet" meta_type="Factory-based Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title"></property>
- <property name="description">_imagebox_templet_description_</property>
- <property name="content_icon">imagebox_templet.png</property>
- <property name="content_meta_type">Image Box Templet</property>
- <property name="product">CPSSkins</property>
- <property name="factory">addImageBox</property>
- <property name="immediate_view">cpsskins_edit_form</property>
- <property name="global_allow">False</property>
- <property name="filter_content_types">False</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">False</property>
- <property name="cps_proxy_type"></property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="cps_is_portalbox">False</property>
- <alias from="(Default)" to="index_html"/>
- <alias from="edit" to="cpsskins_edit_form"/>
- <alias from="edit_form" to="cpsskins_edit_form"/>
- <alias from="view" to="cpsskins_templet_view"/>
- <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_templet_view" visible="True"/>
- <action title="Edit" action_id="edit" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_edit_form" visible="True">
-  <permission value="Manage Themes"/>
- </action>
- <action title="isportaltemplet" action_id="isportaltemplet" category="object"
-    condition_expr="" url_expr="string:${object_url}/isPortalTemplet"
-    visible="False"/>
-</object>
Index: waeup_product/trunk/profiles/default/types/Jamb.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/Jamb.xml	(revision 199)
+++ waeup_product/trunk/profiles/default/types/Jamb.xml	(revision 200)
@@ -28,4 +28,5 @@
  </property>
  <property name="cps_is_portlet">False</property>
+ <alias from="(Default)" to="temporary_view_all"/>
  <alias from="view" to="temporary_view_all"/>
  <action title="Standard View" action_id="view" category="object"
@@ -36,7 +37,5 @@
  <action title="action_edit" action_id="edit" category="object"
     condition_expr="" url_expr="string:${object_url}/waeup_edit_form"
-    visible="True">
-  <permission value="Student Manage"/>
- </action>
+    visible="True"/>
  <action title="delegate" action_id="localroles" category="object"
     condition_expr="" url_expr="string:${object_url}/folder_localrole_form"
@@ -46,11 +45,8 @@
  <action title="Add Content" action_id="add_content" category="object"
     condition_expr="python:member and 'Manager' in member.getRoles()"
-    url_expr="string:${object/absolute_url}/folder_factories" visible="True">
-  <permission value="Student Manage"/>
- </action>
+    url_expr="string:${object/absolute_url}/folder_factories"
+    visible="False"/>
  <action title="action_metadata" action_id="metadata" category="object"
     condition_expr="python:'Manager' in member.getRoles()"
-    url_expr="string:${object_url}/cpsdocument_metadata" visible="True">
-  <permission value="University Manage"/>
- </action>
+    url_expr="string:${object_url}/cpsdocument_metadata" visible="False"/>
 </object>
Index: waeup_product/trunk/profiles/default/types/Language_Portlet.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/Language_Portlet.xml	(revision 199)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0"?>
-<object name="Language Portlet" meta_type="CPS Flexible Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">portal_type_LanguagePortlet_title</property>
- <property
-    name="description">portal_type_LanguagePortlet_description</property>
- <property name="content_icon">language_portlet_icon.png</property>
- <property name="content_meta_type">CPS Portlet</property>
- <property name="product">CPSPortlets</property>
- <property name="factory">addCPSPortlet</property>
- <property name="immediate_view">cpsportlet_edit_form</property>
- <property name="global_allow">False</property>
- <property name="filter_content_types">False</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">False</property>
- <property name="cps_proxy_type"></property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="schemas">
-  <element value="portlet_common"/>
-  <element value="language_portlet"/>
-  <element value="common"/>
-  <element value="metadata"/>
- </property>
- <property name="layouts">
-  <element value="portlet_common"/>
-  <element value="language_portlet"/>
- </property>
- <property name="layout_clusters">
-  <element value="metadata:metadata"/>
- </property>
- <property name="flexible_layouts"/>
- <property name="storage_methods"/>
- <property name="cps_is_portlet">True</property>
- <alias from="(Default)" to="render"/>
- <alias from="view" to="render"/>
- <action title="action_create" action_id="create" category="object"
-    condition_expr="" url_expr="string:${object_url}/cpsportlet_create_form"
-    visible="False">
-  <permission value="Manage Portlets"/>
- </action>
- <action title="action_edit" action_id="edit" category="object"
-    condition_expr="" url_expr="string:${object_url}/cpsportlet_edit_form"
-    visible="False">
-  <permission value="Manage Portlets"/>
- </action>
- <action title="action_view" action_id="view" category="object"
-    condition_expr="" url_expr="string:${object_url}/render" visible="False">
-  <permission value="View"/>
- </action>
- <action title="action_metadata" action_id="metadata" category="object"
-    condition_expr="" url_expr="string:${object_url}/cpsportlet_metadata"
-    visible="False">
-  <permission value="Manage Portlets"/>
- </action>
-</object>
Index: waeup_product/trunk/profiles/default/types/Link.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/Link.xml	(revision 199)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0"?>
-<object name="Link" meta_type="CPS Flexible Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">portal_type_Link_title</property>
- <property name="description">portal_type_Link_description</property>
- <property name="content_icon">link_icon.png</property>
- <property name="content_meta_type">CPS Document</property>
- <property name="product">CPSDocument</property>
- <property name="factory">addCPSDocument</property>
- <property name="immediate_view">cpsdocument_view</property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">True</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">True</property>
- <property name="cps_proxy_type">document</property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="schemas">
-  <element value="metadata"/>
-  <element value="common"/>
- </property>
- <property name="layouts">
-  <element value="link"/>
- </property>
- <property name="layout_clusters">
-  <element value="metadata:metadata"/>
- </property>
- <property name="flexible_layouts"/>
- <property name="storage_methods"/>
- <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="cpsdocument_view"/>
- <alias from="view" to="cpsdocument_view"/>
- <action title="action_view" action_id="view" category="object"
-    condition_expr="" url_expr="string:${object_url}/cpsdocument_view"
-    visible="True">
-  <permission value="View"/>
- </action>
- <action title="action_new_content" action_id="new_content" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_factories" visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_folder_contents" action_id="contents" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_contents" visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_edit" action_id="edit" category="object"
-    condition_expr="" url_expr="string:${object_url}/cpsdocument_edit_form"
-    visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_metadata" action_id="metadata" category="object"
-    condition_expr="not:portal/portal_membership/isAnonymousUser"
-    url_expr="string:${object_url}/cpsdocument_metadata" visible="True">
-  <permission value="View"/>
- </action>
- <action title="action_local_roles" action_id="localroles" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_localrole_form" visible="True">
-  <permission value="Change permissions"/>
- </action>
- <action title="action_status_history" action_id="status_history"
-    category="workflow"
-    condition_expr="not:portal/portal_membership/isAnonymousUser"
-    url_expr="string:${object_url}/content_status_history" visible="True">
-  <permission value="View"/>
- </action>
-</object>
Index: waeup_product/trunk/profiles/default/types/News_Item.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/News_Item.xml	(revision 199)
+++ 	(revision )
@@ -1,76 +1,0 @@
-<?xml version="1.0"?>
-<object name="News Item" meta_type="CPS Flexible Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">portal_type_NewsItem_title</property>
- <property name="description">portal_type_NewsItem_description</property>
- <property name="content_icon">newsitem_icon.png</property>
- <property name="content_meta_type">CPS Document</property>
- <property name="product">CPSDocument</property>
- <property name="factory">addCPSDocument</property>
- <property name="immediate_view">cpsdocument_view</property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">True</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">True</property>
- <property name="cps_proxy_type">document</property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="schemas">
-  <element value="metadata"/>
-  <element value="common"/>
-  <element value="newsitem"/>
-  <element value="flexible_content"/>
- </property>
- <property name="layouts">
-  <element value="common"/>
-  <element value="newsitem_start"/>
-  <element value="newsitem_flexible"/>
-  <element value="newsitem_end"/>
- </property>
- <property name="layout_clusters">
-  <element value="metadata:metadata"/>
- </property>
- <property name="flexible_layouts">
-  <element value="newsitem_flexible:flexible_content"/>
- </property>
- <property name="storage_methods"/>
- <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="cpsdocument_view"/>
- <alias from="view" to="cpsdocument_view"/>
- <action title="action_view" action_id="view" category="object"
-    condition_expr="" url_expr="string:${object_url}/cpsdocument_view"
-    visible="True">
-  <permission value="View"/>
- </action>
- <action title="action_new_content" action_id="new_content" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_factories" visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_folder_contents" action_id="contents" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_contents" visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_edit" action_id="edit" category="object"
-    condition_expr="" url_expr="string:${object_url}/cpsdocument_edit_form"
-    visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_metadata" action_id="metadata" category="object"
-    condition_expr="not:portal/portal_membership/isAnonymousUser"
-    url_expr="string:${object_url}/cpsdocument_metadata" visible="True">
-  <permission value="View"/>
- </action>
- <action title="action_local_roles" action_id="localroles" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_localrole_form" visible="True">
-  <permission value="Change permissions"/>
- </action>
- <action title="action_status_history" action_id="status_history"
-    category="workflow"
-    condition_expr="not:portal/portal_membership/isAnonymousUser"
-    url_expr="string:${object_url}/content_status_history" visible="True">
-  <permission value="View"/>
- </action>
-</object>
Index: waeup_product/trunk/profiles/default/types/Page.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/Page.xml	(revision 199)
+++ 	(revision )
@@ -1,74 +1,0 @@
-<?xml version="1.0"?>
-<object name="Page" meta_type="CPS Flexible Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">portal_type_Page_title</property>
- <property name="description">portal_type_Page_description</property>
- <property name="content_icon">page_icon.png</property>
- <property name="content_meta_type">CPS Document</property>
- <property name="product">CPSDocument</property>
- <property name="factory">addCPSDocument</property>
- <property name="immediate_view">cpsdocument_edit_form</property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">True</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">True</property>
- <property name="cps_proxy_type">document</property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="schemas">
-  <element value="metadata"/>
-  <element value="common"/>
-  <element value="flexible_content"/>
- </property>
- <property name="layouts">
-  <element value="page"/>
-  <element value="common"/>
-  <element value="flexible_content"/>
- </property>
- <property name="layout_clusters">
-  <element value="metadata:metadata"/>
- </property>
- <property name="flexible_layouts">
-  <element value="flexible_content:flexible_content"/>
- </property>
- <property name="storage_methods"/>
- <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="page_view"/>
- <alias from="view" to="page_view"/>
- <action title="action_view" action_id="view" category="object"
-    condition_expr="" url_expr="string:${object_url}/page_view"
-    visible="True">
-  <permission value="View"/>
- </action>
- <action title="action_new_content" action_id="new_content" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_factories" visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_folder_contents" action_id="contents" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_contents" visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_edit" action_id="edit" category="object"
-    condition_expr="" url_expr="string:${object_url}/cpsdocument_edit_form"
-    visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_metadata" action_id="metadata" category="object"
-    condition_expr="not:portal/portal_membership/isAnonymousUser"
-    url_expr="string:${object_url}/cpsdocument_metadata" visible="True">
-  <permission value="View"/>
- </action>
- <action title="action_local_roles" action_id="localroles" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_localrole_form" visible="True">
-  <permission value="Change permissions"/>
- </action>
- <action title="action_status_history" action_id="status_history"
-    category="workflow"
-    condition_expr="not:portal/portal_membership/isAnonymousUser"
-    url_expr="string:${object_url}/content_status_history" visible="True">
-  <permission value="View"/>
- </action>
-</object>
Index: waeup_product/trunk/profiles/default/types/Palette_Border.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/Palette_Border.xml	(revision 199)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version="1.0"?>
-<object name="Palette Border" meta_type="Factory-based Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title"></property>
- <property name="description">_paletteborder_description_</property>
- <property name="content_icon">palette_border.png</property>
- <property name="content_meta_type">Palette Border</property>
- <property name="product">CPSSkins</property>
- <property name="factory">addPaletteBorder</property>
- <property name="immediate_view">cpsskins_edit_form</property>
- <property name="global_allow">False</property>
- <property name="filter_content_types">False</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">False</property>
- <property name="cps_proxy_type"></property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="cps_is_portalbox">False</property>
- <alias from="(Default)" to="cpsskins_palette_view"/>
- <alias from="delete" to="cpsskins_object_delete"/>
- <alias from="edit" to="cpsskins_edit_form"/>
- <alias from="edit_form" to="cpsskins_edit_form"/>
- <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_palette_view" visible="True"/>
- <action title="Edit" action_id="edit" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_edit_form" visible="True">
-  <permission value="Manage Themes"/>
- </action>
- <action title="Delete" action_id="delete" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_object_delete" visible="False">
-  <permission value="Manage Themes"/>
- </action>
- <action title="isportalpalette" action_id="isportalpalette" category="object"
-    condition_expr="" url_expr="string:${object_url}/isPortalPalette"
-    visible="False"/>
-</object>
Index: waeup_product/trunk/profiles/default/types/Portal_Box_Color.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/Portal_Box_Color.xml	(revision 199)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version="1.0"?>
-<object name="Portal Box Color" meta_type="Factory-based Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title"></property>
- <property name="description">_boxcolor_description_</property>
- <property name="content_icon">box_color.png</property>
- <property name="content_meta_type">Portal Box Color</property>
- <property name="product">CPSSkins</property>
- <property name="factory">addPortalBoxColor</property>
- <property name="immediate_view">cpsskins_edit_form</property>
- <property name="global_allow">False</property>
- <property name="filter_content_types">False</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">False</property>
- <property name="cps_proxy_type"></property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="cps_is_portalbox">False</property>
- <alias from="(Default)" to="cpsskins_style_view"/>
- <alias from="delete" to="cpsskins_object_delete"/>
- <alias from="edit" to="cpsskins_edit_form"/>
- <alias from="edit_form" to="cpsskins_edit_form"/>
- <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_style_view" visible="True"/>
- <action title="Edit" action_id="edit" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_edit_form" visible="True">
-  <permission value="Manage Themes"/>
- </action>
- <action title="Delete" action_id="delete" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_object_delete" visible="False">
-  <permission value="Manage Themes"/>
- </action>
- <action title="isportalstyle" action_id="isportalstyle" category="object"
-    condition_expr="" url_expr="string:${object_url}/isPortalStyle"
-    visible="False"/>
-</object>
Index: waeup_product/trunk/profiles/default/types/Portal_Box_Templet.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/Portal_Box_Templet.xml	(revision 199)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<?xml version="1.0"?>
-<object name="Portal Box Templet" meta_type="Factory-based Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title"></property>
- <property name="description">_portalbox_templet_description_</property>
- <property name="content_icon">portalbox_templet.png</property>
- <property name="content_meta_type">Portal Box Templet</property>
- <property name="product">CPSSkins</property>
- <property name="factory">addPortalBox</property>
- <property name="immediate_view">cpsskins_edit_form</property>
- <property name="global_allow">False</property>
- <property name="filter_content_types">False</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">False</property>
- <property name="cps_proxy_type"></property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="cps_is_portalbox">False</property>
- <alias from="(Default)" to="index_html"/>
- <alias from="edit" to="cpsskins_edit_form"/>
- <alias from="edit_form" to="cpsskins_edit_form"/>
- <alias from="view" to="cpsskins_templet_view"/>
- <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_templet_view" visible="True"/>
- <action title="Edit" action_id="edit" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_edit_form" visible="True">
-  <permission value="Manage Themes"/>
- </action>
- <action title="isportaltemplet" action_id="isportaltemplet" category="object"
-    condition_expr="" url_expr="string:${object_url}/isPortalTemplet"
-    visible="False"/>
-</object>
Index: waeup_product/trunk/profiles/default/types/Portal_Tab_Style.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/Portal_Tab_Style.xml	(revision 199)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version="1.0"?>
-<object name="Portal Tab Style" meta_type="Factory-based Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title"></property>
- <property name="description">_portaltabstyle_description_</property>
- <property name="content_icon">portaltab_style.png</property>
- <property name="content_meta_type">Portal Tab Style</property>
- <property name="product">CPSSkins</property>
- <property name="factory">addPortalTabStyle</property>
- <property name="immediate_view">cpsskins_edit_form</property>
- <property name="global_allow">False</property>
- <property name="filter_content_types">False</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">False</property>
- <property name="cps_proxy_type"></property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="cps_is_portalbox">False</property>
- <alias from="(Default)" to="cpsskins_style_view"/>
- <alias from="delete" to="cpsskins_object_delete"/>
- <alias from="edit" to="cpsskins_edit_form"/>
- <alias from="edit_form" to="cpsskins_edit_form"/>
- <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_style_view" visible="True"/>
- <action title="Edit" action_id="edit" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_edit_form" visible="True">
-  <permission value="Manage Themes"/>
- </action>
- <action title="Delete" action_id="delete" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_object_delete" visible="False">
-  <permission value="Manage Themes"/>
- </action>
- <action title="isportalstyle" action_id="isportalstyle" category="object"
-    condition_expr="" url_expr="string:${object_url}/isPortalStyle"
-    visible="False"/>
-</object>
Index: waeup_product/trunk/profiles/default/types/Portlet_Box_Templet.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/Portlet_Box_Templet.xml	(revision 199)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<?xml version="1.0"?>
-<object name="Portlet Box Templet" meta_type="Factory-based Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title"></property>
- <property name="description">_portletbox_templet_description_</property>
- <property name="content_icon">portletbox_templet.png</property>
- <property name="content_meta_type">Portlet Box Templet</property>
- <property name="product">CPSSkins</property>
- <property name="factory">addPortletBox</property>
- <property name="immediate_view">cpsskins_edit_form</property>
- <property name="global_allow">False</property>
- <property name="filter_content_types">False</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">False</property>
- <property name="cps_proxy_type"></property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="cps_is_portalbox">False</property>
- <alias from="(Default)" to="index_html"/>
- <alias from="edit" to="cpsskins_edit_form"/>
- <alias from="edit_form" to="cpsskins_edit_form"/>
- <alias from="view" to="cpsskins_templet_view"/>
- <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_templet_view" visible="True"/>
- <action title="Edit" action_id="edit" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_edit_form" visible="True">
-  <permission value="Manage Themes"/>
- </action>
- <action title="isportaltemplet" action_id="isportaltemplet" category="object"
-    condition_expr="" url_expr="string:${object_url}/isPortalTemplet"
-    visible="False"/>
-</object>
Index: waeup_product/trunk/profiles/default/types/Search_Box_Templet.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/Search_Box_Templet.xml	(revision 199)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<?xml version="1.0"?>
-<object name="Search Box Templet" meta_type="Factory-based Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title"></property>
- <property name="description">_searchbox_templet_description_</property>
- <property name="content_icon">searchbox_templet.png</property>
- <property name="content_meta_type">Search Box Templet</property>
- <property name="product">CPSSkins</property>
- <property name="factory">addSearchBox</property>
- <property name="immediate_view">cpsskins_edit_form</property>
- <property name="global_allow">False</property>
- <property name="filter_content_types">False</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">False</property>
- <property name="cps_proxy_type"></property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="cps_is_portalbox">False</property>
- <alias from="(Default)" to="index_html"/>
- <alias from="edit" to="cpsskins_edit_form"/>
- <alias from="edit_form" to="cpsskins_edit_form"/>
- <alias from="view" to="cpsskins_templet_view"/>
- <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_templet_view" visible="True"/>
- <action title="Edit" action_id="edit" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_edit_form" visible="True">
-  <permission value="Manage Themes"/>
- </action>
- <action title="isportaltemplet" action_id="isportaltemplet" category="object"
-    condition_expr="" url_expr="string:${object_url}/isPortalTemplet"
-    visible="False"/>
-</object>
Index: waeup_product/trunk/profiles/default/types/Student.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/Student.xml	(revision 199)
+++ waeup_product/trunk/profiles/default/types/Student.xml	(revision 200)
@@ -36,4 +36,5 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
+ <alias from="(Default)" to="temporary_view_all"/>
  <alias from="view" to="temporary_view_all"/>
  <action title="Standard View" action_id="view" category="object"
@@ -44,10 +45,10 @@
  <action title="action_metadata" action_id="metadata" category="object"
     condition_expr="python:member and 'Manager' in member.getRoles()"
-    url_expr="string:${object_url}/cpsdocument_metadata" visible="True">
+    url_expr="string:${object_url}/cpsdocument_metadata" visible="False">
   <permission value="University Manage"/>
  </action>
  <action title="delegate" action_id="localroles" category="object"
     condition_expr="" url_expr="string:${object_url}/folder_localrole_form"
-    visible="True">
+    visible="False">
   <permission value="Modify portal content"/>
  </action>
Index: waeup_product/trunk/profiles/default/types/StudentsFolder.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/StudentsFolder.xml	(revision 199)
+++ waeup_product/trunk/profiles/default/types/StudentsFolder.xml	(revision 200)
@@ -11,8 +11,10 @@
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
- <property name="allowed_content_types">Student</property>
+ <property name="allowed_content_types">
+  <element value="Student"/>
+ </property>
  <property name="allow_discussion">False</property>
  <property name="cps_is_searchable">True</property>
- <property name="cps_proxy_type">folder</property>
+ <property name="cps_proxy_type">btreefolder</property>
  <property name="cps_display_as_document_in_listing">True</property>
  <property name="schemas">
@@ -22,5 +24,5 @@
  </property>
  <property name="layouts">
-  <element value="waeup_common"/>
+  <element value="common"/>
  </property>
  <property name="layout_clusters">
@@ -30,4 +32,5 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
+ <alias from="(Default)" to="temporary_view_all"/>
  <alias from="view" to="temporary_view_all"/>
  <action title="Standard View" action_id="view" category="object"
Index: waeup_product/trunk/profiles/default/types/Text_Box.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/Text_Box.xml	(revision 199)
+++ 	(revision )
@@ -1,29 +1,0 @@
-<?xml version="1.0"?>
-<object name="Text Box" meta_type="Factory-based Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">portal_type_TextBox_title</property>
- <property name="description">portal_type_TextBox_description</property>
- <property name="content_icon">box.png</property>
- <property name="content_meta_type">Text Box</property>
- <property name="product">CPSBoxes</property>
- <property name="factory">addTextBox</property>
- <property name="immediate_view">textbox_edit_form</property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">False</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">False</property>
- <property name="cps_proxy_type"></property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="cps_is_portalbox">True</property>
- <alias from="(Default)" to="basebox_view"/>
- <alias from="view" to="basebox_view"/>
- <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/basebox_view" visible="True">
-  <permission value="View"/>
- </action>
- <action title="Edit" action_id="edit" category="object" condition_expr=""
-    url_expr="string:${object_url}/textbox_edit_form" visible="True">
-  <permission value="Modify portal content"/>
- </action>
-</object>
Index: waeup_product/trunk/profiles/default/types/Text_Box_Templet.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/Text_Box_Templet.xml	(revision 199)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<?xml version="1.0"?>
-<object name="Text Box Templet" meta_type="Factory-based Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title"></property>
- <property name="description">_textbox_templet_description_</property>
- <property name="content_icon">textbox_templet.png</property>
- <property name="content_meta_type">Text Box Templet</property>
- <property name="product">CPSSkins</property>
- <property name="factory">addTextBox</property>
- <property name="immediate_view">cpsskins_edit_form</property>
- <property name="global_allow">False</property>
- <property name="filter_content_types">False</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">False</property>
- <property name="cps_proxy_type"></property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="cps_is_portalbox">False</property>
- <alias from="(Default)" to="index_html"/>
- <alias from="edit" to="cpsskins_edit_form"/>
- <alias from="edit_form" to="cpsskins_edit_form"/>
- <alias from="view" to="cpsskins_templet_view"/>
- <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_templet_view" visible="True"/>
- <action title="Edit" action_id="edit" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_edit_form" visible="True">
-  <permission value="Manage Themes"/>
- </action>
- <action title="isportaltemplet" action_id="isportaltemplet" category="object"
-    condition_expr="" url_expr="string:${object_url}/isPortalTemplet"
-    visible="False"/>
-</object>
Index: waeup_product/trunk/profiles/default/types/Theme_Chooser_Templet.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/Theme_Chooser_Templet.xml	(revision 199)
+++ 	(revision )
@@ -1,33 +1,0 @@
-<?xml version="1.0"?>
-<object name="Theme Chooser Templet"
-   meta_type="Factory-based Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title"></property>
- <property name="description">_themechooser_templet_description_</property>
- <property name="content_icon">themechooser_templet.png</property>
- <property name="content_meta_type">Theme Chooser Templet</property>
- <property name="product">CPSSkins</property>
- <property name="factory">addThemeChooser</property>
- <property name="immediate_view">cpsskins_edit_form</property>
- <property name="global_allow">False</property>
- <property name="filter_content_types">False</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">False</property>
- <property name="cps_proxy_type"></property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="cps_is_portalbox">False</property>
- <alias from="(Default)" to="index_html"/>
- <alias from="edit" to="cpsskins_edit_form"/>
- <alias from="edit_form" to="cpsskins_edit_form"/>
- <alias from="view" to="cpsskins_templet_view"/>
- <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_templet_view" visible="True"/>
- <action title="Edit" action_id="edit" category="object" condition_expr=""
-    url_expr="string:${object_url}/cpsskins_edit_form" visible="True">
-  <permission value="Manage Themes"/>
- </action>
- <action title="isportaltemplet" action_id="isportaltemplet" category="object"
-    condition_expr="" url_expr="string:${object_url}/isPortalTemplet"
-    visible="False"/>
-</object>
Index: waeup_product/trunk/profiles/default/types/University.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/University.xml	(revision 199)
+++ waeup_product/trunk/profiles/default/types/University.xml	(revision 200)
@@ -8,17 +8,14 @@
  <property name="product">WAeUP</property>
  <property name="factory">addUniversity</property>
- <property name="immediate_view">university_view</property>
+ <property name="immediate_view">university_view_all</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
  <property name="allowed_content_types">
+  <element value="AcademicsFolder"/>
+  <element value="AccoFolder"/>
   <element value="Chat"/>
   <element value="FAQ"/>
-  <element value="CPSCalendar"/>
-  <element value="Forum"/>
+  <element value="Section"/>
   <element value="StudentsFolder"/>
-  <element value="Faculty"/>
-  <element value="AccoFolder"/>
-  <element value="Section"/>
-  <element value="CPSProxyDocument"/>
  </property>
  <property name="allow_discussion">False</property>
@@ -32,5 +29,5 @@
  </property>
  <property name="layouts">
-  <element value="waeup_common"/>
+  <element value="common"/>
  </property>
  <property name="layout_clusters">
@@ -54,15 +51,15 @@
  <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">
+    url_expr="string:${object_url}/folder_contents" visible="False">
   <permission value="Modify portal content"/>
  </action>
  <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">
+    url_expr="string:${object_url}/cpsdocument_edit_form" visible="False">
   <permission value="Modify portal content"/>
  </action>
  <action title="action_metadata" action_id="metadata" category="object"
     condition_expr="python:member and 'Manager' in member.getRoles()"
-    url_expr="string:${object_url}/cpsdocument_metadata" visible="True">
+    url_expr="string:${object_url}/cpsdocument_metadata" visible="False">
   <permission value="Modify portal content"/>
  </action>
Index: waeup_product/trunk/profiles/default/types/ZippedHtml.xml
===================================================================
--- waeup_product/trunk/profiles/default/types/ZippedHtml.xml	(revision 199)
+++ 	(revision )
@@ -1,71 +1,0 @@
-<?xml version="1.0"?>
-<object name="ZippedHtml" meta_type="CPS Flexible Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">portal_type_ZippedHtml_title</property>
- <property name="description">portal_type_ZippedHtml_description</property>
- <property name="content_icon">zippedhtml_icon.png</property>
- <property name="content_meta_type">CPS Document</property>
- <property name="product">CPSDocument</property>
- <property name="factory">addCPSDocument</property>
- <property name="immediate_view">cpsdocument_view</property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">True</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">True</property>
- <property name="cps_proxy_type">document</property>
- <property name="cps_display_as_document_in_listing">False</property>
- <property name="schemas">
-  <element value="metadata"/>
-  <element value="common"/>
-  <element value="zippedhtml"/>
- </property>
- <property name="layouts">
-  <element value="common"/>
-  <element value="zippedhtml"/>
- </property>
- <property name="layout_clusters">
-  <element value="metadata:metadata"/>
- </property>
- <property name="flexible_layouts"/>
- <property name="storage_methods"/>
- <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="cpsdocument_view"/>
- <alias from="view" to="cpsdocument_view"/>
- <action title="action_view" action_id="view" category="object"
-    condition_expr="" url_expr="string:${object_url}/cpsdocument_view"
-    visible="True">
-  <permission value="View"/>
- </action>
- <action title="action_new_content" action_id="new_content" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_factories" visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_folder_contents" action_id="contents" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_contents" visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_edit" action_id="edit" category="object"
-    condition_expr="" url_expr="string:${object_url}/cpsdocument_edit_form"
-    visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_metadata" action_id="metadata" category="object"
-    condition_expr="not:portal/portal_membership/isAnonymousUser"
-    url_expr="string:${object_url}/cpsdocument_metadata" visible="True">
-  <permission value="View"/>
- </action>
- <action title="action_local_roles" action_id="localroles" category="object"
-    condition_expr="python:object.getTypeInfo().cps_proxy_type != 'document'"
-    url_expr="string:${object_url}/folder_localrole_form" visible="True">
-  <permission value="Change permissions"/>
- </action>
- <action title="action_status_history" action_id="status_history"
-    category="workflow"
-    condition_expr="not:portal/portal_membership/isAnonymousUser"
-    url_expr="string:${object_url}/content_status_history" visible="True">
-  <permission value="View"/>
- </action>
-</object>
Index: waeup_product/trunk/profiles/default/workflows.xml
===================================================================
--- waeup_product/trunk/profiles/default/workflows.xml	(revision 199)
+++ waeup_product/trunk/profiles/default/workflows.xml	(revision 200)
@@ -2,6 +2,41 @@
 <object name="portal_workflow" meta_type="CPS Workflow Tool">
  <property name="title"></property>
- <object name="waeup_section_wf" meta_type="CPS Workflow"/>
+ <object name="waeup_faculty_wf" meta_type="CPS Workflow"/>
+ <object name="waeup_department_wf" meta_type="CPS Workflow"/>
+ <object name="waeup_course_wf" meta_type="CPS Workflow"/>
+ <object name="waeup_accommodation_wf" meta_type="CPS Workflow"/>
  <object name="waeup_student_wf" meta_type="CPS Workflow"/>
- <object name="waeup_workspace_wf" meta_type="CPS Workflow"/>
+ <bindings>
+  <default/>
+  <type type_id="University">
+   <bound-workflow workflow_id="section_folder_wf"/>
+  </type>
+  <type type_id="AccoFolder">
+   <bound-workflow workflow_id="section_folder_wf"/>
+  </type>
+  <type type_id="Accommodation">
+   <bound-workflow workflow_id="waeup_accommodation_wf"/>
+  </type>
+  <type type_id="AcademicsFolder">
+   <bound-workflow workflow_id="section_folder_wf"/>
+  </type>
+  <type type_id="Faculty">
+   <bound-workflow workflow_id="waeup_faculty_wf"/>
+  </type>
+  <type type_id="Department">
+   <bound-workflow workflow_id="waeup_department_wf"/>
+  </type>
+  <type type_id="Course">
+   <bound-workflow workflow_id="waeup_course_wf"/>
+  </type>
+  <type type_id="StudentsFolder">
+   <bound-workflow workflow_id="section_folder_wf"/>
+  </type>
+  <type type_id="Student"> 
+   <bound-workflow workflow_id="waeup_student_wf"/>
+  </type>
+  <type type_id="Jamb">
+   <bound-workflow workflow_id="waeup_base_wf"/>
+  </type>
+ </bindings>
 </object>
Index: waeup_product/trunk/profiles/default/workflows/waeup_section_wf/definition.xml
===================================================================
--- waeup_product/trunk/profiles/default/workflows/waeup_section_wf/definition.xml	(revision 199)
+++ waeup_product/trunk/profiles/default/workflows/waeup_section_wf/definition.xml	(revision 200)
@@ -12,6 +12,5 @@
   <permission-map name="Modify portal content"
                   acquired="True">
-   <permission-role>StudentManager</permission-role>
-   <permission-role>UniversityManager</permission-role>
+   <permission-role>Manager</permission-role>
   </permission-map>
   <permission-map name="View" acquired="True">
@@ -26,6 +25,5 @@
   <guard>
    <guard-role>Manager</guard-role>
-   <guard-role>StudentManager</guard-role>
-   <guard-role>UniversityManager</guard-role>
+   <guard-role>SectionManager</guard-role>
   </guard>
   <transition-behavior behavior_id="initial-create"/>
@@ -38,6 +36,5 @@
   <guard>
    <guard-role>Manager</guard-role>
-   <guard-role>StudentManager</guard-role>
-   <guard-role>UniversityManager</guard-role>
+   <guard-role>SectionManager</guard-role>
   </guard>
   <transition-behavior behavior_id="allow-sub-create"/>
@@ -50,6 +47,5 @@
   <guard>
    <guard-role>Manager</guard-role>
-   <guard-role>StudentManager</guard-role>
-   <guard-role>UniversityManager</guard-role>
+   <guard-role>SectionManager</guard-role>
   </guard>
   <transition-behavior behavior_id="allow-sub-delete"/>
Index: waeup_product/trunk/profiles/default/workflows/waeup_student_wf/definition.xml
===================================================================
--- waeup_product/trunk/profiles/default/workflows/waeup_student_wf/definition.xml	(revision 199)
+++ waeup_product/trunk/profiles/default/workflows/waeup_student_wf/definition.xml	(revision 200)
@@ -3,19 +3,14 @@
               title="CPS Workflow Definition"
               state_variable="review_state"
-              initial_state="work" meta_type="CPS Workflow">
- <permission>Modify portal content</permission>
+              meta_type="CPS Workflow">
  <permission>View</permission>
  <state state_id="work" title="Work">
   <exit-transition transition_id="create_content"/>
   <exit-transition transition_id="cut_copy_paste"/>
-  <exit-transition transition_id="close"/>
-  <permission-map name="Modify portal content"
-                  acquired="True">
-   <permission-role>StudentManager</permission-role>
-   <permission-role>UniversityManager</permission-role>
-   <permission-role>Student</permission-role>
-  </permission-map>
-  <permission-map name="View" acquired="True">
-   <permission-role>Student</permission-role>
+  <permission-map name="View" acquired="False">
+   <permission-role>Manager</permission-role>
+   <permission-role>SectionManager</permission-role>
+   <permission-role>SectionReviewer</permission-role>
+   <permission-role>SectionReader</permission-role>
   </permission-map>
  </state>
@@ -23,11 +18,8 @@
              new_state="work" trigger="USER"
              before_script="" after_script="">
-  <description>Intial transition like</description>
   
   <guard>
    <guard-role>Manager</guard-role>
-   <guard-role>StudentManager</guard-role>
-   <guard-role>UniversityManager</guard-role>
-   <guard-role>Student</guard-role>
+   <guard-role>SectionManager</guard-role>
   </guard>
   <transition-behavior behavior_id="initial-create"/>
@@ -36,92 +28,27 @@
              title="Create content" new_state="work"
              trigger="USER" before_script="" after_script="">
-  <description>Allow sub Object Create</description>
-  <action url="" category="">New</action>
+  
   <guard>
    <guard-role>Manager</guard-role>
-   <guard-role>StudentManager</guard-role>
-   <guard-role>UniversityManager</guard-role>
-   <guard-role>Student</guard-role>
+   <guard-role>SectionManager</guard-role>
+   <guard-role>SectionReviewer</guard-role>
+   <guard-role>SectionReader</guard-role>
   </guard>
   <transition-behavior behavior_id="allow-sub-create"/>
-  <transition-behavior behavior_id="allow-sub-checkout"/>
+  <transition-behavior behavior_id="allow-sub-publishing"/>
  </transition>
  <transition transition_id="cut_copy_paste"
-             title="Cut/Copy/Paste" new_state="work"
+             title="Cut/Copy/Paste" new_state=""
              trigger="USER" before_script="" after_script="">
-  <action url="" category="">New</action>
+  
   <guard>
    <guard-role>Manager</guard-role>
-   <guard-role>StudentManager</guard-role>
-   <guard-role>UniversityManager</guard-role>
+   <guard-role>SectionManager</guard-role>
+   <guard-role>SectionReviewer</guard-role>
+   <guard-role>SectionReader</guard-role>
   </guard>
+  <transition-behavior behavior_id="allow-sub-move"/>
   <transition-behavior behavior_id="allow-sub-delete"/>
-  <transition-behavior behavior_id="allow-sub-move"/>
   <transition-behavior behavior_id="allow-sub-copy"/>
  </transition>
- <variable variable_id="action" for_catalog="False"
-           for_status="True" update_always="True">
-  <description>The last transition</description>
-  <default>
-   
-   <expression>transition/getId|nothing</expression>
-  </default>
-  <guard>
-  </guard>
- </variable>
- <variable variable_id="actor" for_catalog="False"
-           for_status="True" update_always="True">
-  <description>The ID of the user who performed the last transition</description>
-  <default>
-   
-   <expression>user/getId</expression>
-  </default>
-  <guard>
-  </guard>
- </variable>
- <variable variable_id="comments" for_catalog="False"
-           for_status="True" update_always="True">
-  <description>Comments about the last transition</description>
-  <default>
-   
-   <expression>python:state_change.kwargs.get('comment', '')</expression>
-  </default>
-  <guard>
-  </guard>
- </variable>
- <variable variable_id="dest_container" for_catalog="False"
-           for_status="True" update_always="True">
-  <description>Destination container for the last paste/publish</description>
-  <default>
-   
-   <expression>python:state_change.kwargs.get('dest_container', '')</expression>
-  </default>
-  <guard>
-  </guard>
- </variable>
- <variable variable_id="review_history" for_catalog="False"
-           for_status="False" update_always="False">
-  <description>Provides access to workflow history</description>
-  <default>
-   
-   <expression>state_change/getHistory</expression>
-  </default>
-  <guard>
-   <guard-role>Manager</guard-role>
-   <guard-role>WorkspaceManager</guard-role>
-   <guard-role>WorkspaceMember</guard-role>
-   <guard-role>WorkspaceReader</guard-role>
-   <guard-role>Member</guard-role>
-  </guard>
- </variable>
- <variable variable_id="time" for_catalog="False"
-           for_status="True" update_always="True">
-  <description>Time of the last transition</description>
-  <default>
-   
-   <expression>state_change/getDateTime</expression>
-  </default>
-  <guard>
-  </guard>
- </variable>
 </cps-workflow>
