Index: /WAeUP_SRP/trunk/Accommodation.py
===================================================================
--- /WAeUP_SRP/trunk/Accommodation.py	(revision 621)
+++ /WAeUP_SRP/trunk/Accommodation.py	(revision 622)
@@ -78,9 +78,9 @@
 ###)
 
-class Accommodation(CPSDocument): ###(
+class AccoHall(CPSDocument): ###(
     """
-    WAeUP Accommodation containing Departments
+    WAeUP AccoHall containing Departments
     """
-    meta_type = 'Accommodation'
+    meta_type = 'AccoHall'
     portal_type = meta_type
     security = ClassSecurityInfo()
@@ -97,9 +97,9 @@
 ###)
 
-InitializeClass(Accommodation)
+InitializeClass(AccoHall)
 
-def addAccommodation(container, id, REQUEST=None, **kw):
-    """Add a Accommodation."""
-    ob = Accommodation(id, **kw)
+def addAccoHall(container, id, REQUEST=None, **kw):
+    """Add a AccoHall."""
+    ob = AccoHall(id, **kw)
     return CPSBase_adder(container, ob, REQUEST=REQUEST)
 ###)
Index: /WAeUP_SRP/trunk/__init__.py
===================================================================
--- /WAeUP_SRP/trunk/__init__.py	(revision 621)
+++ /WAeUP_SRP/trunk/__init__.py	(revision 622)
@@ -36,5 +36,5 @@
      ("Accommodation",
         ("AccoFolder",
-         "Accommodation",
+         "AccoHall",
          )
      ),
Index: eUP_SRP/trunk/profiles/default/accommodation.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/accommodation.xml	(revision 621)
+++ 	(revision )
@@ -1,14 +1,0 @@
-<?xml version="1.0"?>
-<object name="portal_accommodation" 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/layouts.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/layouts.xml	(revision 621)
+++ /WAeUP_SRP/trunk/profiles/default/layouts.xml	(revision 622)
@@ -2,5 +2,5 @@
 <object name="portal_layouts" meta_type="CPS Layouts Tool">
  <property name="title"></property>
- <object name="accommodation" meta_type="CPS Layout"/>
+ <object name="acco_hall" meta_type="CPS Layout"/>
  <object name="academics_search" meta_type="CPS Layout"/>
  <object name="certificate" meta_type="CPS Layout"/>
