Index: waeup_product/trunk/skins/waeup_student/accommodation_index_html.py
===================================================================
--- waeup_product/trunk/skins/waeup_student/accommodation_index_html.py	(revision 118)
+++ waeup_product/trunk/skins/waeup_student/accommodation_index_html.py	(revision 119)
@@ -3,5 +3,5 @@
 # $Id$
 
-"""Default view for the Accommodation. 
+"""Default view for the Accommodation.
 """
 
@@ -10,5 +10,5 @@
     roles = member.getRoles()
     if 'Manager' in roles:
-        return context.folder_view()
+        return context.accommodation_view_manager(psm=psm)
     elif 'StudentManager' in roles:
         return context.accommodation_view_manager(psm=psm)
Index: waeup_product/trunk/skins/waeup_student/accommodation_view_all.pt
===================================================================
--- waeup_product/trunk/skins/waeup_student/accommodation_view_all.pt	(revision 118)
+++ waeup_product/trunk/skins/waeup_student/accommodation_view_all.pt	(revision 119)
@@ -12,5 +12,5 @@
              tal:define="items here/contentValues"
              >
-    <h2><span tal:content="context/id" /></h2>
+    <h2>Accomodation</h2>
     <table cellspacing="0" cellpadding="0">
       <tal:block condition="python: len(items)">
@@ -19,5 +19,5 @@
             <a href="jamb" 
                tal:attributes="href item/absolute_url"
-               tal:content="item/title_or_id"></a>
+               tal:content="item/heading"></a>
           </td>
         </tr>
Index: waeup_product/trunk/skins/waeup_student/accommodation_view_manager.pt
===================================================================
--- waeup_product/trunk/skins/waeup_student/accommodation_view_manager.pt	(revision 118)
+++ waeup_product/trunk/skins/waeup_student/accommodation_view_manager.pt	(revision 119)
@@ -12,5 +12,5 @@
              tal:define="items here/contentValues"
              >
-    <h2><span tal:content="context/id" /></h2>
+    <h2>Accomodation</h2>
     <table cellspacing="0" cellpadding="0">
       <tal:block condition="python: len(items)">
@@ -19,5 +19,5 @@
             <a href="jamb" 
                tal:attributes="href item/absolute_url"
-               tal:content="item/title_or_id"></a>
+               tal:content="item/heading"></a>
           </td>
         </tr>
Index: waeup_product/trunk/skins/waeup_student/accommodation_view_student.pt
===================================================================
--- waeup_product/trunk/skins/waeup_student/accommodation_view_student.pt	(revision 118)
+++ waeup_product/trunk/skins/waeup_student/accommodation_view_student.pt	(revision 119)
@@ -12,5 +12,5 @@
              tal:define="items here/contentValues"
              >
-    <h2><span tal:content="context/title_or_id" /></h2>
+    <h2>Accomodation</h2>
     <table cellspacing="0" cellpadding="0">
       <tal:block condition="python: len(items)">
@@ -19,5 +19,5 @@
             <a href="jamb" 
                tal:attributes="href item/absolute_url"
-               tal:content="item/title_or_id"></a>
+               tal:content="item/heading"></a>
           </td>
         </tr>
Index: waeup_product/trunk/skins/waeup_student/add_accommodation.py
===================================================================
--- waeup_product/trunk/skins/waeup_student/add_accommodation.py	(revision 118)
+++ waeup_product/trunk/skins/waeup_student/add_accommodation.py	(revision 119)
@@ -16,11 +16,4 @@
 lt = context.portal_layouts
 
-accofolder = getattr(context,"Accommodation",None)
-if accofolder is None:
-    context.invokeFactory('AccoFolder','Accommodation')
-    accofolder = getattr(context,"Accommodation")
-    context.notifyCPSDocumentCreation(ob=accofolder)
-    
-    
 res,psm,ds = lt.renderLayout(layout_id= 'accommodation',
                       schema_id = 'accommodation',
@@ -45,10 +38,10 @@
 elif psm == 'valid':
     oid = "%s" % ds.get('heading').replace(' ','')
-    accofolder.invokeFactory(type_name,oid) 
-    object = getattr(accofolder,oid)    
+    context.invokeFactory(type_name,oid)
+    object = getattr(context,oid)
     object.getContent().edit(mapping=ds)
     context.notifyCPSDocumentCreation(ob=object)
     psm = 'new %s created' % oid
-    context_ti = context.portal_types[context.portal_type] 
+    context_ti = context.portal_types[context.portal_type]
     index = context_ti.getActionById('view','university_view')
     return getattr(context,index)(psm=psm)
