Index: WAeUP_SRP/trunk/profiles/default/accommodation.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/accommodation.xml	(revision 404)
+++ WAeUP_SRP/trunk/profiles/default/accommodation.xml	(revision 404)
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<object name="portal_catalog" meta_type="CMF Catalog">
+ <column value="bed"/>
+ <column value="student"/>
+ <index name="bed" meta_type="FieldIndex">
+  <indexed_attr value="bed"/>
+ </index>
+ <index name="bed_type" meta_type="FieldIndex">
+  <indexed_attr value="bed_type"/>
+ </index>
+ <index name="student" meta_type="FieldIndex">
+  <indexed_attr value="student"/>
+ </index>
+</object>
Index: WAeUP_SRP/trunk/profiles/default/accomodation.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/accomodation.xml	(revision 402)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<?xml version="1.0"?>
-<object name="portal_catalog" meta_type="CMF Catalog">
- <column value="bed"/>
- <column value="student"/>
- <index name="bed" meta_type="FieldIndex">
-  <indexed_attr value="bed"/>
- </index>
- <index name="student" meta_type="FieldIndex">
-  <indexed_attr value="student"/>
- </index>
-</object>
Index: WAeUP_SRP/trunk/profiles/default/layouts/accommodation.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/accommodation.xml	(revision 402)
+++ WAeUP_SRP/trunk/profiles/default/layouts/accommodation.xml	(revision 404)
@@ -7,21 +7,4 @@
  <property name="flexible_widgets"/>
  <property name="validate_values_expr"></property>
- <widget name="beds_assigned" meta_type="Int Widget">
-  <property name="fields">
-   <element value="beds_assigned"/>
-  </property>
-  <property name="is_required">True</property>
-  <property name="label">Nr. of Assigned Beds</property>
-  <property name="label_edit">Nr. of Assigned Beds</property>
-  <property name="help">Number of beds already assigned to students</property>
- </widget>
- <widget name="beds_assigned_list" meta_type="Ordered List Widget">
-  <property name="fields">
-   <element value="beds_assigned_list"/>
-  </property>
-  <property name="label">Assigned Beds</property>
-  <property name="label_edit">Assigned Beds</property>
-  <property name="help">List of beds already assigned to students</property>
- </widget>
  <widget name="beds_for_final" meta_type="MultiSelect Widget">
   <property name="fields">
@@ -101,4 +84,17 @@
   <property name="vocabulary">range5</property>
  </widget>
+ <widget name="reserved_rooms" meta_type="String Widget">
+  <property name="title">Reserved Rooms</property>
+  <property name="fields">
+   <element value="reserved_rooms"/>
+  </property>
+  <property name="label">Reserved Rooms</property>
+  <property name="label_edit">Reserved Rooms</property>
+  <property
+     name="help">Enter the reserved room_nrs separeted by space.</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
  <widget name="rooms_per_floor" meta_type="Select Widget">
   <property name="fields">
@@ -162,4 +158,7 @@
    <cell name="beds_for_final"/>
   </row>
+  <row>
+   <cell name="reserved_rooms"/>
+  </row>
  </table>
 </object>
Index: WAeUP_SRP/trunk/profiles/default/schemas/accommodation.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/schemas/accommodation.xml	(revision 402)
+++ WAeUP_SRP/trunk/profiles/default/schemas/accommodation.xml	(revision 404)
@@ -1,6 +1,4 @@
 <?xml version="1.0"?>
 <object name="accommodation" meta_type="CPS Schema">
- <field name="beds_assigned" meta_type="CPS Int Field"/>
- <field name="beds_assigned_list" meta_type="CPS String List Field"/>
  <field name="beds_for_final" meta_type="CPS String List Field"/>
  <field name="beds_for_fresh" meta_type="CPS String List Field"/>
@@ -12,4 +10,5 @@
  <field name="nr_of_blocks" meta_type="CPS Int Field"/>
  <field name="nr_of_floors" meta_type="CPS Int Field"/>
+ <field name="reserved_rooms" meta_type="CPS String List Field"/>
  <field name="rooms_per_floor" meta_type="CPS Int Field"/>
  <field name="study_courses" meta_type="CPS String List Field"/>