Index: /WAeUP_SRP/trunk/profiles/default/layouts/acco_hall.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/layouts/acco_hall.xml	(revision 622)
+++ /WAeUP_SRP/trunk/profiles/default/layouts/acco_hall.xml	(revision 622)
@@ -0,0 +1,173 @@
+<?xml version="1.0"?>
+<object name="accommodation" meta_type="CPS Layout">
+ <property name="layout_create_method"></property>
+ <property name="layout_edit_method"></property>
+ <property name="layout_view_method"></property>
+ <property name="style_prefix">layout_waeup_</property>
+ <property name="flexible_widgets"/>
+ <property name="validate_values_expr"></property>
+ <widget name="beds_for_final" meta_type="MultiSelect Widget">
+  <property name="fields">
+   <element value="beds_for_final"/>
+  </property>
+  <property name="is_required">True</property>
+  <property name="label">Bedspaces for final</property>
+  <property name="label_edit">Bedspaces for final</property>
+  <property name="help">Name the bedspaces for final year students</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">waeup_bed_letters</property>
+ </widget>
+ <widget name="beds_for_fresh" meta_type="MultiSelect Widget">
+  <property name="fields">
+   <element value="beds_for_fresh"/>
+  </property>
+  <property name="is_required">True</property>
+  <property name="label">Bedspaces for fresh</property>
+  <property name="label_edit">Bedspaces for fresh</property>
+  <property name="help">Name the bedspaces for first year students</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">waeup_bed_letters</property>
+ </widget>
+ <widget name="beds_for_returning" meta_type="MultiSelect Widget">
+  <property name="fields">
+   <element value="beds_for_returning"/>
+  </property>
+  <property name="is_required">True</property>
+  <property name="label">Bedspaces for returning</property>
+  <property name="label_edit">Bedspaces for returning</property>
+  <property
+     name="help">Name the bedspaces for returning year students</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">waeup_bed_letters</property>
+ </widget>
+ <widget name="beds_per_room" meta_type="Int Widget">
+  <property name="fields">
+   <element value="beds_per_room"/>
+  </property>
+    <property name="is_required">True</property>
+    <property name="label">Beds per Room</property>
+    <property name="label_edit">Beds per Room</property>
+    <property name="is_limited">True</property>
+    <property name="min_value">1</property>
+    <property name="max_value">10</property> 
+  </widget>
+<widget name="Title" meta_type="String Widget">
+ <property name="title">Title</property>
+ <property name="fields">
+  <element value="Title"/>
+ </property>
+  <property name="is_required">True</property>
+  <property name="label">Hall Name</property>
+  <property name="label_edit">Hall Name</property>
+  <property name="display_width">40</property>
+  <property name="size_max">40</property>
+ </widget>
+  <widget name="nr_of_blocks" meta_type="Int Widget">
+    <property name="fields">
+      <element value="nr_of_blocks"/>
+    </property>
+    <property name="is_required">True</property>
+    <property name="label">Nr of Blocks</property>
+    <property name="label_edit">Nr of Blocks</property>
+    <property name="is_limited">True</property>
+    <property name="min_value">1</property>
+    <property name="max_value">10</property> 
+  </widget>
+ <widget name="nr_of_floors" meta_type="Int Widget">
+  <property name="fields">
+   <element value="nr_of_floors"/>
+  </property>
+  <property name="is_required">True</property>
+  <property name="label">Nr of Floors </property>
+  <property name="label_edit">Nr of Floors</property>
+    <property name="is_limited">True</property>
+    <property name="min_value">1</property>
+    <property name="max_value">5</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="Int Widget">
+  <property name="fields">
+   <element value="rooms_per_floor"/>
+  </property>
+  <property name="is_required">True</property>
+  <property name="label">Rooms per Floor</property>
+  <property name="label_edit">Rooms per Floor</property>
+    <property name="is_limited">True</property>
+    <property name="min_value">1</property>
+    <property name="max_value">50</property>
+ </widget>
+ <widget name="text" meta_type="Text Widget">
+  <property name="fields">
+   <element value="text"/>
+  </property>
+  <property name="label">Text</property>
+  <property name="label_edit">Text</property>
+  <property name="help">Short Description</property>
+  <property name="is_i18n">True</property>
+  <property name="hidden_layout_modes"/>
+  <property name="css_class">description</property>
+  <property name="width">72</property>
+ </widget>
+ <widget name="which_sex" meta_type="Boolean Widget">
+  <property name="fields">
+   <element value="which_sex"/>
+  </property>
+  <property name="label">Sex</property>
+  <property name="label_edit">Sex</property>
+  <property name="label_false">male</property>
+  <property name="label_true">female</property>
+ </widget>
+ <table>
+  <row>
+   <cell name="Title"/>
+  </row>
+  <row>
+   <cell name="text"/>
+  </row>
+  <row>
+   <cell name="which_sex"/>
+  </row>
+  <row>
+   <cell name="nr_of_blocks"/>
+  </row>
+  <row>
+   <cell name="nr_of_floors"/>
+  </row>
+  <row>
+   <cell name="rooms_per_floor"/>
+  </row>
+  <row>
+   <cell name="beds_per_room"/>
+  </row>
+  <row>
+   <cell name="beds_for_fresh"/>
+  </row>
+  <row>
+   <cell name="beds_for_returning"/>
+  </row>
+  <row>
+   <cell name="beds_for_final"/>
+  </row>
+  <row>
+   <cell name="reserved_rooms"/>
+  </row>
+ </table>
+</object>
Index: eUP_SRP/trunk/profiles/default/layouts/accommodation.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/layouts/accommodation.xml	(revision 621)
+++ 	(revision )
@@ -1,164 +1,0 @@
-<?xml version="1.0"?>
-<object name="accommodation" meta_type="CPS Layout">
- <property name="layout_create_method"></property>
- <property name="layout_edit_method"></property>
- <property name="layout_view_method"></property>
- <property name="style_prefix">layout_waeup_</property>
- <property name="flexible_widgets"/>
- <property name="validate_values_expr"></property>
- <widget name="beds_for_final" meta_type="MultiSelect Widget">
-  <property name="fields">
-   <element value="beds_for_final"/>
-  </property>
-  <property name="is_required">True</property>
-  <property name="label">Bedspaces for final</property>
-  <property name="label_edit">Bedspaces for final</property>
-  <property name="help">Name the bedspaces for final year students</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="vocabulary">waeup_bed_letters</property>
- </widget>
- <widget name="beds_for_fresh" meta_type="MultiSelect Widget">
-  <property name="fields">
-   <element value="beds_for_fresh"/>
-  </property>
-  <property name="is_required">True</property>
-  <property name="label">Bedspaces for fresh</property>
-  <property name="label_edit">Bedspaces for fresh</property>
-  <property name="help">Name the bedspaces for first year students</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="vocabulary">waeup_bed_letters</property>
- </widget>
- <widget name="beds_for_returning" meta_type="MultiSelect Widget">
-  <property name="fields">
-   <element value="beds_for_returning"/>
-  </property>
-  <property name="is_required">True</property>
-  <property name="label">Bedspaces for returning</property>
-  <property name="label_edit">Bedspaces for returning</property>
-  <property
-     name="help">Name the bedspaces for returning year students</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="vocabulary">waeup_bed_letters</property>
- </widget>
- <widget name="beds_per_room" meta_type="Select Widget">
-  <property name="fields">
-   <element value="beds_per_room"/>
-  </property>
-  <property name="is_required">True</property>
-  <property name="label">Beds per Room</property>
-  <property name="label_edit">Beds per Room</property>
-  <property name="vocabulary">range10</property>
- </widget>
- <widget name="heading" meta_type="String Widget">
-  <property name="fields">
-   <element value="heading"/>
-  </property>
-  <property name="is_required">True</property>
-  <property name="label">Hall Name</property>
-  <property name="label_edit">Hall Name</property>
-  <property name="display_width">40</property>
-  <property name="size_max">40</property>
- </widget>
- <widget name="nr_of_blocks" meta_type="Select Widget">
-  <property name="fields">
-   <element value="nr_of_blocks"/>
-  </property>
-  <property name="is_required">True</property>
-  <property name="label">Nr of Blocks</property>
-  <property name="label_edit">Nr of Blocks</property>
-  <property name="vocabulary">range10</property>
- </widget>
- <widget name="nr_of_floors" meta_type="Select Widget">
-  <property name="fields">
-   <element value="nr_of_floors"/>
-  </property>
-  <property name="is_required">True</property>
-  <property name="label">Nr of Floors </property>
-  <property name="label_edit">Nr of Floors</property>
-  <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">
-   <element value="rooms_per_floor"/>
-  </property>
-  <property name="is_required">True</property>
-  <property name="label">Rooms per Floor</property>
-  <property name="label_edit">Rooms per Floor</property>
-  <property name="vocabulary">range50</property>
- </widget>
- <widget name="text" meta_type="Text Widget">
-  <property name="fields">
-   <element value="text"/>
-  </property>
-  <property name="label">Text</property>
-  <property name="label_edit">Text</property>
-  <property name="help">Short Description</property>
-  <property name="is_i18n">True</property>
-  <property name="hidden_layout_modes"/>
-  <property name="css_class">description</property>
-  <property name="width">72</property>
- </widget>
- <widget name="which_sex" meta_type="Boolean Widget">
-  <property name="fields">
-   <element value="which_sex"/>
-  </property>
-  <property name="label">Sex</property>
-  <property name="label_edit">Sex</property>
-  <property name="label_false">male</property>
-  <property name="label_true">female</property>
- </widget>
- <table>
-  <row>
-   <cell name="heading"/>
-  </row>
-  <row>
-   <cell name="text"/>
-  </row>
-  <row>
-   <cell name="which_sex"/>
-  </row>
-  <row>
-   <cell name="nr_of_blocks"/>
-  </row>
-  <row>
-   <cell name="nr_of_floors"/>
-  </row>
-  <row>
-   <cell name="rooms_per_floor"/>
-  </row>
-  <row>
-   <cell name="beds_per_room"/>
-  </row>
-  <row>
-   <cell name="beds_for_fresh"/>
-  </row>
-  <row>
-   <cell name="beds_for_returning"/>
-  </row>
-  <row>
-   <cell name="beds_for_final"/>
-  </row>
-  <row>
-   <cell name="reserved_rooms"/>
-  </row>
- </table>
-</object>
Index: /WAeUP_SRP/trunk/profiles/default/schemas.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/schemas.xml	(revision 621)
+++ /WAeUP_SRP/trunk/profiles/default/schemas.xml	(revision 622)
@@ -4,5 +4,5 @@
  <object name="academics" meta_type="CPS Schema"/>
  <object name="academics_search" meta_type="CPS Schema"/>
