Index: WAeUP_SRP/trunk/skins/waeup_student/accommodation_index_html.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/accommodation_index_html.py	(revision 456)
+++ 	(revision )
@@ -1,17 +1,0 @@
-##parameters=REQUEST=None,psm=None,groups=None
-
-# $Id$
-
-"""Default view for the Accommodation.
-"""
-
-member = context.portal_membership.getAuthenticatedMember()
-if not context.portal_membership.isAnonymousUser():
-    roles = member.getRoles()
-    if 'Manager' in roles:
-        return context.accommodation_view_manager(psm=psm)
-    elif 'StudentManager' in roles:
-        return context.accommodation_view_manager(psm=psm)
-    elif 'Student' in roles:
-        return context.accommodation_view_student(psm=psm)
-return context.accommodation_view_all(psm=psm)
Index: WAeUP_SRP/trunk/skins/waeup_student/accommodation_view_all.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/accommodation_view_all.pt	(revision 456)
+++ 	(revision )
@@ -1,29 +1,0 @@
-<html metal:use-macro="here/content_lib_master/macros/master">
-
-<metal:block fill-slot="head_slot">
-  <tal:block tal:define="student here/getContent">
-  </tal:block>
-</metal:block>
-
-  <metal:block fill-slot="header">
-  </metal:block>
-
-<metal:block fill-slot="main"
-             tal:define="items here/contentValues"
-             >
-    <h2>Accommodation</h2>
-    <table cellspacing="0" cellpadding="0">
-      <tal:block condition="python: len(items)">
-        <tr tal:repeat="item items">
-          <td colspan="1"> 
-            <a href="jamb" 
-               tal:attributes="href item/absolute_url"
-               tal:content="item/heading"></a>
-          </td>
-        </tr>
-      </tal:block>
-    </table>
-  </metal:block>
-  <metal:block fill-slot="sub">
-  </metal:block>
-</html>
Index: WAeUP_SRP/trunk/skins/waeup_student/accommodation_view_manager.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/accommodation_view_manager.pt	(revision 456)
+++ 	(revision )
@@ -1,29 +1,0 @@
-<html metal:use-macro="here/content_lib_master/macros/master">
-
-<metal:block fill-slot="head_slot">
-  <tal:block tal:define="student here/getContent">
-  </tal:block>
-</metal:block>
-
-  <metal:block fill-slot="header">
-  </metal:block>
-
-<metal:block fill-slot="main"
-             tal:define="items here/contentValues"
-             >
-    <h2>Accommodation</h2>
-    <table cellspacing="0" cellpadding="0">
-      <tal:block condition="python: len(items)">
-        <tr tal:repeat="item items">
-          <td colspan="1"> 
-            <a href="jamb" 
-               tal:attributes="href item/absolute_url"
-               tal:content="item/heading"></a>
-          </td>
-        </tr>
-      </tal:block>
-    </table>
-  </metal:block>
-  <metal:block fill-slot="sub">
-  </metal:block>
-</html>
Index: WAeUP_SRP/trunk/skins/waeup_student/accommodation_view_student.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/accommodation_view_student.pt	(revision 456)
+++ 	(revision )
@@ -1,29 +1,0 @@
-<html metal:use-macro="here/content_lib_master/macros/master">
-
-<metal:block fill-slot="head_slot">
-  <tal:block tal:define="student here/getContent">
-  </tal:block>
-</metal:block>
-
-  <metal:block fill-slot="header">
-  </metal:block>
-
-<metal:block fill-slot="main"
-             tal:define="items here/contentValues"
-             >
-    <h2>Accommodation</h2>
-    <table cellspacing="0" cellpadding="0">
-      <tal:block condition="python: len(items)">
-        <tr tal:repeat="item items">
-          <td colspan="1"> 
-            <a href="jamb" 
-               tal:attributes="href item/absolute_url"
-               tal:content="item/heading"></a>
-          </td>
-        </tr>
-      </tal:block>
-    </table>
-  </metal:block>
-  <metal:block fill-slot="sub">
-  </metal:block>
-</html>
Index: WAeUP_SRP/trunk/skins/waeup_student/acknowledge_slip.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/acknowledge_slip.pt	(revision 456)
+++ WAeUP_SRP/trunk/skins/waeup_student/acknowledge_slip.pt	(revision 460)
@@ -29,7 +29,7 @@
   
    
-      <tal:block  tal:content="structure python:adm_proxy.render(cluster='adm_slip')" />
-      <tal:block  tal:content="structure python:clear_proxy.render(cluster='adm_slip')" /> 
-      <tal:block  tal:content="structure python:pers_proxy.render(cluster='adm_slip')" />
+      <tal:block tal:content="structure python:adm_proxy.render(cluster='adm_slip')" />
+      <tal:block tal:content="structure python:clear_proxy.render(cluster='adm_slip')" /> 
+      <tal:block tal:content="structure python:pers_proxy.render(cluster='adm_slip')" />
 
 
Index: WAeUP_SRP/trunk/skins/waeup_student/add_accommodation.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/add_accommodation.py	(revision 456)
+++ 	(revision )
@@ -1,49 +1,0 @@
-##parameters=REQUEST=None
-# $Id$
-"""
-Add a Accommodation Hall
-
-"""
-type_name = 'Accommodation'
-REQUEST.set('type_name',type_name)
-
-ti = context.portal_types[type_name]
-pr = context.portal_registration
-pm = context.portal_membership
-
-validate = REQUEST.has_key("cpsdocument_create_button")
-
-lt = context.portal_layouts
-
-res,psm,ds = lt.renderLayout(layout_id= 'accommodation',
-                      schema_id = 'accommodation',
-                      context=context,
-                      mapping=validate and REQUEST,
-                      ob={},
-                      layout_mode='create',
-                      create_action = 'add_accommodation',
-                      )
-if psm == 'invalid':
-    return context.common_edit_form(rendered = res,
-                                 create = 1,
-                                 type_name = type_name,
-                                 psm = 'Please correct your errors',
-                                 )
-elif psm == '':
-    return context.common_edit_form(rendered = res,
-                                 create = 1,
-                                 type_name = type_name,
-                                 psm = psm,
-                                 )
-elif psm == 'valid':
-    oid = "%s" % ds.get('heading').replace(' ','')
-    context.invokeFactory(type_name,oid)
-    object = getattr(context,oid)
-    ds.set('Title',ds.get('heading'))
-    object.getContent().edit(mapping=ds)
-    context.notifyCPSDocumentCreation(ob=object)
-    psm = 'new %s created' % oid
-    context_ti = context.portal_types[context.portal_type]
-    index = context_ti.getActionById('view','university_view')
-    return getattr(context,index)(psm=psm)
-
Index: WAeUP_SRP/trunk/skins/waeup_student/add_accommodation.py.Joachim
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/add_accommodation.py.Joachim	(revision 456)
+++ 	(revision )
@@ -1,55 +1,0 @@
-##parameters=REQUEST=None
-# $Id: add_accommodation.py 107 2005-10-27 23:58:38Z joachim $
-"""
-Add a Accommodation Hall
-
-"""
-type_name = 'Accommodation'
-REQUEST.set('type_name',type_name)
-
-ti = context.portal_types[type_name]
-pr = context.portal_registration
-pm = context.portal_membership
-
-validate = REQUEST.has_key("cpsdocument_create_button")
-
-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',
-                      context=context,
-                      mapping=validate and REQUEST,
-                      ob={},
-                      layout_mode='create',
-                      create_action = 'add_accommodation',
-                      )
-if psm == 'invalid':
-    return context.common_edit_form(rendered = res,
-                                 create = 1,
-                                 type_name = type_name,
-                                 psm = 'Please correct your errors',
-                                 )
-elif psm == '':
-    return context.common_edit_form(rendered = res,
-                                 create = 1,
-                                 type_name = type_name,
-                                 psm = psm,
-                                 )
-elif psm == 'valid':
-    oid = "%s" % ds.get('heading').replace(' ','')
-    accofolder.invokeFactory(type_name,oid) 
-    object = getattr(accofolder,oid)    
-    object.getContent().edit(mapping=ds)
-    context.notifyCPSDocumentCreation(ob=object)
-    psm = 'new %s created' % oid
-    context_ti = context.portal_types[context.portal_type] 
-    index = context_ti.getActionById('view','university_view')
-    return getattr(context,index)(psm=psm)
-
Index: WAeUP_SRP/trunk/skins/waeup_student/add_course_ticket.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/add_course_ticket.py	(revision 456)
+++ 	(revision )
@@ -1,67 +1,0 @@
-##parameters=REQUEST
-# $Id$
-"""
-add a course_ticket
-"""
-type_name = 'CourseTicket'
-ti = context.portal_types[type_name]
-pm = context.portal_membership
-REQUEST.set('type_name',type_name)
-
-validate = REQUEST.has_key("cpsdocument_create_button")
-
-
-lt = context.portal_layouts
-pv = context.portal_vocabularies
-#pr = context.portal_registration
-
-res,psm,ds = lt.renderLayout(layout_id= 'study_level',
-                      schema_id= 'study_level',
-                      context=context,
-                      mapping=validate and REQUEST,
-                      ob={},
-                      layout_mode='create',
-                      create_action = 'add_course_ticket',
-                      )
-if True or psm == 'invalid':
-    return context.common_edit_form(rendered = res,
-                                 create = 1,
-                                 type_name = type_name,
-                                 psm = 'Not yet active',
-                                 #psm = 'Please correct your errors',
-                                 )
-elif psm == '':
-    return context.common_edit_form(rendered = res,
-                                 create = 1,
-                                 type_name = type_name,
-                                 psm = psm,
-                                 #psm = str(ds),
-                                 )
-    
-elif psm == 'valid':
-    psm = (ds)
-    oid = ds.get('Title')
-    if hasattr(context,oid):
-        return context.common_edit_form(rendered = res,
-                                 create = 1,
-                                 type_name = type_name,
-                                 psm = 'You already registered for that level',
-                                 )
-    context.invokeFactory(type_name,oid) 
-    object = getattr(context,oid)
-    voc = pv.courselevel
-    ds.set('Title',voc.get(oid))
-    object.getContent().edit(mapping=ds,proxy=object)
-    context.notifyCPSDocumentCreation(ob=object)
-    psm = 'new %s created' % oid
-    semester_id = 'Semester_1_%s_%s' % (oid,context.getId())
-    object.invokeFactory('Semester',semester_id)
-    semester = getattr(object,semester_id)
-    semester.getContent().edit(mapping={'Title': 'First Semester'})
-    semester_id = 'Semester_2_%s_%s' % (oid,context.getId())
-    object.invokeFactory('Semester',semester_id)
-    semester = getattr(object,semester_id)
-    semester.getContent().edit(mapping={'Title': 'Second Semester'})
-    context_ti = context.portal_types[context.portal_type] 
-    index = context_ti.getActionById('view','university_view')
-    return getattr(context,index)(psm=psm)
Index: WAeUP_SRP/trunk/skins/waeup_student/admission_slip_form.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/admission_slip_form.pt	(revision 456)
+++ 	(revision )
@@ -1,22 +1,0 @@
-<html metal:use-macro="here/content_lib_master/macros/master">
-
-  <metal:block fill-slot="head_slot">
-  </metal:block>
-
-  <metal:block fill-slot="css_slot">
-    <link rel="Stylesheet" type="text/css" href=""
-      tal:attributes="href string:${base_url}document.css" />
-  </metal:block>
-  <metal:block fill-slot="header">
-  </metal:block>
-
-  <metal:block fill-slot="main">
-    <h1> Your Admission Slip</h1>      
-    <p>you used a <span  tal:content="options/dict/sc_value" /> Scratchcard with PIN 
-    <span tal:content="options/dict/sc_pin" />
-    </p>
-      <tal:block  tal:content="structure options/rendered" />
-  </metal:block>
-  <metal:block fill-slot="sub">
-  </metal:block>
-</html>
Index: WAeUP_SRP/trunk/skins/waeup_student/book_accommodation.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/book_accommodation.py	(revision 456)
+++ 	(revision )
@@ -1,75 +1,0 @@
-##parameters=REQUEST
-# $Id$
-"""
-book an accoMmodation
-"""
-import DateTime
-current = DateTime.DateTime()
-
-type_name = 'Student'
-ti = context.portal_types[type_name]
-pm = context.portal_membership
-REQUEST.set('type_name',type_name)
-
-validate = REQUEST.has_key("cpsdocument_edit_button")
-
-
-lt = context.portal_layouts
-pr = context.portal_registration
-
-res,psm,ds = lt.renderLayout(layout_id= 'accobook',
-                      schema_id= 'student_accommodation',
-                      context=context,
-                      mapping=validate and REQUEST,
-                      ob={},
-                      layout_mode='create',
-                      submit = "book",
-                      action = 'book_accommodation',
-                      )
-if psm == 'invalid':
-    return context.book_accommodation_form(rendered = res,
-                                 psm = "Please correct your input",
-                                 ds = ds,
-                                 )
-elif psm == '':
-    return context.book_accommodation_form(rendered = res,
-                                 psm = None,
-                                 ds = ds,
-                                 )
-elif psm == 'valid':
-    sf = context.getContent()
-    halls = getattr(context,'accommodation').contentValues()
-    beds = []
-    student = context.PERSONAL.getContent()
-    sf = context.getContent()
-    for hall in halls:
-        h = hall.getContent()
-        ba = int(getattr(h,'beds_assigned',0))
-        bal = getattr(h,'beds_assigned_list',[])
-        nr_of_beds = int(h.nr_of_blocks) * int(h.nr_of_floors) * int(h.rooms_per_floor) * int(h.beds_per_room)
-        if h.which_sex == student.sex and nr_of_beds > len(bal):
-            break
-    dict = {'heading': h.heading,
-            'text': h.text,
-            'which_sex': h.which_sex,
-            'nr_of_blocks': h.nr_of_blocks,
-            'nr_of_floors': h.nr_of_floors,
-            'rooms_per_floor': h.rooms_per_floor,
-            'beds_per_room': h.beds_per_room,
-            'nr_of_free': nr_of_beds,
-            'beds_assigned': ba,
-             }
-    ba += 1
-    dict['beds_assigned'] = ba
-    bal.append(('%s:%d' % (pm.getAuthenticatedMember(),ba)))
-    dict['beds_assigned_list'] = bal
-    h.edit(mapping = dict)
-    ds.set('accommodation', "Bed # %(beds_assigned)s in %(heading)s" % dict)
-    sf.edit(mapping = ds)
-    #psm = "Your not admitted"
-    psm = "h:%(heading)s free:%(nr_of_free)s %(beds_assigned)s" % dict
-
-    ds.set('sc_date',current)
-    sf.setScratchCardData('accommodation',ds)
-
-    return context.booked_accommodation(v=dict)
Index: WAeUP_SRP/trunk/skins/waeup_student/book_accommodation_form.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/book_accommodation_form.pt	(revision 456)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<tal:block define="rendered_main options/rendered;
-                   portal_status_message options/psm;
-                   data_storage options/ds;
-                   jamb options/jamb/getContent|nothing;
-                   edition python:1;"
-                   >
-<metal:block define-macro="edit_form">
-<metal:block use-macro="here/content_lib_master/macros/master">
-  <metal:block fill-slot="header"
-    tal:define="creation creation|nothing;
-                edition edition|nothing;
-                metadata metadata|nothing"
-                >
-    </metal:block>
-
-    <metal:block fill-slot="main">
-        <h1>Book Your Accommodation!</h1>
-      <div tal:replace="structure rendered_main" />
-    </metal:block>
-  <metal:block fill-slot="sub">
-  </metal:block>
-
-</metal:block>
-</metal:block>
-</tal:block>
Index: WAeUP_SRP/trunk/skins/waeup_student/booked_accommodation.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/booked_accommodation.pt	(revision 456)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<html metal:use-macro="here/content_lib_master/macros/master">
-  <metal:block fill-slot="head_slot">
-  </metal:block>
-  <metal:block fill-slot="header">
-  </metal:block>
-  <metal:block fill-slot="main"
-               tal:define="acco options/v"
-               >
-    You have successfully booked bed nr <span tal:content="acco/beds_assigned" /> in <span tal:content="acco/heading" />.
-    <p>Your next steps:</p>
-    <ul>
-      <li>Buy a Hostel Fee Scratch Card</li>
-      <li>Login with your user id and password </li>
-      <li>Click 'Pay Hostel Fee'</li>
-    </ul>
-  </metal:block>
-  <metal:block fill-slot="sub">
-  </metal:block>
-</html>
Index: WAeUP_SRP/trunk/skins/waeup_student/check_admission.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/check_admission.py	(revision 456)
+++ 	(revision )
@@ -1,63 +1,0 @@
-##parameters=REQUEST
-# $Id$
-"""
-process the Admission Form
-return html renderer + psm
-"""
-import DateTime
-current = DateTime.DateTime()
-
-
-type_name = 'Jamb'
-ti = context.portal_types[type_name]
-
-REQUEST.set('type_name',type_name)
-
-validate = REQUEST.has_key("cpsdocument_edit_button")
-
-
-lt = context.portal_layouts
-pr = context.portal_registration
-
-res,psm,ds = lt.renderLayout(layout_id= 'admission',
-                      schema_id= 'student_admission',
-                      context=context,
-                      mapping=validate and REQUEST,
-                      ob={},
-                      layout_mode='create',
-                      action = "check_admission",
-                      submit = "check",
-                      )
-if psm == 'invalid':
-    return context.check_admission_form(rendered = res,
-                                 psm = "Please correct your input",
-                                 ds = ds,
-                                 )
-elif psm == '':
-    return context.check_admission_form(rendered = res,
-                                 psm = None,
-                                 ds = ds,
-                                 )
-elif psm == 'valid':
-    s_id = "s%s" % ds.get('jamb_id')
-    catalog = context.portal_catalog
-    search = catalog(SearchableText = "%s*" % s_id)
-    student = getattr(context,s_id,None)
-    if student is None:
-    #if len(search) < 1:
-        psm = "Your are not admitted"
-        return context.check_admission_form(rendered = res,
-                                 psm = psm, 
-                                 ds = ds,
-                                 )
-
-ds.set('sc_date',current)
-student.getContent().setScratchCardData('adm_check',ds)
-
-jamb = getattr(student,'JAMB')
-res = jamb.getContent().render(layout_id = 'admission_slip', 
-                               layout_mode = 'view',
-                               schema_id = 'jamb')
-
-return context.admission_slip_form(rendered = res, dict = ds)
-
Index: WAeUP_SRP/trunk/skins/waeup_student/clearance.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/clearance.py	(revision 456)
+++ 	(revision )
@@ -1,66 +1,0 @@
-##parameters=REQUEST
-# $Id$
-"""
-process the Admission Form
-return html renderer + psm
-"""
-import DateTime
-current = DateTime.DateTime()
-
-
-type_name = 'Jamb'
-ti = context.portal_types[type_name]
-
-REQUEST.set('type_name',type_name)
-
-validate = REQUEST.has_key("cpsdocument_edit_button")
-
-
-lt = context.portal_layouts
-pr = context.portal_registration
-
-res,psm,ds = lt.renderLayout(layout_id= 'clearance',
-                      schema_id= 'student_clearance',
-                      context=context,
-                      mapping=validate and REQUEST,
-                      ob={},
-                      layout_mode='create',
-                      action = "clearance",
-                      submit = "submit",
-                      )
-
-if psm == 'invalid':
-    return context.clearance_form(rendered = res,
-                                 psm = "Please correct your input",
-                                 ds = ds,
-                                 )
-elif psm == '':
-    return context.clearance_form(rendered = res,
-                                 psm = None,
-                                 ds = ds,
-                                 )
-elif psm == 'valid':
-    s_id = "s%s" % ds.get('jamb_id')
-    catalog = context.portal_catalog
-    search = catalog(SearchableText = "%s*" % s_id)
-    if len(search) < 1:
-        psm = "You are not admitted"
-        return context.clearance_form(rendered = res,
-                                 psm = psm,
-                                 ds = ds,
-                                 )
-    sf = getattr(context,s_id,None)
-    if sf and getattr(sf,'PERSONAL',None):
-        psm = "Your are already admitted, please login"
-        return context.clearance_form(rendered = res,
-                                 psm = psm,
-                                 ds = ds,
-                                 )
-    rset = REQUEST.set
-    student = getattr(context,s_id)
-    ds.set('sc_date',current)
-    student.getContent().setScratchCardData('clearance',ds)
-    sc_pin =  ds.get('sc_pin')
-    #return REQUEST.RESPONSE.redirect("%s/logged_in?__ac_name=%s&__ac_password=UnSeT&sc_pin=%s"
-    return REQUEST.RESPONSE.redirect("%s/logged_in?__ac_name=%s&__ac_password=123456&sc_pin=%s"
-                                    % (context.absolute_url(),s_id,sc_pin))
Index: WAeUP_SRP/trunk/skins/waeup_student/clearance_form.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/clearance_form.pt	(revision 456)
+++ 	(revision )
@@ -1,30 +1,0 @@
-<tal:block define="rendered_main options/rendered;
-                   portal_status_message options/psm;
-                   data_storage options/ds;
-                   jamb options/jamb/getContent|nothing;
-                   edition python:1;"
-                   >
-<metal:block define-macro="edit_form">
-<metal:block use-macro="here/content_lib_master/macros/master">
-  <metal:block fill-slot="header"
-    tal:define="creation creation|nothing;
-                edition edition|nothing;
-                metadata metadata|nothing"
-                >
-    </metal:block>
-      <metal:block fill-slot="main">
-        <h1>Start Clearance Process!</h1>
-        <div tal:replace="structure rendered_main" />
-          <p>Instructions :</p>
-          <ul>
-            <li>Buy a Clearance Scratch Card </li> 
-            <li>Enter the PIN here </li> 
-            <li>Proceed to the Clearance Eligibility Online Form and fill your O/L details </li> 
-            <li>Proceed to the Univesity with all original documents for clearance to finalize the clearance process</li>
-          </ul>
-      </metal:block>
-      <metal:block fill-slot="sub">
-      </metal:block>
-    </metal:block>
-  </metal:block>
-</tal:block>
Index: WAeUP_SRP/trunk/skins/waeup_student/create_jamb.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/create_jamb.py	(revision 456)
+++ 	(revision )
@@ -1,63 +1,0 @@
-##parameters=REQUEST=None
-# $Id$
-"""
-Create an the Jamb-Record for a Student
-
-"""
-
-type_name = 'Jamb'
-ti = context.portal_types[type_name]
-pr = context.portal_registration
-pm = context.portal_membership
-
-REQUEST.set('type_name',type_name)
-
-validate = REQUEST.has_key("cpsdocument_edit_button")
-
-lt = context.portal_layouts
-
-res,psm,ds = lt.renderLayout(layout_id= 'jambcreate',
-                      schema_id= 'jamb',
-                      context=context,
-                      mapping=validate and REQUEST,
-                      ob={},
-                      layout_mode='create',
-                      )
-if psm == 'invalid':
-    return context.create_jamb_form(rendered = res,
-                                 psm = 'Please correct your errors',
-                                 ds = ds,
-                                 )
-elif psm == '':
-    return context.create_jamb_form(rendered = res,
-                                 psm = psm,
-                                 ds = ds,
-                                 )
-    
-elif psm == 'valid':
-    s_id = "s%s" % ds.get('reg_nr')
-    skw = {'title': "%(firstname)s %(lastname)s" % ds}
-    context.invokeFactory('Student',s_id) 
-    student = getattr(context,s_id)    
-    student.getContent().edit(mapping=skw)
-    context.notifyCPSDocumentCreation(ob=student)
-    jamb_id = 'JAMB'
-    student.invokeFactory('Jamb',jamb_id) 
-    jamb = getattr(student,jamb_id)    
-    ds.set('title', "%(reg_nr)s (%(lastname)s)" % ds)
-    jamb.getContent().edit(mapping=ds)
-    context.notifyCPSDocumentCreation(ob=jamb)
-    psm = 'Student created'
-    noCPSMember = False
-    try:
-        #pr.addMember(s_id, 'UnSeT',roles=('Member','CPSMember','Student','Contributor'))
-        pr.addMember(s_id, '123456',roles=('Member','CPSMember','Contributor'))
-    except:
-        noCPSMember = True
-    if noCPSMember:
-        #pr.addMember(s_id, 'UnSeT',roles=('Member','Student','Contributor',))
-        pr.addMember(s_id, '123456',roles=('Member','Contributor',))
-    student.manage_setLocalRoles(s_id, ['Owner',])
-    jamb.manage_setLocalRoles(s_id, ['Owner',])
-    return context.students_folder_view_manager(psm=psm)
-
Index: WAeUP_SRP/trunk/skins/waeup_student/create_jamb_form.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/create_jamb_form.pt	(revision 456)
+++ 	(revision )
@@ -1,22 +1,0 @@
-<tal:block define="rendered_main options/rendered;
-                   portal_status_message options/psm;"
-                   >
-<metal:block define-macro="edit_form">
-<metal:block use-macro="here/content_lib_master/macros/master">
-  <metal:block fill-slot="header"
-    tal:define="creation creation|nothing;
-                edition python:1;
-                metadata metadata|nothing"
-                >
-    </metal:block>
-
-    <metal:block fill-slot="main">
-      <h1>Enter the JAMB Data for a Student </h1>
-      <div tal:replace="structure rendered_main" />
-    </metal:block>
-  <metal:block fill-slot="sub">
-  </metal:block>
-
-</metal:block>
-</metal:block>
-</tal:block>
Index: WAeUP_SRP/trunk/skins/waeup_student/create_personal_form.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/create_personal_form.pt	(revision 456)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<html metal:use-macro="here/content_lib_master/macros/master">
-
-  <metal:block fill-slot="head_slot">
-    <tal:block tal:define="student here/getContent">
-    </tal:block>
-  </metal:block>
-
-  <metal:block fill-slot="css_slot">
-    <link rel="Stylesheet" type="text/css" href=""
-          tal:attributes="href string:${base_url}student.css" />
-  </metal:block>
-
-  <metal:block fill-slot="main"
-               tal:define="items here/contentValues"
-               >
-    <form action="content_create" tal:attributes="action string:${here_url}/content_create"
-          method="post" class="group">
-      <dt>
-        <input type="hidden" name="type_name" value="StudentPersonal" /> 
-      <p>
-        <input id="objectTitle" type="text" name="Title" value="personal" class="focus" size="40" />
-        <input type="submit" class="standalone searchButton" value="create" />
-      </p>
-    </form>
-  </metal:block>
-</html>
Index: WAeUP_SRP/trunk/skins/waeup_student/create_student.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/create_student.py	(revision 456)
+++ 	(revision )
@@ -1,76 +1,0 @@
-##parameters=type_name, REQUEST=None, **kw
-# $Id$
-"""
-Create an object.
-
-FIXME: what are the parameters?
-"""
-
-from urllib import urlencode
-
-##for k,v in kw.items():
-##    print k,v
-##return printed
-
-if REQUEST is not None:
-    kw.update(REQUEST.form)
-    # Use creation without empty object.
-    # XXX should find better
-    ti = getattr(context.portal_types, type_name)
-    # For cpsdocument
-    if ti.meta_type == 'CPS Flexible Type Information':
-        args = {'type_name': type_name}
-        # XXX pass prefilled title, a bit of a hack...
-        args['widget__Title'] = kw.get('title', '')
-
-        # Look for the create action on the ti
-        create_action_form = ti.getActionById('create', 'cpsdocument_create_form')
-
-        return REQUEST.RESPONSE.redirect('%s/%s?%s'
-                                         % (context.absolute_url(),
-                                            create_action_form,
-                                            urlencode(args)))
-
-
-if REQUEST and not kw.get('title'):
-    # Need a title before creating folders
-    if type_name in ('Section', 'Workspace'):
-        args = {'type_name': type_name}
-        return REQUEST.RESPONSE.redirect('%s/folder_edit_form?%s' %
-                                (context.absolute_url(), urlencode(args)))
-
-
-id = kw.get('title', 'my_sdfsdfdsf' + type_name)
-id = context.computeId(compute_from=id)
-
-context.invokeFactory(type_name, id)
-ob = getattr(context, id)
-
-try:
-    doc = ob.getEditableContent()
-except AttributeError:
-    # not a proxy
-    doc = ob
-else:
-    try:
-        doc.edit(proxy=ob, **kw)
-    except:
-        # CMF Compatibility.
-        # type_name not necessarly and edit method
-        # for CMF types is not aware about that.
-        if kw.has_key('type_name'):
-            del kw['type_name']
-        doc.edit(**kw)
-
-context.portal_eventservice.notifyEvent('modify_object', context, {})
-context.portal_eventservice.notifyEvent('modify_object', ob, {})
-
-
-if REQUEST is not None:
-    psm = 'psm_content_created'
-    action_path = doc.getTypeInfo().immediate_view # getActionById('metadata')
-    REQUEST.RESPONSE.redirect('%s/%s?portal_status_message=%s' %
-                              (ob.absolute_url(), action_path,
-                               psm))
-
-return id
Index: WAeUP_SRP/trunk/skins/waeup_student/create_student_form.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/create_student_form.pt	(revision 456)
+++ 	(revision )
@@ -1,30 +1,0 @@
-<html metal:use-macro="here/content_lib_master/macros/master">
-
-  <metal:block fill-slot="head_slot">
-    <tal:block tal:define="student here/getContent">
-    </tal:block>
-  </metal:block>
-
-  <metal:block fill-slot="css_slot">
-    <link rel="Stylesheet" type="text/css" href=""
-          tal:attributes="href string:${base_url}student.css" />
-  </metal:block>
-
-  <metal:block fill-slot="main"
-               tal:define="items here/contentValues"
-               >
-    <form action="content_create" tal:attributes="action string:${here_url}/create_student"
-          method="post" class="group">
-      <dt>
-        <input type="hidden" name="type_name" value="Student" /> 
-      <p>
-        <label for="objectTitle">
-          <strong>Studentname</strong>
-        </label>
-
-        <input id="objectTitle" type="text" name="title" class="focus" size="40" />
-        <input type="submit" class="standalone searchButton" value="create" />
-      </p>
-    </form>
-  </metal:block>
-</html>
Index: WAeUP_SRP/trunk/skins/waeup_student/eligibility.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/eligibility.py	(revision 456)
+++ 	(revision )
@@ -1,81 +1,0 @@
-##parameters=REQUEST=None
-# $Id$
-"""
-process the Admission Form
-return html renderer + psm
-"""
-request = REQUEST
-rget = request.get
-rset = request.set
-fget = request.form.get
-form = request.form
-fhas = request.form.has_key
-
-
-lt = context.portal_layouts
-pr = context.portal_registration
-pm = context.portal_membership
-eli = context.ELIGIBILITY.getContent()
-sr = eli.schoolresults
-
-validate = fhas('add') or fhas('change') or fhas('delete')
-data = {'faculty': eli.faculty,
-        'course': eli.course,
-        'jamb_aggregate': eli.jamb_aggregate,
-        }
-res,psm,ds = lt.renderLayout(layout_id= 'student_eligibility',
-                      schema_id= 'student_eligibility',
-                      context=context,
-                      mapping=validate and request,
-                      ob=data,
-                      layout_mode='create',
-                      formaction = "eligibility",
-                      schoolresults = sr,
-                      )
-if psm == 'invalid':
-    return context.eligibility_form(rendered = res,
-                                 psm = 'Please correct your errors',
-                                 ds = ds,
-                                 )
-elif psm == '':
-    return context.eligibility_form(rendered = res,
-                                 psm = psm,
-                                 ds = ds,
-                                 )
-inr = 0
-if fhas('add') and (fget('type') or fget('subject') or fget('result')):
-    sr.append((fget('type'),fget('subject'),fget('result')))
-    psm = "new result added"
-elif fhas('change') and fget('keys'):
-    for k in fget('keys'):
-        sr[int(k)] = (fget('type_%s' % k),fget('subject_%s' % k),fget('result_%s' % k))
-        inr += 1
-    psm = "%s items changed" % inr
-elif fhas('delete') and fget('keys'):
-    new = []
-    todelete = fget('keys')
-    for k in range(len(sr)):
-        if str(k) not in todelete:
-            new.append(sr[k])
-    inr = len(todelete)
-    sr = new
-    psm = "%s items deleted" % inr
-elif psm == 'valid':
-    psm = "Your changes have been saved."
-
-ds.set('schoolresults',sr)
-eli.edit(mapping=ds)
-res,dummy,fds = lt.renderLayout(layout_id= 'student_eligibility',
-                      schema_id= 'student_eligibility',
-                      context=context,
-                      mapping=request,
-                      ob={},
-                      layout_mode='create',
-                      formaction = "eligibility",
-                      schoolresults = sr,
-                      )
-
-return context.eligibility_form(rendered = res,
-                                 #psm = "%s <br /> %s" % (str(ds),str(lt.student_eligibility.getLayoutDefinition()))
-                                 psm = psm,
-                                 )
Index: WAeUP_SRP/trunk/skins/waeup_student/eligibility_form.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/eligibility_form.pt	(revision 456)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<tal:block define="rendered_main options/rendered;
-                   portal_status_message options/psm;
-                   jamb options/jamb/getContent|nothing;
-                   edition python:1;"
-                   >
-<metal:block define-macro="edit_form">
-<metal:block use-macro="here/content_lib_master/macros/master">
-  <metal:block fill-slot="header"
-    tal:define="creation creation|nothing;
-                edition edition|nothing;
-                metadata metadata|nothing"
-                >
-    </metal:block>
-      <metal:block fill-slot="main">
-        <div tal:replace="structure rendered_main" />
-      </metal:block>
-      <metal:block fill-slot="sub">
-      </metal:block>
-    </metal:block>
-  </metal:block>
-</tal:block>
Index: WAeUP_SRP/trunk/skins/waeup_student/jamb_index_html.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/jamb_index_html.py	(revision 456)
+++ 	(revision )
@@ -1,15 +1,0 @@
-##parameters=post_id=None, REQUEST=None
-
-# $Id$
-
-"""Default view for the Student."""
-member = context.portal_membership.getAuthenticatedMember()
-
-#return context.student_view_manager()
-if not context.portal_membership.isAnonymousUser:
-    roles = member.getRoles()
-    if 'Manager' in roles:
-        return context.cpsdocument_view()
-    elif 'StudentManager' in roles:
-        return context.jamb_view_manager()
-return context.jamb_view_student()
Index: WAeUP_SRP/trunk/skins/waeup_student/jamb_view_manager.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/jamb_view_manager.pt	(revision 456)
+++ 	(revision )
@@ -1,31 +1,0 @@
-<metal:block define-macro="view">
-<metal:block use-macro="here/content_lib_master/macros/master">
-  <metal:block fill-slot="header">
-  </metal:block>
-
-  <metal:block fill-slot="css_slot">
-    <link rel="Stylesheet" type="text/css" href=""
-      tal:attributes="href string:${base_url}document.css" />
-    <link rel="Stylesheet" type="text/css" href=""
-      tal:attributes="href string:${base_url}forum.css" />
-  </metal:block>
-
-  <metal:block fill-slot="main">
-    <tal:block tal:content="structure rendered_main|python:doc.render(proxy=here)" />
-
-    <tal:block tal:condition="python:hasattr(here,'portal_discussion') and
-      hasattr(here.portal_discussion, 'isCommentingAllowedFor')">
-      <tal:block tal:define="comments_allowed
-        python:here.portal_discussion.isCommentingAllowedFor(here);"
-        tal:condition="comments_allowed">
-        <metal:block
-          use-macro="here/forum_comment_lib_view_comments_inline/macros/view_comments_inline" />
-      </tal:block>
-    </tal:block>
-
-  </metal:block>
-  <metal:block fill-slot="sub">
-  </metal:block>
-
-</metal:block>
-</metal:block>
Index: WAeUP_SRP/trunk/skins/waeup_student/jamb_view_student.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/jamb_view_student.pt	(revision 456)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<metal:block define-macro="view">
-<metal:block use-macro="here/content_lib_master/macros/master">
-  <metal:block fill-slot="header">
-  </metal:block>
-
-  <metal:block fill-slot="css_slot">
-    <link rel="Stylesheet" type="text/css" href=""
-      tal:attributes="href string:${base_url}document.css" />
-    <link rel="Stylesheet" type="text/css" href=""
-      tal:attributes="href string:${base_url}forum.css" />
-  </metal:block>
-
-  <metal:block fill-slot="main">
-      
-    <tal:block tal:content="structure rendered_main|python:doc.render(proxy=here)" />
-
-    <tal:block tal:condition="python:hasattr(here,'portal_discussion') and
-      hasattr(here.portal_discussion, 'isCommentingAllowedFor')">
-      <tal:block tal:define="comments_allowed
-        python:here.portal_discussion.isCommentingAllowedFor(here);"
-        tal:condition="comments_allowed">
-        <metal:block
-          use-macro="here/forum_comment_lib_view_comments_inline/macros/view_comments_inline" />
-      </tal:block>
-    </tal:block>
-
-  </metal:block>
-  <metal:block fill-slot="sub">
-  </metal:block>
-
-</metal:block>
-</metal:block>
Index: WAeUP_SRP/trunk/skins/waeup_student/layout_admission_status_create.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/layout_admission_status_create.pt	(revision 456)
+++ 	(revision )
@@ -1,83 +1,0 @@
-<tal:block define="global creation python:1" />
-<metal:block define-macro="default_edit"
-             tal:define="layout options/layout;
-             ds options/datastructure;
-             creation creation|nothing;
-             metadata metadata|nothing;
-             type_name request/type_name|nothing;
-             ti python:type_name and getattr(here.portal_types,type_name,None) or getattr(here.portal_types,here.portal_type,None);
-             creation_form python:ti and ti.getActionById('create', 'cpsdocument_create_form') or 'cpsdocument_create_form' ;
-             edit_form     python:ti and ti.getActionById('edit',   'cpsdocument_edit_form') or  'cpsdocument_edit_form';
-             metadata_form python:ti and ti.getActionById('metadata', 'cpsdocument_metadata') or 'cpsdocument_metadata';
-             formaction string:check_admission_form;
-             first_layout options/first_layout|python:0;
-             last_layout options/last_layout|python:0;
-             is_flexible options/is_flexible;
-             cpsmcat nocall:here/translation_service;
-             "
-             >
-  <form action='admission_status' method='post'
-        enctype='multipart/form-data' class='workflow'>
-    <div class=''>
-      <div class='documentFields'>
-        <table width="100%" cellpadding="2" cellspacing="2" summary="Form layout">
-          <tr tal:repeat="row layout/rows" valign="top">
-            <td tal:repeat="cell row"
-                tal:attributes="colspan cell/ncols">
-              <tal:block define="widget cell/widget;
-              wid widget/getWidgetId;
-              dm options/datastructure/getDataModel;
-              err python:ds.getError(wid);
-              err_mapping python:ds.getErrorMapping(wid);
-              is_required widget/is_required|nothing;
-              tooltip_id python:wid + '_help';
-              widget_css_class cell/widget_css_class|nothing;
-              widget_css_class python:test(is_flexible, 'group', widget_css_class);
-              css_class python:test(err, 'row error',
-              test(is_flexible, 'group', 'row'))"
-              >
-                <div tal:attributes="class widget_css_class;
-                id python:widget.getHtmlWidgetId()+'_widget';"
-                >
-                  <div class="label" tal:condition="widget/label_edit"
-                       tal:attributes="class python:test(is_required, 'label required','label')">
-                    <label i18n:translate="" tal:condition="widget/is_i18n"
-                           tal:content="widget/label_edit"
-                           tal:attributes="for cell/widget_input_area_id|nothing;">label</label>
-                    <label tal:condition="not:widget/is_i18n"
-                           tal:content="widget/label_edit"
-                           tal:attributes="for cell/widget_input_area_id|nothing;">label</label>
-                  </div>
-                  <button type="button" class="tooltipControl"
-                          tal:condition="widget/help"
-                          tal:attributes="onclick python:'toggleElementVisibility(\'%s\')' % tooltip_id;"> ? </button>
-                  <div class="field">
-                    <div tal:replace="structure cell/widget_rendered"/>
-                  </div>
-                  <div class="tooltipArea" style="visibility: hidden;"
-                       tal:condition="widget/help"
-                       tal:attributes="id tooltip_id;
-                       onclick python:'showElement(false, \'%s\')' % tooltip_id;"
-                       >
-                    <tal:block i18n:translate="" tal:condition="widget/is_i18n"
-                               tal:content="widget/help">i18_key-help_for_this_field</tal:block>
-                    <tal:block tal:condition="not:widget/is_i18n"
-                               tal:content="widget/help">This is the help for this field</tal:block>
-                  </div>
-                  <tal:block condition="err">
-                    <tal:block define="msg python:cpsmcat(err, mapping=err_mapping)">
-                      <br /><em style="color: red"
-                                tal:content="msg">err</em>
-                    </tal:block>
-                  </tal:block>
-                </div>
-              </tal:block>
-            </td>
-          </tr>
-        </table>
-        <input type="submit" class="standalone" name="cpsdocument_edit_button" value="GO" />
-      </div>        
-    </div>
-  </form>
-</metal:block>
-  
Index: WAeUP_SRP/trunk/skins/waeup_student/layout_check_pin_create.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/layout_check_pin_create.pt	(revision 460)
+++ WAeUP_SRP/trunk/skins/waeup_student/layout_check_pin_create.pt	(revision 460)
@@ -0,0 +1,85 @@
+<tal:block define="global creation python:1" />
+<metal:block define-macro="default_edit"
+             tal:define="layout options/layout;
+             ds options/datastructure;
+             creation creation|nothing;
+             metadata metadata|nothing;
+             type_name request/type_name|nothing;
+             ti python:type_name and getattr(here.portal_types,type_name,None) or getattr(here.portal_types,here.portal_type,None);
+             creation_form python:ti and ti.getActionById('create', 'cpsdocument_create_form') or 'cpsdocument_create_form' ;
+             edit_form     python:ti and ti.getActionById('edit',   'cpsdocument_edit_form') or  'cpsdocument_edit_form';
+             metadata_form python:ti and ti.getActionById('metadata', 'cpsdocument_metadata') or 'cpsdocument_metadata';
+             formaction options/formaction;
+             first_layout options/first_layout|python:0;
+             last_layout options/last_layout|python:0;
+             is_flexible options/is_flexible;
+             cpsmcat nocall:here/translation_service;
+             "
+             >
+  <form action='some' method='post'
+        enctype='multipart/form-data' 
+        class='workflow'
+        tal:attributes="action formaction">
+    <div class=''>
+      <div class='documentFields'>
+        <table width="100%" cellpadding="2" cellspacing="2" summary="Form layout">
+          <tr tal:repeat="row layout/rows" valign="top">
+            <td tal:repeat="cell row"
+                tal:attributes="colspan cell/ncols">
+              <tal:block define="widget cell/widget;
+              wid widget/getWidgetId;
+              dm options/datastructure/getDataModel;
+              err python:ds.getError(wid);
+              err_mapping python:ds.getErrorMapping(wid);
+              is_required widget/is_required|nothing;
+              tooltip_id python:wid + '_help';
+              widget_css_class cell/widget_css_class|nothing;
+              widget_css_class python:test(is_flexible, 'group', widget_css_class);
+              css_class python:test(err, 'row error',
+              test(is_flexible, 'group', 'row'))"
+              >
+                <div tal:attributes="class widget_css_class;
+                id python:widget.getHtmlWidgetId()+'_widget';"
+                >
+                  <div class="label" tal:condition="widget/label_edit"
+                       tal:attributes="class python:test(is_required, 'label required','label')">
+                    <label i18n:translate="" tal:condition="widget/is_i18n"
+                           tal:content="widget/label_edit"
+                           tal:attributes="for cell/widget_input_area_id|nothing;">label</label>
+                    <label tal:condition="not:widget/is_i18n"
+                           tal:content="widget/label_edit"
+                           tal:attributes="for cell/widget_input_area_id|nothing;">label</label>
+                  </div>
+                  <button type="button" class="tooltipControl"
+                          tal:condition="widget/help"
+                          tal:attributes="onclick python:'toggleElementVisibility(\'%s\')' % tooltip_id;"> ? </button>
+                  <div class="field">
+                    <div tal:replace="structure cell/widget_rendered"/>
+                  </div>
+                  <div class="tooltipArea" style="visibility: hidden;"
+                       tal:condition="widget/help"
+                       tal:attributes="id tooltip_id;
+                       onclick python:'showElement(false, \'%s\')' % tooltip_id;"
+                       >
+                    <tal:block i18n:translate="" tal:condition="widget/is_i18n"
+                               tal:content="widget/help">i18_key-help_for_this_field</tal:block>
+                    <tal:block tal:condition="not:widget/is_i18n"
+                               tal:content="widget/help">This is the help for this field</tal:block>
+                  </div>
+                  <tal:block condition="err">
+                    <tal:block define="msg python:cpsmcat(err, mapping=err_mapping)">
+                      <br /><em style="color: red"
+                                tal:content="msg">err</em>
+                    </tal:block>
+                  </tal:block>
+                </div>
+              </tal:block>
+            </td>
+          </tr>
+        </table>
+        <input type="submit" class="standalone" name="cpsdocument_edit_button" value="GO" />
+      </div>        
+    </div>
+  </form>
+</metal:block>
+  
Index: WAeUP_SRP/trunk/skins/waeup_student/layout_eligibility_create.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/layout_eligibility_create.pt	(revision 456)
+++ 	(revision )
@@ -1,174 +1,0 @@
-<tal:block define="global creation python:1" />
-<metal:block define-macro="default_edit"
-             tal:define="layout options/layout;
-             ds options/datastructure;
-             creation creation|nothing;
-             metadata metadata|nothing;
-             type_name request/type_name|nothing;
-             ti python:type_name and getattr(here.portal_types,type_name,None) or getattr(here.portal_types,here.portal_type,None);
-             creation_form python:ti and ti.getActionById('create', 'cpsdocument_create_form') or 'cpsdocument_create_form' ;
-             edit_form     python:ti and ti.getActionById('edit',   'cpsdocument_edit_form') or  'cpsdocument_edit_form';
-             metadata_form python:ti and ti.getActionById('metadata', 'cpsdocument_metadata') or 'cpsdocument_metadata';
-             formaction options/formaction;
-             first_layout options/first_layout|python:0;
-             last_layout options/last_layout|python:0;
-             is_flexible options/is_flexible;
-             cpsmcat nocall:here/translation_service;
-             results options/schoolresults;
-             "
-             >
-  <form action='eligibility' method='post' tal:attributes="action formaction"
-        enctype='multipart/form-data' class='workflow'>
-    <div class=''>
-      <div class='documentFields'>
-        <table width="100%" cellpadding="2" cellspacing="2" summary="Form layout">
-          <tr tal:repeat="row layout/rows" valign="top">
-            <td tal:repeat="cell row"
-                tal:attributes="colspan cell/ncols">
-              <tal:block define="widget cell/widget;
-              wid widget/getWidgetId;
-              dm options/datastructure/getDataModel;
-              err python:ds.getError(wid);
-              err_mapping python:ds.getErrorMapping(wid);
-              is_required widget/is_required|nothing;
-              tooltip_id python:wid + '_help';
-              widget_css_class cell/widget_css_class|nothing;
-              widget_css_class python:test(is_flexible, 'group', widget_css_class);
-              css_class python:test(err, 'row error',
-              test(is_flexible, 'group', 'row'))"
-              >
-                <div tal:attributes="class widget_css_class;
-                id python:widget.getHtmlWidgetId()+'_widget';"
-                >
-                  <div class="label" tal:condition="widget/label_edit"
-                       tal:attributes="class python:test(is_required, 'label required','label')">
-                    <label i18n:translate="" tal:condition="widget/is_i18n"
-                           tal:content="widget/label_edit"
-                           tal:attributes="for cell/widget_input_area_id|nothing;">label</label>
-                    <label tal:condition="not:widget/is_i18n"
-                           tal:content="widget/label_edit"
-                           tal:attributes="for cell/widget_input_area_id|nothing;">label</label>
-                  </div>
-                  <button type="button" class="tooltipControl"
-                          tal:condition="widget/help"
-                          tal:attributes="onclick python:'toggleElementVisibility(\'%s\')' % tooltip_id;"> ? </button>
-                  <div class="field">
-                    <div tal:replace="structure cell/widget_rendered"/>
-                  </div>
-                  <div class="tooltipArea" style="visibility: hidden;"
-                       tal:condition="widget/help"
-                       tal:attributes="id tooltip_id;
-                       onclick python:'showElement(false, \'%s\')' % tooltip_id;"
-                       >
-                    <tal:block i18n:translate="" tal:condition="widget/is_i18n"
-                               tal:content="widget/help">i18_key-help_for_this_field</tal:block>
-                    <tal:block tal:condition="not:widget/is_i18n"
-                               tal:content="widget/help">This is the help for this field</tal:block>
-                  </div>
-                  <tal:block condition="err">
-                    <tal:block define="msg python:cpsmcat(err, mapping=err_mapping)">
-                      <br /><em style="color: red"
-                                tal:content="msg">err</em>
-                    </tal:block>
-                  </tal:block>
-                </div>
-              </tal:block>
-            </td>
-          </tr>
-        </table>
-    <table cellspacing="0" cellpadding="2" border="0" width="100%" tal:condition="results|nothing">
-      <tr>
-        <td align="left" valign="top">
-          &nbsp;
-        </td>
-        <td align="left" valign="top">
-          <div class="label">Type</div>
-        </td>
-        <td align="left" valign="top">
-          <div class="label">Subject</div>
-        </td>
-        <td align="left" valign="top">
-          <div class="label">Result</div>
-        </td>
-      </tr>
-      <span tal:repeat="row results" tal:omit-tag="">
-        <tr tal:define="rindex repeat/row/index">
-          <td align="left" valign="top">
-            <input type="checkbox" name="keys:list" value="100" tal:attributes="value string:${repeat/row/index}"/>
-          </td>
-          <td align="left" valign="top">
-            <div class="field">
-              <input type="text" name="key_0" value="100" size="20" 
-                     tal:attributes="name string:type_${rindex};value python:row[0]" />
-            </div>
-          </td>
-          <td align="left">
-            <div class="field">
-              <input type="text" name="label_0" value="Year 1 (100 Level)" size="40" 
-                     tal:attributes="name string:subject_${rindex};value python:row[1]" />
-            </div>
-          </td>
-          <td align="left">
-            <div class="field">
-              <input type="text" name="msgid_0" value="" size="10" 
-                     tal:attributes="name string:result_${rindex};value python:row[2]" />
-            </div>
-          </td>
-        </tr>
-      </span>
-      <tr>
-        <td align="left" colspan="3">
-          <input class="standalone" type="submit" name="change" value=" Change " />
-          <input class="standalone" type="submit" name="delete" value=" Delete " />
-        </td>
-      </tr>
-    </table>
-    <table cellspacing="0" cellpadding="2" border="0" width="100%">
-      <tr>
-        <td align="left" valign="top" colspan="2">
-          <div>Add a new post-primary school result:</div>
-        </td>
-      </tr>
-      <tr>
-        <td align="left" valign="top">
-          &nbsp;
-        </td>
-        <td align="left" valign="top">
-          <div class="label">Type</div>
-        </td>
-        <td align="left" valign="top">
-          <div class="label">Subject</div>
-        </td>
-        <td align="left" valign="top">
-          <div class="label">Result</div>
-        </td>
-      </tr>
-      <tr>
-        <td align="left" valign="top">
-          &nbsp;
-        </td>
-        <td align="left" valign="top">
-          <div  class="field">
-            <input type="text" name="type" value="" size="20" /> 
-          </div>
-        </td>
-        <td align="left">
-          <div  class="field">
-            <input type="text" name="subject" value="" size="40" />
-          </div>
-        </td>
-        <td align="left">
-          <div  class="field">
-            <input type="text" name="result" value="" size="10" />
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <td align="left" colspan="3">
-          <input class="standalone" type="submit" name="add" value=" Change/Add " />
-        </td>
-      </tr>
-    </table>
-  </form>
-</metal:block>
-  
Index: WAeUP_SRP/trunk/skins/waeup_student/layout_jambcreate_create.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/layout_jambcreate_create.pt	(revision 456)
+++ 	(revision )
@@ -1,83 +1,0 @@
-<tal:block define="global creation python:1" />
-<metal:block define-macro="default_edit"
-             tal:define="layout options/layout;
-             ds options/datastructure;
-             creation creation|nothing;
-             metadata metadata|nothing;
-             type_name request/type_name|nothing;
-             ti python:type_name and getattr(here.portal_types,type_name,None) or getattr(here.portal_types,here.portal_type,None);
-             creation_form python:ti and ti.getActionById('create', 'cpsdocument_create_form') or 'cpsdocument_create_form' ;
-             edit_form     python:ti and ti.getActionById('edit',   'cpsdocument_edit_form') or  'cpsdocument_edit_form';
-             metadata_form python:ti and ti.getActionById('metadata', 'cpsdocument_metadata') or 'cpsdocument_metadata';
-             formaction string:check_admission_form;
-             first_layout options/first_layout|python:0;
-             last_layout options/last_layout|python:0;
-             is_flexible options/is_flexible;
-             cpsmcat nocall:here/translation_service;
-             "
-             >
-  <form action='create_jamb' method='post'
-        enctype='multipart/form-data' class='workflow'>
-    <div class=''>
-      <div class='documentFields'>
-        <table width="100%" cellpadding="2" cellspacing="2" summary="Form layout">
-          <tr tal:repeat="row layout/rows" valign="top">
-            <td tal:repeat="cell row"
-                tal:attributes="colspan cell/ncols">
-              <tal:block define="widget cell/widget;
-              wid widget/getWidgetId;
-              dm options/datastructure/getDataModel;
-              err python:ds.getError(wid);
-              err_mapping python:ds.getErrorMapping(wid);
-              is_required widget/is_required|nothing;
-              tooltip_id python:wid + '_help';
-              widget_css_class cell/widget_css_class|nothing;
-              widget_css_class python:test(is_flexible, 'group', widget_css_class);
-              css_class python:test(err, 'row error',
-              test(is_flexible, 'group', 'row'))"
-              >
-                <div tal:attributes="class widget_css_class;
-                id python:widget.getHtmlWidgetId()+'_widget';"
-                >
-                  <div class="label" tal:condition="widget/label_edit"
-                       tal:attributes="class python:test(is_required, 'label required','label')">
-                    <label i18n:translate="" tal:condition="widget/is_i18n"
-                           tal:content="widget/label_edit"
-                           tal:attributes="for cell/widget_input_area_id|nothing;">label</label>
-                    <label tal:condition="not:widget/is_i18n"
-                           tal:content="widget/label_edit"
-                           tal:attributes="for cell/widget_input_area_id|nothing;">label</label>
-                  </div>
-                  <button type="button" class="tooltipControl"
-                          tal:condition="widget/help"
-                          tal:attributes="onclick python:'toggleElementVisibility(\'%s\')' % tooltip_id;"> ? </button>
-                  <div class="field">
-                    <div tal:replace="structure cell/widget_rendered"/>
-                  </div>
-                  <div class="tooltipArea" style="visibility: hidden;"
-                       tal:condition="widget/help"
-                       tal:attributes="id tooltip_id;
-                       onclick python:'showElement(false, \'%s\')' % tooltip_id;"
-                       >
-                    <tal:block i18n:translate="" tal:condition="widget/is_i18n"
-                               tal:content="widget/help">i18_key-help_for_this_field</tal:block>
-                    <tal:block tal:condition="not:widget/is_i18n"
-                               tal:content="widget/help">This is the help for this field</tal:block>
-                  </div>
-                  <tal:block condition="err">
-                    <tal:block define="msg python:cpsmcat(err, mapping=err_mapping)">
-                      <br /><em style="color: red"
-                                tal:content="msg">err</em>
-                    </tal:block>
-                  </tal:block>
-                </div>
-              </tal:block>
-            </td>
-          </tr>
-        </table>
-        <input type="submit" class="standalone" name="cpsdocument_edit_button" value="add" />
-      </div>        
-    </div>
-  </form>
-</metal:block>
-  
Index: WAeUP_SRP/trunk/skins/waeup_student/layout_personal_edit.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/layout_personal_edit.pt	(revision 456)
+++ 	(revision )
@@ -1,1 +1,0 @@
-<metal:block use-macro="here/waeup_layout_lib/macros/default_edit" />
Index: WAeUP_SRP/trunk/skins/waeup_student/layout_personal_view.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/layout_personal_view.pt	(revision 456)
+++ 	(revision )
@@ -1,1 +1,0 @@
-<metal:block use-macro="here/waeup_layout_lib/macros/table_view" />
Index: WAeUP_SRP/trunk/skins/waeup_student/layout_results_create.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/layout_results_create.pt	(revision 456)
+++ 	(revision )
@@ -1,117 +1,0 @@
-<tal:block define="global creation python:1" />
-<metal:block define-macro="default_edit"
-             tal:define="layout options/layout;
-             ds options/datastructure;
-             creation creation|nothing;
-             metadata metadata|nothing;
-             type_name request/type_name|nothing;
-             ti python:type_name and getattr(here.portal_types,type_name,None) or getattr(here.portal_types,here.portal_type,None);
-             creation_form python:ti and ti.getActionById('create', 'cpsdocument_create_form') or 'cpsdocument_create_form' ;
-             edit_form     python:ti and ti.getActionById('edit',   'cpsdocument_edit_form') or  'cpsdocument_edit_form';
-             metadata_form python:ti and ti.getActionById('metadata', 'cpsdocument_metadata') or 'cpsdocument_metadata';
-             formaction options/formaction;
-             first_layout options/first_layout|python:0;
-             last_layout options/last_layout|python:0;
-             is_flexible options/is_flexible;
-             cpsmcat nocall:here/translation_service;
-             results options/schoolresults;
-             "
-             >
-  <form action='eligibility' method='post' tal:attributes="action formaction"
-        enctype='multipart/form-data' class='workflow'>
-    <table cellspacing="0" cellpadding="2" border="0" width="100%" tal:condition="results|nothing">
-      <tr>
-        <td align="left" valign="top">
-          &nbsp;
-        </td>
-        <td align="left" valign="top">
-          <div class="label">Type</div>
-        </td>
-        <td align="left" valign="top">
-          <div class="label">Subject</div>
-        </td>
-        <td align="left" valign="top">
-          <div class="label">Result</div>
-        </td>
-      </tr>
-      <span tal:repeat="row results" tal:omit-tag="">
-        <tr tal:define="rindex repeat/row/index">
-          <td align="left" valign="top">
-            <input type="checkbox" name="keys:list" value="100" tal:attributes="value string:${repeat/row/index}"/>
-          </td>
-          <td align="left" valign="top">
-            <div class="field">
-              <input type="text" name="key_0" value="100" size="20" 
-                     tal:attributes="name string:type_${rindex};value python:row[0]" />
-            </div>
-          </td>
-          <td align="left">
-            <div class="field">
-              <input type="text" name="label_0" value="Year 1 (100 Level)" size="40" 
-                     tal:attributes="name string:subject_${rindex};value python:row[1]" />
-            </div>
-          </td>
-          <td align="left">
-            <div class="field">
-              <input type="text" name="msgid_0" value="" size="10" 
-                     tal:attributes="name string:result_${rindex};value python:row[2]" />
-            </div>
-          </td>
-        </tr>
-      </span>
-      <tr>
-        <td align="left" colspan="3">
-          <input class="standalone" type="submit" name="change" value=" Change " />
-          <input class="standalone" type="submit" name="delete" value=" Delete " />
-        </td>
-      </tr>
-    </table>
-    <table cellspacing="0" cellpadding="2" border="0" width="100%">
-      <tr>
-        <td align="left" valign="top" colspan="2">
-          <div>Add a new postprimary school result</div>
-        </td>
-      </tr>
-      <tr>
-        <td align="left" valign="top">
-          &nbsp;
-        </td>
-        <td align="left" valign="top">
-          <div class="label">Type</div>
-        </td>
-        <td align="left" valign="top">
-          <div class="label">Subject</div>
-        </td>
-        <td align="left" valign="top">
-          <div class="label">Result</div>
-        </td>
-      </tr>
-      <tr>
-        <td align="left" valign="top">
-          &nbsp;
-        </td>
-        <td align="left" valign="top">
-          <div  class="field">
-            <input type="text" name="type" value="" size="20" /> 
-          </div>
-        </td>
-        <td align="left">
-          <div  class="field">
-            <input type="text" name="subject" value="" size="40" />
-          </div>
-        </td>
-        <td align="left">
-          <div  class="field">
-            <input type="text" name="result" value="" size="10" />
-          </div>
-        </td>
-      </tr>
-      <tr>
-        <td align="left" colspan="3">
-          <input class="standalone" type="submit" name="add" value=" Add " />
-        </td>
-      </tr>
-    </table>
-  </form>
-</metal:block>
-  
Index: WAeUP_SRP/trunk/skins/waeup_student/layout_sc_create.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/layout_sc_create.pt	(revision 456)
+++ 	(revision )
@@ -1,85 +1,0 @@
-<tal:block define="global creation python:1" />
-<metal:block define-macro="default_edit"
-             tal:define="layout options/layout;
-             ds options/datastructure;
-             creation creation|nothing;
-             metadata metadata|nothing;
-             type_name request/type_name|nothing;
-             ti python:type_name and getattr(here.portal_types,type_name,None) or getattr(here.portal_types,here.portal_type,None);
-             creation_form python:ti and ti.getActionById('create', 'cpsdocument_create_form') or 'cpsdocument_create_form' ;
-             edit_form     python:ti and ti.getActionById('edit',   'cpsdocument_edit_form') or  'cpsdocument_edit_form';
-             metadata_form python:ti and ti.getActionById('metadata', 'cpsdocument_metadata') or 'cpsdocument_metadata';
-             formaction options/action;
-             submittext options/submit;
-             first_layout options/first_layout|python:0;
-             last_layout options/last_layout|python:0;
-             is_flexible options/is_flexible;
-             cpsmcat nocall:here/translation_service;
-             "
-             >
-  <form action='check_admission' tal:attributes="action formaction" method='post'
-        enctype='multipart/form-data' class='workflow'>
-    <div class=''>
-      <div class='documentFields'>
-        <table width="100%" cellpadding="2" cellspacing="2" summary="Form layout">
-          <tr tal:repeat="row layout/rows" valign="top">
-            <td tal:repeat="cell row"
-                tal:attributes="colspan cell/ncols">
-              <tal:block define="widget cell/widget;
-              wid widget/getWidgetId;
-              dm options/datastructure/getDataModel;
-              err python:ds.getError(wid);
-              err_mapping python:ds.getErrorMapping(wid);
-              is_required widget/is_required|nothing;
-              tooltip_id python:wid + '_help';
-              widget_css_class cell/widget_css_class|nothing;
-              widget_css_class python:test(is_flexible, 'group', widget_css_class);
-              css_class python:test(err, 'row error',
-              test(is_flexible, 'group', 'row'))"
-              >
-                <div tal:attributes="class widget_css_class;
-                id python:widget.getHtmlWidgetId()+'_widget';"
-                >
-                  <div class="label" tal:condition="widget/label_edit"
-                       tal:attributes="class python:test(is_required, 'label required','label')">
-                    <label i18n:translate="" tal:condition="widget/is_i18n"
-                           tal:content="widget/label_edit"
-                           tal:attributes="for cell/widget_input_area_id|nothing;">label</label>
-                    <label tal:condition="not:widget/is_i18n"
-                           tal:content="widget/label_edit"
-                           tal:attributes="for cell/widget_input_area_id|nothing;">label</label>
-                  </div>
-                  <button type="button" class="tooltipControl"
-                          tal:condition="widget/help"
-                          tal:attributes="onclick python:'toggleElementVisibility(\'%s\')' % tooltip_id;"> ? </button>
-                  <div class="field">
-                    <div tal:replace="structure cell/widget_rendered"/>
-                  </div>
-                  <div class="tooltipArea" style="visibility: hidden;"
-                       tal:condition="widget/help"
-                       tal:attributes="id tooltip_id;
-                       onclick python:'showElement(false, \'%s\')' % tooltip_id;"
-                       >
-                    <tal:block i18n:translate="" tal:condition="widget/is_i18n"
-                               tal:content="widget/help">i18_key-help_for_this_field</tal:block>
-                    <tal:block tal:condition="not:widget/is_i18n"
-                               tal:content="widget/help">This is the help for this field</tal:block>
-                  </div>
-                  <tal:block condition="err">
-                    <tal:block define="msg python:cpsmcat(err, mapping=err_mapping)">
-                      <br /><em style="color: red"
-                                tal:content="msg">err</em>
-                    </tal:block>
-                  </tal:block>
-                </div>
-              </tal:block>
-            </td>
-          </tr>
-        </table>
-        <input type="submit" class="standalone" name="cpsdocument_edit_button" 
-               value="check" tal:attributes="value submittext"/>
-      </div>        
-    </div>
-  </form>
-</metal:block>
-  
Index: WAeUP_SRP/trunk/skins/waeup_student/layout_slregister_create.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/layout_slregister_create.pt	(revision 456)
+++ 	(revision )
@@ -1,2 +1,0 @@
-<tal:block define="global creation python:1" />
-<metal:block use-macro="here/waeup_layout_lib/macros/common_edit" />
Index: WAeUP_SRP/trunk/skins/waeup_student/pay_hostel_fee.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/pay_hostel_fee.py	(revision 456)
+++ 	(revision )
@@ -1,45 +1,0 @@
-##parameters=REQUEST
-# $Id$
-"""
-book an accommodation
-"""
-import DateTime
-current = DateTime.DateTime()
-
-type_name = 'Student'
-ti = context.portal_types[type_name]
-pm = context.portal_membership
-REQUEST.set('type_name',type_name)
-
-validate = REQUEST.has_key("cpsdocument_edit_button")
-
-
-lt = context.portal_layouts
-pr = context.portal_registration
-
-res,psm,ds = lt.renderLayout(layout_id= 'accopay',
-                      schema_id= 'student_hostel_fee',
-                      context=context,
-                      mapping=validate and REQUEST,
-                      ob={},
-                      layout_mode='create',
-                      submit = "pay",
-                      action = 'pay_hostel_fee',
-                      )
-if psm == 'invalid':
-    return context.book_accommodation_form(rendered = res,
-                                 psm = "Please correct your input",
-                                 ds = ds,
-                                 )
-elif psm == '':
-    return context.book_accommodation_form(rendered = res,
-                                 psm = None,
-                                 ds = ds,
-                                 )
-elif psm == 'valid':
-    sf = context.getContent()
-
-    ds.set('sc_date',current)
-    sf.setScratchCardData('hostel_fee',ds)
-
-    return context.payed_hostel_fee(dict=ds)
Index: WAeUP_SRP/trunk/skins/waeup_student/personal_addon.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/personal_addon.py	(revision 456)
+++ 	(revision )
@@ -1,51 +1,0 @@
-##parameters=REQUEST
-# $Id$
-"""
-process the Admission Form
-return html renderer + psm
-"""
-type_name = 'Jamb'
-ti = context.portal_types[type_name]
-
-REQUEST.set('type_name',type_name)
-
-validate = REQUEST.has_key("cpsdocument_edit_button")
-
-
-lt = context.portal_layouts
-pr = context.portal_registration
-pm = context.portal_membership
-
-jamb = getattr(context,'JAMB')
-jamb_rendered = jamb.getContent().render(layout_id = 'admission_slip', 
-                               layout_mode = 'view',
-                               schema_id = 'jamb')
-
-res,psm,ds = lt.renderLayout(layout_id= 'student_personal_addon',
-                      schema_id= 'student_personal',
-                      context=context,
-                      mapping=validate and REQUEST,
-                      ob={},
-                      layout_mode='create',
-                      )
-res = jamb_rendered + res
-if psm == 'invalid':
-    return context.personal_addon_form(rendered = res,
-                                 #psm = str(ds),
-                                 psm = "Please correct your input",
-                                 ds = ds,
-                                 )
-elif psm == '':
-    return context.personal_addon_form(rendered = res,
-                                 psm = None,
-                                 ds = ds,
-                                 )
-elif psm == 'valid':
-    s_personal = context.PERSONAL.getContent()
-    s_personal.edit(mapping={'email': ds.get('email')})
-    #pw = REQUEST.get("widget__pw")
-    #pm.setPassword(pw)
-psm = 'Email has been successfully set. '
-##return context.REQUEST.RESPONSE.redirect('%s' % context.portal_url.getUrlFromRpath('/students'))
-
-return context.eligibility()
Index: WAeUP_SRP/trunk/skins/waeup_student/personal_addon_form.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/personal_addon_form.pt	(revision 456)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<tal:block define="rendered_main options/rendered;
-                   portal_status_message options/psm;
-                   data_storage options/ds;
-                   jamb options/jamb/getContent|nothing;
-                   edition python:1;"
-                   >
-<metal:block define-macro="edit_form">
-<metal:block use-macro="here/content_lib_master/macros/master">
-  <metal:block fill-slot="header"
-    tal:define="creation creation|nothing;
-                edition edition|nothing;
-                metadata metadata|nothing"
-                >
-    </metal:block>
-      <metal:block fill-slot="main">
-        <h1> Fillin Your Email</h1>
-        <div tal:replace="structure rendered_main" />
-      </metal:block>
-      <metal:block fill-slot="sub">
-      </metal:block>
-    </metal:block>
-  </metal:block>
-</tal:block>
Index: WAeUP_SRP/trunk/skins/waeup_student/register_level.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/register_level.py	(revision 456)
+++ 	(revision )
@@ -1,63 +1,0 @@
-##parameters=REQUEST
-# $Id$
-"""
-register for next level
-"""
-type_name = 'StudyLevel'
-ti = context.portal_types[type_name]
-pm = context.portal_membership
-REQUEST.set('type_name',type_name)
-
-validate = REQUEST.has_key("cpsdocument_create_button")
-
-
-lt = context.portal_layouts
-pv = context.portal_vocabularies
-#pr = context.portal_registration
-
-res,psm,ds = lt.renderLayout(layout_id= 'study_level',
-                      schema_id= 'study_level',
-                      context=context,
-                      mapping=validate and REQUEST,
-                      ob={},
-                      layout_mode='create',
-                      create_action = 'register_level',
-                      )
-if psm == 'invalid':
-    return context.register_level_form(rendered = res,
-                                 psm = "Please correct your input",
-                                 ds = ds,
-                                 )
-elif psm == '':
-    return context.register_level_form(rendered = res,
-                                 psm = None,
-                                 ds = ds,
-                                 )
-
-elif psm == 'valid':
-    voc = pv.courselevel
-    level_id = voc.items()[0][0]
-    level = getattr(context,level_id,None)
-    if level:
-        return context.register_level_form(rendered = res,
-                                 psm = "You have already registered for Level %s" % voc.get(level_id),
-                                 ds = ds,
-                                 )
-
-    context.invokeFactory(type_name,level_id)
-    object = getattr(context,level_id)
-    ds.set('Title',voc.get(level_id))
-    object.getContent().edit(mapping=ds,proxy=object)
-    context.notifyCPSDocumentCreation(ob=object)
-    psm = 'new %s created' % level_id
-    semester_id = 'Semester_1_%s_%s' % (level_id,context.getId())
-    object.invokeFactory('Semester',semester_id)
-    semester = getattr(object,semester_id)
-    semester.getContent().edit(mapping={'Title': 'First Semester'})
-    semester_id = 'Semester_2_%s_%s' % (level_id,context.getId())
-    object.invokeFactory('Semester',semester_id)
-    semester = getattr(object,semester_id)
-    semester.getContent().edit(mapping={'Title': 'Second Semester'})
-    context_ti = context.portal_types[context.portal_type]
-    index = context_ti.getActionById('view','university_view')
-    return getattr(context,index)(psm=psm)
Index: WAeUP_SRP/trunk/skins/waeup_student/register_level_form.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/register_level_form.pt	(revision 456)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<tal:block define="rendered_main options/rendered;
-                   portal_status_message options/psm;
-                   data_storage options/ds;
-                   jamb options/jamb/getContent|nothing;
-                   edition python:1;"
-                   >
-<metal:block define-macro="edit_form">
-<metal:block use-macro="here/content_lib_master/macros/master">
-  <metal:block fill-slot="header"
-    tal:define="creation creation|nothing;
-                edition edition|nothing;
-                metadata metadata|nothing"
-                >
-    </metal:block>
-
-    <metal:block fill-slot="main">
-        <h1>Register for Next Level!</h1>
-      <div tal:replace="structure rendered_main" />
-    </metal:block>
-  <metal:block fill-slot="sub">
-  </metal:block>
-
-</metal:block>
-</metal:block>
-</tal:block>
Index: WAeUP_SRP/trunk/skins/waeup_student/request_admission.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/request_admission.py	(revision 460)
+++ WAeUP_SRP/trunk/skins/waeup_student/request_admission.py	(revision 460)
@@ -0,0 +1,63 @@
+##parameters=REQUEST
+# $Id: check_admission.py 173 2005-11-15 16:28:29Z joachim $
+"""
+process the Admission Form
+return html renderer + psm
+"""
+import DateTime
+current = DateTime.DateTime()
+type_name = 'StudentAdmission'
+
+ti = context.portal_types[type_name]
+
+REQUEST.set('type_name',type_name)
+
+validate = REQUEST.has_key("cpsdocument_edit_button")
+
+
+lt = context.portal_layouts
+pr = context.portal_registration
+
+res,psm,ds = lt.renderLayout(layout_id= 'student_check_pin',
+                      schema_id= 'student_admission',
+                      context=context,
+                      mapping=validate and REQUEST,
+                      ob={},
+                      layout_mode='create',
+                      formaction = "request_admission",
+                      submit = "check",
+                      )
+if psm == 'invalid':
+    return context.request_admission_form(rendered = res,
+                                 psm = "Please correct your input",
+                                 ds = ds,
+                                 )
+elif psm == '':
+    return context.request_admission_form(rendered = res,
+                                 psm = None,
+                                 ds = ds,
+                                 )
+elif psm == 'valid':
+    jamb_id = ds.get('jamb_id')
+    catalog = context.portal_catalog
+    search = catalog({'meta_type': 'StudentAdmission',
+                     'jamb_reg_no': jamb_id
+                     })
+    
+    if len(search) < 1 or 1:
+        psm = "No JAMB record %s %s" % (jamb_id,search)
+        return context.check_admission_form(rendered = res,
+                                 psm = psm, 
+                                 ds = ds,
+                                 )
+student = search[0].getObject().aq_parent
+
+return student.acknowledge_slip()
+
+jamb = getattr(student,'admission')
+res = jamb.getContent().render(layout_id = 'admission_slip', 
+                               layout_mode = 'view',
+                               schema_id = 'jamb')
+
+return context.admission_slip_form(rendered = res, dict = ds)
+
Index: WAeUP_SRP/trunk/skins/waeup_student/request_admission_form.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/request_admission_form.pt	(revision 460)
+++ WAeUP_SRP/trunk/skins/waeup_student/request_admission_form.pt	(revision 460)
@@ -0,0 +1,29 @@
+<tal:block define="rendered_main options/rendered;
+                   portal_status_message options/psm;
+                   data_storage options/ds;
+                   jamb options/jamb/getContent|nothing;
+                   edition python:1;"
+                   >
+<metal:block define-macro="edit_form">
+<metal:block use-macro="here/content_lib_master/macros/master">
+  <metal:block fill-slot="header"
+    tal:define="creation creation|nothing;
+                edition edition|nothing;
+                metadata metadata|nothing"
+                >
+    </metal:block>
+      <metal:block fill-slot="main">
+        <h1> Check Your Admission Status! </h1>
+        <div tal:replace="structure rendered_main" />
+          <p>Instructions :</p>
+          <ul>
+            <li>Buy an Admission Scratch Card </li> 
+            <li>Enter the PIN above </li> 
+            <li>Print the Admission Slip which is displayed if you are admitted by the Univesity</li>
+          </ul>
+      </metal:block>
+      <metal:block fill-slot="sub">
+      </metal:block>
+    </metal:block>
+  </metal:block>
+</tal:block>
Index: WAeUP_SRP/trunk/skins/waeup_student/student_admitted_form.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/student_admitted_form.pt	(revision 456)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<tal:block define="rendered_main options/rendered;
-                   portal_status_message options/psm;
-                   jamb options/jamb/getContent;
-                   student options/student/getContent;
-                   edition python:1;"
-                   >
-  <metal:html use-macro="here/main_template/macros/master">
-    <metal:main fill-slot="main">
-      <a href="edits" tal:attributes="href string:${context/pd/absolute_url}/cpsdocument_edit_form"></a>
-    </metal:main>
-  </metal:html>
-</tal:block>
Index: WAeUP_SRP/trunk/skins/waeup_student/student_documents_edit_form.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/student_documents_edit_form.pt	(revision 456)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<tal:block define="res python:here.editCPSDocument(REQUEST=request);
-                   rendered_main python: res[0];
-                   portal_status_message python: res[1];
-                   edition python:1;
-  ">
-<metal:block define-macro="edit_form">
-<metal:block use-macro="here/content_lib_master/macros/master">
-  <metal:block fill-slot="css_slot">
-    <link rel="Stylesheet" type="text/css" href=""
-      tal:attributes="href string:${base_url}document.css" />
-
-    <metal:block define-macro="widgets_javascript">
-    <!-- XXX this has to move to CPSSchemas -->
-    <style type="text/css"
-      tal:content="string:@import url(${base_url}calendar-win2k-1.css);"></style>
-    <script type="text/javascript" src="calendar.js"
-      tal:attributes="src string:${base_url}calendar.js"></script>
-    <script type="text/javascript" src="lang/calendar-en.js"
-      tal:define="local cpsmcat/getSelectedLanguage"
-      tal:attributes="src string:${base_url}lang/calendar-${local}.js"></script>
-    <script type="text/javascript" src="calendar-setup.js"
-      tal:attributes="src string:${base_url}calendar-setup.js"></script>
-
-    <script type="text/javascript">
-    <!--
-     function popup_rte(input_id, label_edit) {
-       var args, value
-       value = document.getElementById(input_id).value;
-       args='?input_id='+input_id+'&label_edit='+escape(label_edit);
-       popup = window.open('popup_rte_form'+args, input_id, 'toolbar=0, scrollbars=0, location=0, statusbar=0, menubar=0, resizable=1, dependent=1, width=640, height=480')
-       if(!popup.opener)
-         popup.opener = window;
-       return false;
-   }
-   //-->
-   </script>
-   </metal:block>
-  </metal:block>
-
-  <metal:block fill-slot="header"
-    tal:define="creation creation|nothing;
-                edition edition|nothing;
-                metadata metadata|nothing">
-    <h1 tal:condition="creation" i18n:translate="">
-      Create a document of type
-      <tal:block i18n:name="type_name" i18n:translate=""
-            tal:define="type_name request/type_name;
-                        type_info python:here.portal_types[type_name]"
-            tal:content="type_info/Title">Type Title</tal:block>
-    </h1>
-    <h1 tal:condition="python: 0 and not creation">
-      <img tal:replace="structure python:here.getImgTag('/'+here.getIcon(), base_url='')">
-      <tal:block condition="edition"
-        i18n:translate="">Edit <span i18n:name="title"
-        tal:content="here/title_or_id">Page Title</span></tal:block>
-      <tal:block tal:condition="metadata"
-        i18n:translate="">heading_metadata_edit</tal:block>
-    </h1>
-  </metal:block>
-
-  <metal:block fill-slot="main">
-    <div tal:replace="structure rendered_main" />
-  </metal:block>
-  <metal:block fill-slot="sub">
-  </metal:block>
-
-</metal:block>
-</metal:block>
-</tal:block>
Index: WAeUP_SRP/trunk/skins/waeup_student/student_index_html.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/student_index_html.py	(revision 456)
+++ 	(revision )
@@ -1,15 +1,0 @@
-##parameters=post_id=None, REQUEST=None
-
-# $Id$
-
-"""Default view for the Student."""
-member = context.portal_membership.getAuthenticatedMember()
-
-#return context.student_view_manager()
-if not context.portal_membership.isAnonymousUser():
-    roles = member.getRoles()
-    if 'Manager' in roles:
-        return context.folder_view()
-    elif 'StudentManager' in roles:
-        return context.student_view_manager()
-return context.student_view_student()
Index: WAeUP_SRP/trunk/skins/waeup_student/student_personal_edit_form.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/student_personal_edit_form.pt	(revision 456)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<tal:block define="res python:here.editCPSDocument(REQUEST=request);
-                   rendered_main python: res[0];
-                   portal_status_message python: res[1];
-                   edition python:1;
-  ">
-<metal:block define-macro="edit_form">
-<metal:block use-macro="here/content_lib_master/macros/master">
-  <metal:block fill-slot="css_slot">
-    <link rel="Stylesheet" type="text/css" href=""
-      tal:attributes="href string:${base_url}document.css" />
-
-    <metal:block define-macro="widgets_javascript">
-    <!-- XXX this has to move to CPSSchemas -->
-    <style type="text/css"
-      tal:content="string:@import url(${base_url}calendar-win2k-1.css);"></style>
-    <script type="text/javascript" src="calendar.js"
-      tal:attributes="src string:${base_url}calendar.js"></script>
-    <script type="text/javascript" src="lang/calendar-en.js"
-      tal:define="local cpsmcat/getSelectedLanguage"
-      tal:attributes="src string:${base_url}lang/calendar-${local}.js"></script>
-    <script type="text/javascript" src="calendar-setup.js"
-      tal:attributes="src string:${base_url}calendar-setup.js"></script>
-
-    <script type="text/javascript">
-    <!--
-     function popup_rte(input_id, label_edit) {
-       var args, value
-       value = document.getElementById(input_id).value;
-       args='?input_id='+input_id+'&label_edit='+escape(label_edit);
-       popup = window.open('popup_rte_form'+args, input_id, 'toolbar=0, scrollbars=0, location=0, statusbar=0, menubar=0, resizable=1, dependent=1, width=640, height=480')
-       if(!popup.opener)
-         popup.opener = window;
-       return false;
-   }
-   //-->
-   </script>
-   </metal:block>
-  </metal:block>
-
-  <metal:block fill-slot="header"
-    tal:define="creation creation|nothing;
-                edition edition|nothing;
-                metadata metadata|nothing">
-    <h1 tal:condition="creation" i18n:translate="">
-      Create a document of type
-      <tal:block i18n:name="type_name" i18n:translate=""
-            tal:define="type_name request/type_name;
-                        type_info python:here.portal_types[type_name]"
-            tal:content="type_info/Title">Type Title</tal:block>
-    </h1>
-    <h1 tal:condition="python: 0 and not creation">
-      <img tal:replace="structure python:here.getImgTag('/'+here.getIcon(), base_url='')">
-      <tal:block condition="edition"
-        i18n:translate="">Edit <span i18n:name="title"
-        tal:content="here/title_or_id">Page Title</span></tal:block>
-      <tal:block tal:condition="metadata"
-        i18n:translate="">heading_metadata_edit</tal:block>
-    </h1>
-  </metal:block>
-
-  <metal:block fill-slot="main">
-    <div tal:replace="structure rendered_main" />
-  </metal:block>
-  <metal:block fill-slot="sub">
-  </metal:block>
-
-</metal:block>
-</metal:block>
-</tal:block>
Index: WAeUP_SRP/trunk/skins/waeup_student/student_personal_index_html.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/student_personal_index_html.py	(revision 456)
+++ 	(revision )
@@ -1,15 +1,0 @@
-##parameters=post_id=None, REQUEST=None
-
-# $Id$
-
-"""Default view for the Student."""
-member = context.portal_membership.getAuthenticatedMember()
-
-#return context.student_view_manager()
-if not context.portal_membership.isAnonymousUser():
-    roles = member.getRoles()
-    if 'Manager' in roles:
-        return context.cpsdocument_view()
-    elif 'StudentManager' in roles:
-        return context.student_personal_view_manager()
-return context.student_personal_view_student()
Index: WAeUP_SRP/trunk/skins/waeup_student/student_personal_view_manager.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/student_personal_view_manager.pt	(revision 456)
+++ 	(revision )
@@ -1,31 +1,0 @@
-<metal:block define-macro="view">
-<metal:block use-macro="here/content_lib_master/macros/master">
-  <metal:block fill-slot="header">
-  </metal:block>
-
-  <metal:block fill-slot="css_slot">
-    <link rel="Stylesheet" type="text/css" href=""
-      tal:attributes="href string:${base_url}document.css" />
-    <link rel="Stylesheet" type="text/css" href=""
-      tal:attributes="href string:${base_url}forum.css" />
-  </metal:block>
-
-  <metal:block fill-slot="main">
-    <tal:block tal:content="structure rendered_main|python:doc.render(proxy=here)" />
-
-    <tal:block tal:condition="python:hasattr(here,'portal_discussion') and
-      hasattr(here.portal_discussion, 'isCommentingAllowedFor')">
-      <tal:block tal:define="comments_allowed
-        python:here.portal_discussion.isCommentingAllowedFor(here);"
-        tal:condition="comments_allowed">
-        <metal:block
-          use-macro="here/forum_comment_lib_view_comments_inline/macros/view_comments_inline" />
-      </tal:block>
-    </tal:block>
-
-  </metal:block>
-  <metal:block fill-slot="sub">
-  </metal:block>
-
-</metal:block>
-</metal:block>
Index: WAeUP_SRP/trunk/skins/waeup_student/student_personal_view_student.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/student_personal_view_student.pt	(revision 456)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<metal:block define-macro="view">
-  <metal:block use-macro="here/content_lib_master/macros/master">
-    <metal:block fill-slot="header">
-    </metal:block>
-
-    <metal:block fill-slot="css_slot">
-      <link rel="Stylesheet" type="text/css" href=""
-            tal:attributes="href string:${base_url}document.css" />
-      <link rel="Stylesheet" type="text/css" href=""
-            tal:attributes="href string:${base_url}forum.css" />
-    </metal:block>
-    
-    <metal:block fill-slot="main">
-      <tal:block tal:content="structure rendered_main|python:doc.render(proxy=here)" />
-    </metal:block>
-    <metal:block fill-slot="sub">
-    </metal:block>
-
-</metal:block>
-</metal:block>
Index: WAeUP_SRP/trunk/skins/waeup_student/student_view_manager.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/student_view_manager.pt	(revision 456)
+++ 	(revision )
@@ -1,38 +1,0 @@
-<html metal:use-macro="here/content_lib_master/macros/master">
-
-<metal:block fill-slot="head_slot">
-  <tal:block tal:define="student here/getContent">
-  </tal:block>
-</metal:block>
-
-  <metal:block fill-slot="css_slot">
-    <link rel="Stylesheet" type="text/css" href=""
-          tal:attributes="href string:${base_url}student.css" />
-  </metal:block>
-  <metal:block fill-slot="header">
-  </metal:block>
-
-<metal:block fill-slot="main"
-             tal:define="items here/contentValues"
-             >
-    <h2>Data for Student <span tal:content="context/id" /></h2>
-    <table cellspacing="0" cellpadding="0">
-      <tal:block condition="python: len(items)">
-        <tr tal:repeat="item items">
-          <td colspan="1"> 
-            <a href="jamb" 
-               tal:attributes="href item/absolute_url"
-               tal:content="item/title_or_id"></a>
-          </td>
-        </tr>
-      </tal:block>
-      <tr tal:condition="python:not len(items)">
-        <td>
-          no Items yet !
-        </td>
-      </tr>
-    </table>
-  </metal:block>
-  <metal:block fill-slot="sub">
-  </metal:block>
-</html>
Index: WAeUP_SRP/trunk/skins/waeup_student/student_view_student.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/student_view_student.pt	(revision 456)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<html metal:use-macro="here/content_lib_master/macros/master">
-
-<metal:block fill-slot="head_slot">
-  <tal:block tal:define="student here/getContent">
-  </tal:block>
-</metal:block>
-
-<metal:block fill-slot="css_slot">
-  <link rel="Stylesheet" type="text/css" href=""
-    tal:attributes="href string:${base_url}student.css" />
-</metal:block>
-  <metal:block fill-slot="header">
-  </metal:block>
-  <metal:block fill-slot="main"
-               tal:define="student here/getContent;
-               items here/contentValues"
-               >
-    <tal:block condition="python:0 and len(items)">
-    <table cellspacing="0" cellpadding="0">
-        <tr tal:repeat="item items">
-          <td colspan="1"> 
-            <a href="jamb" 
-               tal:attributes="href item/absolute_url"
-               tal:content="item/title_or_id"></a>
-          </td>
-        </tr>
-    </table>
-    </tal:block>
-    <ul>
-      <li>  <a href="" tal:attributes="href string:${context/absolute_url}/JAMB">Clearence Form Processing</a></li>
-      <li>  <a href="" tal:attributes="href string:${context/absolute_url}/PERSONAL">Personal Data Form</a></li>
-      <li>  <a href="" tal:attributes="href string:${context/absolute_url}/book_accommodation">Book your accommodation</a></li>
-    </ul>
-  </metal:block>
-  <metal:block fill-slot="sub">
-  </metal:block>
-</html>
Index: WAeUP_SRP/trunk/skins/waeup_student/students_folder_view.py
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/students_folder_view.py	(revision 456)
+++ 	(revision )
@@ -1,20 +1,0 @@
-##parameters=REQUEST=None,psm=None,groups=None
-
-# $Id$
-
-"""Default view for the forum. If post_id is not None, post with id = <post_id>
-will be displayed, otherwise first post will be displayed."""
-
-member = context.portal_membership.getAuthenticatedMember()
-if not context.portal_membership.isAnonymousUser():
-    roles = member.getRoles()
-    if 'Manager' in roles:
-        return context.folder_view()
-    elif 'StudentManager' in roles or 'UniversityManager' in roles:
-        return context.students_folder_view_manager(psm=psm)
-    elif 'Student' in roles:
-        return getattr(context, str(member))()
-context_ti = context.portal_types['University'] 
-index = context_ti.getActionById('view','university_view')
-return getattr(context,index)(psm=psm)
-return context.students_folder_view_all(psm=psm)
Index: WAeUP_SRP/trunk/skins/waeup_student/students_folder_view_all.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/students_folder_view_all.pt	(revision 456)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<html metal:use-macro="here/content_lib_master/macros/master">
-
-  <metal:block fill-slot="head_slot">
-    <tal:block tal:define="student here/getContent">
-    </tal:block>
-  </metal:block>
-
-  <metal:block fill-slot="css_slot">
-    <link rel="Stylesheet" type="text/css" href=""
-          tal:attributes="href string:${base_url}student.css" />
-  </metal:block>
-  <metal:block fill-slot="header">
-  </metal:block>
-
-  <metal:block fill-slot="main"
-               tal:define="student_folder here/getContent;
-               items here/contentValues"
-               >
-    <span tal:condition="python: mtool.isAnonymousUser()"> 
-      Please <a href="" tal:attributes="href string:${context/portal_url}/login_form">login</a> or <br />
-      <a href="" tal:attributes="href string:${context/absolute_url}/admission_status">check you Jambadmission</a>.
-    </span>
-  </metal:block>
-  <metal:block fill-slot="sub">
-  </metal:block>
-</html>
Index: WAeUP_SRP/trunk/skins/waeup_student/students_folder_view_anon.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/students_folder_view_anon.pt	(revision 456)
+++ 	(revision )
@@ -1,24 +1,0 @@
-<html metal:use-macro="here/content_lib_master/macros/master">
-
-  <metal:block fill-slot="head_slot">
-    <tal:block tal:define="student here/getContent">
-    </tal:block>
-  </metal:block>
-
-  <metal:block fill-slot="css_slot">
-    <link rel="Stylesheet" type="text/css" href=""
-          tal:attributes="href string:${base_url}student.css" />
-  </metal:block>
-  <metal:block fill-slot="header">
-  </metal:block>
-
-  <metal:block fill-slot="main"
-               tal:define="student_folder here/getContent;
-               items here/contentValues"
-               >
-    <a href="" tal:attributes="href string:${context/absolute_url}/admission_status">Admission List UME</a>.<br />
-    <a href="" tal:attributes="href string:${context/absolute_url}/check_admission">Admission Request (JAMB canditates only)</a>.
-  </metal:block>
-  <metal:block fill-slot="sub">
-  </metal:block>
-</html>
Index: WAeUP_SRP/trunk/skins/waeup_student/students_folder_view_manager.pt
===================================================================
--- WAeUP_SRP/trunk/skins/waeup_student/students_folder_view_manager.pt	(revision 456)
+++ 	(revision )
@@ -1,38 +1,0 @@
-<html metal:use-macro="here/content_lib_master/macros/master">
-
-  <metal:block fill-slot="head_slot">
-    <tal:block tal:define="student here/getContent">
-    </tal:block>
-  </metal:block>
-
-  <metal:block fill-slot="css_slot">
-    <link rel="Stylesheet" type="text/css" href=""
-          tal:attributes="href string:${base_url}student.css" />
-  </metal:block>
-  <metal:block fill-slot="header">
-  </metal:block>
-
-  <metal:block fill-slot="main"
-               tal:define="student_folder here/getContent;
-               items here/contentValues"
-               >
-    <span> 
-      <table cellspacing="0" cellpadding="0">
-        <tal:block condition="python: len(items)">
-          <tr tal:repeat="item items">
-            <td colspan="1">
-              <a href="student" tal:attributes="href item/absolute_url" tal:content="item/title_or_id"></a>
-            </td>
-          </tr>
-        </tal:block>
-        <tr tal:condition="python:not len(items)">
-          <td>
-            no Students yet !
-          </td>
-        </tr>
-      </table>
-    </span>
-  </metal:block>
-  <metal:block fill-slot="sub">
-  </metal:block>
-</html>