Index: WAeUP_SRP/trunk/profiles/default/toolset.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/toolset.xml	(revision 402)
+++ WAeUP_SRP/trunk/profiles/default/toolset.xml	(revision 404)
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <tool-setup>
- <required tool_id="portal_accomodation"
-           class="Products.WAeUP_SRP.WAeUPTables.AccomodationTable"/>
+ <required tool_id="portal_accommodation"
+           class="Products.WAeUP_SRP.WAeUPTables.AccommodationTable"/>
 </tool-setup>
Index: WAeUP_SRP/trunk/profiles/default/types/AccoFolder.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/types/AccoFolder.xml	(revision 402)
+++ WAeUP_SRP/trunk/profiles/default/types/AccoFolder.xml	(revision 404)
@@ -8,5 +8,5 @@
  <property name="product">WAeUP_SRP</property>
  <property name="factory">addAccoFolder</property>
- <property name="immediate_view">folder_view</property>
+ <property name="immediate_view">academics_contents</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
@@ -22,7 +22,5 @@
   <element value="common"/>
  </property>
- <property name="layouts">
-  <element value="common"/>
- </property>
+ <property name="layouts"/>
  <property name="layout_clusters">
   <element value="metadata:metadata"/>
@@ -33,29 +31,28 @@
  <alias from="(Default)" to="temporary_view_all"/>
  <alias from="view" to="temporary_view_all"/>
- <action title="Standard View" action_id="view" category="object"
-    condition_expr="" url_expr="string:${object_url}/temporary_view_all"
-    visible="True">
+ <action title="View" action_id="view" category="object" condition_expr=""
+    url_expr="string:${object_url}/academics_contents" visible="True">
   <permission value="View"/>
  </action>
- <action title="Add Accommodation Hall" action_id="add_accommodation"
+ <action title="Add Accommodation Hall" action_id="new_entry"
     category="object" condition_expr=""
-    url_expr="string:${object_url}/add_accommodation" visible="True">
-  <permission value="University Manage"/>
+    url_expr="string:${object_url}/content_create?type_name=Accommodation"
+    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()"
-    url_expr="string:${object_url}/cpsdocument_metadata" visible="True">
-  <permission value="University Manage"/>
+    condition_expr="" url_expr="string:${object_url}/cpsdocument_metadata"
+    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">
+    condition_expr="" url_expr="string:${object_url}/cpsdocument_edit_form"
+    visible="True">
   <permission value="Modify portal content"/>
-  <permission value="University Manage"/>
  </action>
  <action title="Delegate" action_id="localroles" category="object"
     condition_expr="" url_expr="string:${object_url}/folder_localrole_form"
     visible="False">
-  <permission value="University Manage"/>
+  <permission value="Modify portal content"/>
  </action>
 </object>
Index: WAeUP_SRP/trunk/profiles/default/types/Accommodation.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/types/Accommodation.xml	(revision 402)
+++ WAeUP_SRP/trunk/profiles/default/types/Accommodation.xml	(revision 404)
@@ -8,5 +8,5 @@
  <property name="product">WAeUP_SRP</property>
  <property name="factory">addAccommodation</property>
- <property name="immediate_view">cpsdocument_view</property>
+ <property name="immediate_view">academics_contents</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
@@ -30,20 +30,18 @@
  <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"
-    condition_expr="" url_expr="string:${object_url}/temporary_view_all"
-    visible="True">
+ <alias from="(Default)" to="academics_contents"/>
+ <alias from="view" to="academics_contents"/>
+ <action title="View" action_id="view" category="object" condition_expr=""
+    url_expr="string:${object_url}/academics_contents" visible="True">
   <permission value="View"/>
  </action>
  <action title="action_edit" action_id="edit" category="object"
-    condition_expr="" url_expr="string:${object_url}/waeup_edit_form"
+    condition_expr="" url_expr="string:${object_url}/cpsdocument_edit_form"
     visible="True">
-  <permission value="University Manage"/>
-  <permission value="Student Manage"/>
+  <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">
+    condition_expr="" url_expr="string:${object_url}/cpsdocument_metadata"
+    visible="True">
   <permission value="Modify portal content"/>
  </action>
@@ -51,5 +49,5 @@
     condition_expr="" url_expr="string:${object_url}/folder_localrole_form"
     visible="False">
-  <permission value="University Manage"/>
+  <permission value="Modify portal content"/>
  </action>
 </object>