- <object name="accommodation" meta_type="CPS Schema"/>
+ <object name="acco_hall" meta_type="CPS Schema"/>
  <object name="certificate" meta_type="CPS Schema"/>
  <object name="certificate_course" meta_type="CPS Schema"/>
Index: /WAeUP_SRP/trunk/profiles/default/schemas/acco_hall.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/schemas/acco_hall.xml	(revision 622)
+++ /WAeUP_SRP/trunk/profiles/default/schemas/acco_hall.xml	(revision 622)
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<object name="accommodation" meta_type="CPS Schema">
+  <field name="beds_for_final" meta_type="CPS String List Field"/>
+  <field name="beds_for_fresh" meta_type="CPS String List Field"/>
+  <field name="beds_for_returning" meta_type="CPS String List Field"/>
+  <field name="beds_per_room" meta_type="CPS Int Field">
+    <property name="default_expr">python:6</property>
+  </field>
+  <field name="nr_of_blocks" meta_type="CPS Int Field">
+    <property name="default_expr">python:3</property>
+  </field>
+ <field name="nr_of_floors" meta_type="CPS Int Field">
+    <property name="default_expr">python:3</property>
+  </field>
+ <field name="reserved_rooms" meta_type="CPS String List Field">
+    <property name="default_expr"></property>
+  </field>
+  <field name="rooms_per_floor" meta_type="CPS Int Field">
+    <property name="default_expr">python:20</property>
+  </field>
+ <field name="study_courses" meta_type="CPS String List Field"/>
+ <field name="text" meta_type="CPS String Field">
+  <property name="is_searchabletext">False</property>
+ </field>
+ <field name="which_sex" meta_type="CPS Boolean Field">
+ </field>
+</object>
Index: eUP_SRP/trunk/profiles/default/schemas/accommodation.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/schemas/accommodation.xml	(revision 621)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0"?>
-<object name="accommodation" meta_type="CPS Schema">
- <field name="beds_for_final" meta_type="CPS String List Field"/>
- <field name="beds_for_fresh" meta_type="CPS String List Field"/>
- <field name="beds_for_returning" meta_type="CPS String List Field"/>
- <field name="beds_per_room" meta_type="CPS Int Field"/>
- <field name="heading" meta_type="CPS String Field">
-  <property name="is_searchabletext">True</property>
- </field>
- <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"/>
- <field name="text" meta_type="CPS String Field">
-  <property name="is_searchabletext">True</property>
- </field>
- <field name="which_sex" meta_type="CPS Boolean Field">
-  <property name="is_searchabletext">True</property>
- </field>
-</object>
Index: /WAeUP_SRP/trunk/profiles/default/skins.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/skins.xml	(revision 621)
+++ /WAeUP_SRP/trunk/profiles/default/skins.xml	(revision 622)
@@ -9,4 +9,6 @@
  <object name="waeup_academics" meta_type="Filesystem Directory View"
     directory="WAeUP_SRP/skins/waeup_academics"/>
+ <object name="waeup_accommodation" meta_type="Filesystem Directory View"
+    directory="WAeUP_SRP/skins/waeup_accommodation"/>
  <object name="waeup_pins" meta_type="Filesystem Directory View"
     directory="WAeUP_SRP/skins/waeup_pins"/>
@@ -19,4 +21,5 @@
   <layer name="waeup_student" insert-after="waeup_custom"/>
   <layer name="waeup_academics" insert-after="waeup_custom"/>
+  <layer name="waeup_accommodation" insert-after="waeup_custom"/>
  </skin-path>
  <skin-path name="CPSSkins-macroless">
@@ -26,4 +29,5 @@
   <layer name="waeup_student" insert-after="waeup_custom"/>
   <layer name="waeup_academics" insert-after="waeup_custom"/>
+  <layer name="waeup_accommodation" insert-after="waeup_custom"/>
  </skin-path>
 </object>
Index: /WAeUP_SRP/trunk/profiles/default/skins/waeup_accommodation.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/skins/waeup_accommodation.xml	(revision 622)
+++ /WAeUP_SRP/trunk/profiles/default/skins/waeup_accommodation.xml	(revision 622)
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<object name="waeup_accommodation" meta_type="Folder">
+ <property name="title"></property>
+</object>
Index: /WAeUP_SRP/trunk/profiles/default/types.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/types.xml	(revision 621)
+++ /WAeUP_SRP/trunk/profiles/default/types.xml	(revision 622)
@@ -4,5 +4,5 @@
  <object name="AcademicsFolder" meta_type="CPS Flexible Type Information"/>
  <object name="AccoFolder" meta_type="CPS Flexible Type Information"/>
- <object name="Accommodation" meta_type="CPS Flexible Type Information"/>
+ <object name="AccoHall" meta_type="CPS Flexible Type Information"/>
  <object name="CertificatesFolder" meta_type="CPS Flexible Type Information"/>
  <object name="Certificate" meta_type="CPS Flexible Type Information"/>
Index: /WAeUP_SRP/trunk/profiles/default/types/AccoFolder.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/types/AccoFolder.xml	(revision 621)
+++ /WAeUP_SRP/trunk/profiles/default/types/AccoFolder.xml	(revision 622)
@@ -29,6 +29,6 @@
  <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"/>
+ <alias from="(Default)" to="accommodation_index"/>
+ <alias from="view" to="accommodation_index"/>
  <action title="View" action_id="view" category="object" condition_expr=""
     url_expr="string:${object_url}/academics_contents" visible="True">
@@ -37,15 +37,5 @@
  <action title="Add Accommodation Hall" action_id="new_entry"
     category="object" condition_expr=""
-    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="" 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="" url_expr="string:${object_url}/cpsdocument_edit_form"
+    url_expr="string:${object_url}/content_create?type_name=AccoHall"
     visible="True">
   <permission value="Modify portal content"/>
Index: /WAeUP_SRP/trunk/profiles/default/types/AccoHall.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/types/AccoHall.xml	(revision 622)
+++ /WAeUP_SRP/trunk/profiles/default/types/AccoHall.xml	(revision 622)
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<object name="AccoHall" meta_type="CPS Flexible Type Information"
+   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
+ <property name="title">WAeUP AccoHall</property>
+ <property name="description"></property>
+ <property name="content_icon">student.gif</property>
+ <property name="content_meta_type">AccoHall</property>
+ <property name="product">WAeUP_SRP</property>
+ <property name="factory">addAccoHall</property>
+ <property name="immediate_view">academics_contents</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">folder</property>
+ <property name="cps_display_as_document_in_listing">True</property>
+ <property name="schemas">
+  <element value="metadata"/>
+  <element value="common"/>
+  <element value="acco_hall"/>
+ </property>
+ <property name="layouts">
+  <element value="acco_hall"/>
+ </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="accommodation_index"/>
+ <alias from="view" to="accommodation_index"/>
+ <action title="View" action_id="view" category="object" condition_expr=""
+    url_expr="string:${object_url}/accommodation_index" visible="True">
+  <permission value="View"/>
+ </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>
+</object>
Index: eUP_SRP/trunk/profiles/default/types/Accommodation.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/types/Accommodation.xml	(revision 621)
+++ 	(revision )
@@ -1,53 +1,0 @@
-<?xml version="1.0"?>
-<object name="Accommodation" meta_type="CPS Flexible Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">WAeUP Accommodation</property>
- <property name="description"></property>
- <property name="content_icon">student.gif</property>
- <property name="content_meta_type">Accommodation</property>
- <property name="product">WAeUP_SRP</property>
- <property name="factory">addAccommodation</property>
- <property name="immediate_view">academics_contents</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">folder</property>
- <property name="cps_display_as_document_in_listing">True</property>
- <property name="schemas">
-  <element value="metadata"/>
-  <element value="common"/>
-  <element value="accommodation"/>
- </property>
- <property name="layouts">
-  <element value="accommodation"/>
- </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="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}/cpsdocument_edit_form"
-    visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_metadata" action_id="metadata" category="object"
-    condition_expr="" url_expr="string:${object_url}/cpsdocument_metadata"
-    visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="Delegate" action_id="localroles" category="object"
-    condition_expr="" url_expr="string:${object_url}/folder_localrole_form"
-    visible="False">
-  <permission value="Modify portal content"/>
- </action>
-</object>
Index: /WAeUP_SRP/trunk/profiles/default/workflows.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/workflows.xml	(revision 621)
+++ /WAeUP_SRP/trunk/profiles/default/workflows.xml	(revision 622)
@@ -25,5 +25,5 @@
    <bound-workflow workflow_id="section_folder_wf"/>
   </type>
-  <type type_id="Accommodation">
+  <type type_id="AccoHall">
    <bound-workflow workflow_id="waeup_accommodation_wf"/>
   </type>
Index: /WAeUP_SRP/trunk/skins/waeup_academics/searchAcademics.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_academics/searchAcademics.py	(revision 621)
+++ /WAeUP_SRP/trunk/skins/waeup_academics/searchAcademics.py	(revision 622)
@@ -29,4 +29,5 @@
         'search_string': ''
         }
+choosen_ids = request.get('ids',[])
 
 rend,psm,ds = lt.renderLayout(layout_id= 'academics_search',
@@ -44,16 +45,6 @@
                              objects = items,
                              is_manager = is_manager,
+                             choosen_ids = choosen_ids,
                              )
-what = ds.get('search_mode')
-state = ds.get('review_state')
-term = ds.get('search_string')
-if not term and not with_review:
-    return context.academics_search_view(rendered = rend,
-                             psm = "You must specify a search string",
-                             #psm = "%s, %s" % (psm,ds),
-                             objects = items,
-                             is_manager = is_manager,
-                             )
-with_review = state != "all"
 what = ds.get('search_mode')
 state = ds.get('review_state')
@@ -73,4 +64,5 @@
                              students = items,
                              is_manager = is_manager,
+                             choosen_ids = choosen_ids,
                              )
 with_review = state != "all"
@@ -106,4 +98,4 @@
                              objects = objects,
                              is_manager = is_manager,
-                             choosen_ids = []
+                             choosen_ids = choosen_ids,
                              )
Index: /WAeUP_SRP/trunk/skins/waeup_accommodation/acco_hall_view.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_accommodation/acco_hall_view.pt	(revision 622)
+++ /WAeUP_SRP/trunk/skins/waeup_accommodation/acco_hall_view.pt	(revision 622)
@@ -0,0 +1,22 @@
+<metal:html tal:define="info context/getHallInfo;
+            is_manager info/is_manager|nothing;"
+            >
+  <metal:body use-macro="here/waeup_content_master/macros/master">
+    <metal:block fill-slot="header">
+      <a href=""
+         tal:attributes="href string:${here/academicsParent}">
+        <img tal:attributes="src string:${here/portal_url}/arrow_up.gif"/>
+        Up one level
+      </a>
+      <h3 tal:content="here/title_or_id" />
+      <div tal:condition="nothing" tal:content="info/container_path"/>
+    </metal:block>
+    <metal:main fill-slot="main">
+      <span tal:omit-tag=""  
+            tal:content="structure python: info['doc'].render(layout_mode='view')" />
+      
+    </metal:main>
+    
+    <metal:sub fill-slot="sub"/>
+  </metal:body>
+</metal:html>
Index: /WAeUP_SRP/trunk/skins/waeup_accommodation/accommodation_index.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_accommodation/accommodation_index.py	(revision 622)
+++ /WAeUP_SRP/trunk/skins/waeup_accommodation/accommodation_index.py	(revision 622)
@@ -0,0 +1,32 @@
+## Script (Python) "academics_index"
+##bind container=container
+##bind context=context
+##bind namespace=
+##bind script=script
+##bind subpath=traverse_subpath
+##parameters=batch=None
+##title=
+##
+# $Id: student_edit.py 486 2006-09-06 10:09:39Z joachim $
+"""
+return the appropriate page in the academics section
+"""
+
+request = context.REQUEST
+redirect = request.RESPONSE.redirect
+pm = context.portal_membership
+
+if pm.isAnonymousUser():
+    return redirect("%s/academics_contents" % context.absolute_url())
+
+campus = context.portal_catalog(meta_type = "University")[-1].getObject()
+
+if context.isManager():
+    if context.portal_type == 'AccoFolder':
+        return context.accommodation.accommodation_view()
+    elif context.portal_type == 'AccoHall':
+        return context.acco_hall_view()
+    return redirect("%s/academics_contents" % context.absolute_url())
+else:
+    return redirect("%s/academics_contents" % context.absolute_url())
+
Index: /WAeUP_SRP/trunk/skins/waeup_accommodation/accommodation_view.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_accommodation/accommodation_view.pt	(revision 622)
+++ /WAeUP_SRP/trunk/skins/waeup_accommodation/accommodation_view.pt	(revision 622)
@@ -0,0 +1,80 @@
+<metal:html tal:define="info context/getAccoHallsInfo;
+            is_manager info/is_manager|nothing;"
+            >
+  <metal:body use-macro="here/waeup_content_master/macros/master">
+    <metal:block fill-slot="header">
+      <a href="" tal:condition="nothing"
+         tal:attributes="href string:${here/academicsParent}">
+        <img tal:attributes="src string:${here/portal_url}/arrow_up.gif"/>
+        Up one level
+      </a>
+      <h3 tal:content="here/title_or_id">
+        Page Title
+      </h3>
+    </metal:block>
+    <metal:main fill-slot="main">
+      <form action="" method="post" class="group"
+            tal:attributes="action info/action"
+            tal:define="rows python: info['items'];"
+            >
+        <span tal:condition="python: 0" tal:content="structure rows" />
+        <table tal:condition="python: 1" class="contentListing" width="100%" summary="content layout" id="folder_content">      
+          <tr tal:repeat="row rows"
+            tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
+            <td align="left" valign="middle" style="width: 5px;" 
+                tal:condition="is_manager">
+              <input type="checkbox" name="ids:list" value="" id="" class="noborder"
+                     tal:condition="is_manager"
+                     tal:define="id row/id"
+                     tal:attributes="value id;
+                     id python:'cb_' + id;
+                     checked python:id in info['choosen_ids'];" 
+                     />
+            </td>
+            <td><a href="view" tal:attributes="href string:${row/url}">
+              <strong tal:content="row/title" /></a> </td>
+            <td tal:content="row/id"> </td>
+            
+            <td> 
+            <a tal:condition="row/is_editable"
+                href="edit" tal:attributes="href string:${row/url}/external_edit_form"
+                target="edit"
+                onclick="javascript:window.open('','edit','width=600, height=700, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')">
+                [edit]
+                </a> 
+            </td>
+            
+          </tr>
+        </table>
+        <table width="100%" cellspacing="0" cellpadding="2"
+               summary="contents of the folder"
+               class="folderButtons">
+          <tr>
+            <td align="left" valign="top" rowspan="3"></td>
+            <td align="left" valign="top">
+              <span tal:condition="is_manager">
+                <input type="button" value="button_select_all" class="context"
+                       onclick="someJavaScriptFunctionThatWillBeReplaced"
+                       i18n:attributes="value"
+                       tal:attributes="onclick python:'toggleSelect(this, \'%s\', \'%s\')'
+                       % (cpsmcat('button_select_all'), cpsmcat('button_deselect_all'))"
+                       />
+                <input type="submit" name="folder_delete:method" value="button_delete"
+                       class="destructive" i18n:attributes="value"
+                       tal:attributes="onclick python:'return window.confirm(\'%s\')' %
+                       (cpsmcat('description_confirm_delete'), )" 
+                       />
+                <input tal:condition="python: context.portal_type not in ('Semester','Certificate')"
+                       type="submit" name="id_rename_form:method"
+                       class="context" value="Change Object ID" i18n:attributes="value" 
+                       />
+              </span>
+            </td>
+          </tr>
+        </table>
+      </form>
+    </metal:main>
+    
+    <metal:sub fill-slot="sub"/>
+  </metal:body>
+</metal:html>
Index: /WAeUP_SRP/trunk/skins/waeup_accommodation/getAccoHallsInfo.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_accommodation/getAccoHallsInfo.py	(revision 622)
+++ /WAeUP_SRP/trunk/skins/waeup_accommodation/getAccoHallsInfo.py	(revision 622)
@@ -0,0 +1,37 @@
+## Script (Python) "cpsdocument_edit"
+##bind container=container
+##bind context=context
+##bind namespace=
+##bind script=script
+##bind subpath=traverse_subpath
+##parameters=student=None
+##title=
+##
+# $Id: student_edit.py 486 2006-09-06 10:09:39Z joachim $
+"""
+return Info about the Faculties
+"""
+request = context.REQUEST
+
+wf = context.portal_workflow
+mtool = context.portal_membership
+path_info = request.get('PATH_INFO').split('/')
+
+info = {}
+info['is_manager'] = context.isManager()
+info['is_student'] = context.isStudent()
+info['action'] = "%s" % context.campus.absolute_url()
+info['choosen_ids'] = request.get('ids',[])
+items = []
+halls = context.portal_catalog(portal_type='AccoHall')
+for f in halls:
+    row = {}
+    fo = f.getObject()
+    fd = fo.getContent()
+    row['id'] = fo.getId()
+    row['title'] = fd.Title()
+    row['url'] = fo.absolute_url()
+    row['is_editable'] = mtool.checkPermission('Modify portal content', fo)
+    items.append(row)
+info['items'] = items
+return info
Index: /WAeUP_SRP/trunk/skins/waeup_accommodation/getHallInfo.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_accommodation/getHallInfo.py	(revision 622)
+++ /WAeUP_SRP/trunk/skins/waeup_accommodation/getHallInfo.py	(revision 622)
@@ -0,0 +1,28 @@
+## Script (Python) "cpsdocument_edit"
+##bind container=container
+##bind context=context
+##bind namespace=
+##bind script=script
+##bind subpath=traverse_subpath
+##parameters=student=None
+##title=
+##
+# $Id: student_edit.py 486 2006-09-06 10:09:39Z joachim $
+"""
+return Info about the Faculties
+"""
+request = context.REQUEST
+
+wf = context.portal_workflow
+path_info = request.get('PATH_INFO').split('/')
+mtool = context.portal_membership
+
+info = {}
+#dep_id = request.get('PATH_TRANSLATED').split('/')[-2]
+dep_id = context.aq_parent.getId()
+info['is_manager'] = context.isManager()
+info['is_student'] = context.isStudent()
+info['action'] = "%s" % context.absolute_url()
+info['choosen_ids'] = request.get('ids',[])
+info['doc'] = context.getContent()
+return info
Index: /WAeUP_SRP/trunk/skins/waeup_student/searchStudents.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/searchStudents.py	(revision 621)
+++ /WAeUP_SRP/trunk/skins/waeup_student/searchStudents.py	(revision 622)
@@ -73,5 +73,5 @@
 onlyreview = with_review and not term
 if onlyreview:
-    res = catalog(portal_type='Student',
+    res = catalog(portal_type=portal_type_query,
                   review_state=state)
 elif what == "student_id":
@@ -95,5 +95,5 @@
     if with_review:
         try:
-            res = catalog(portal_type='Student',SearchableText=st,
+            res = catalog(portal_type=pt,SearchableText=st,
                           review_state=state)
         except:
