Index: WAeUP_SRP/base/skins/waeup_student/getLogData.py
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/getLogData.py	(revision 2242)
+++ 	(revision )
@@ -1,37 +1,0 @@
-## Script (Python) "getLogData"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-"""
-return logfile entries
-"""
-
-wtool = context.waeup_tool
-
-# Default values...
-filename = "event.log"
-numlines = 30
-
-# Validate posted vars...
-request = container.REQUEST
-if 'filename' in request.keys():
-    if request['filename'] in ['event.log','Z2.log']:
-        filename = request['filename']
-
-if 'numlines' in request.keys():
-    try:
-        reqlines = int(request['numlines'])
-        if reqlines > 0 and reqlines < 1000:
-            numlines = reqlines
-    except:
-        pass
-
-return { 'filename' : filename,
-         'numlines' : numlines,
-         'lines' : wtool.getLogfileLines(filename, numlines)
-       }
Index: WAeUP_SRP/base/skins/waeup_student/getNewStudentStatistics.py
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/getNewStudentStatistics.py	(revision 2242)
+++ 	(revision )
@@ -1,116 +1,0 @@
-## Script (Python) "getNewStudentStatistics"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-# $Id: getStudentStatistics.py 1277 2007-01-11 21:11:37Z joachim $
-"""
-return Student Statistics
-"""
-
-import logging
-logger = logging.getLogger('Skins.getNewStudentStatistics')
-
-logger.info('%s invoked statistics' % context.portal_membership.getAuthenticatedMember())
-if not context.isStaff():
-    return 'Not allowed'
-
-entry_sessions = ('-1','06','6')
-
-# students with entry_session None (-1) are interprteted as new AND returning students if they are 
-# in either of the last three states
-
-new_states =      ('admitted',
-                   'clearance_pin_entered',
-                   'objection_raised',
-                   'clearance_requested',
-                   'cleared_and_validated',
-                   'school_fee_paid',
-                   'courses_registered',
-                   'courses_validated',
-                   )
-
-full_time =       ('ume_ft','de_ft','ug_ft','pg_ft')
-part_time =       (         'de_pt','ug_pt','pg_pt')
-
-faculties = context.portal_catalog(portal_type="Faculty")
-
-l = []
-
-
-fac_res = {}
-
-dict = {}
-dict['id'] = 'All Faculties'
-dict['title'] = 'All Faculties'
-
-res_ft = context.students_catalog(entry_session = entry_sessions,  mode = full_time, review_state = new_states)
-dict['total_ft'] = len(res_ft)
-
-res_pt = context.students_catalog(entry_session = entry_sessions,  mode = part_time, review_state = new_states)
-dict['total_pt'] = len(res_pt)
-
-for state in new_states:
-    # full_time
-    res_ft = context.students_catalog(entry_session = entry_sessions, review_state = state,  mode = full_time)
-    state_ft = state + '_ft'
-    dict[state_ft] = len(res_ft)
-    statepercent = state+'_ft_percent'
-    if dict['total_ft'] > 0:
-        dict[statepercent] = "%.0f" % round(dict[state_ft]*100.0/dict['total_ft'])
-    else:
-        dict[statepercent] = 0
-        
-    # part_time
-    res_pt = context.students_catalog(entry_session = entry_sessions, review_state = state,  mode = part_time)
-    state_pt = state + '_pt'
-    dict[state_pt] = len(res_pt)
-    statepercent = state+'_pt_percent'
-    if dict['total_pt'] > 0:
-        dict[statepercent] = "%.0f" % round(dict[state_pt]*100.0/dict['total_pt'])
-    else:
-        dict[statepercent] = 0        
-        
-l.append(dict)
-
-
-for f in faculties:
-    dict = {}
-    dict['id'] = f.getId
-    dict['title'] = f.Title
-    res_ft = context.students_catalog(entry_session = entry_sessions, faculty = f.getId, mode = full_time)
-    dict['total_ft'] = len(res_ft)
-    res_pt = context.students_catalog(entry_session = entry_sessions, faculty = f.getId, mode = part_time)
-    dict['total_pt'] = len(res_pt)    
-    for state in new_states:
-        # full_time
-        res_ft = context.students_catalog(entry_session = entry_sessions, faculty = f.getId, review_state = state, mode = full_time)
-        state_ft = state + '_ft'
-        dict[state_ft] = len(res_ft)
-        statepercent = state+'_ft_percent'
-        if dict['total_ft'] > 0:
-            dict[statepercent] = "%.0f" % round(dict[state_ft]*100.0/dict['total_ft'])
-        else:
-            dict[statepercent] = 0
-            
-        # part_time
-        res_pt = context.students_catalog(entry_session = entry_sessions, faculty = f.getId, review_state = state, mode = part_time)
-        state_pt = state + '_pt'
-        dict[state_pt] = len(res_pt)
-        statepercent = state+'_pt_percent'
-        if dict['total_pt'] > 0:
-            dict[statepercent] = "%.0f" % round(dict[state_pt]*100.0/dict['total_pt'])
-        else:
-            dict[statepercent] = 0            
-            
-    l.append(dict)
-
-
-
-return l
-
-
Index: WAeUP_SRP/base/skins/waeup_student/getRetStudentStatistics.py
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/getRetStudentStatistics.py	(revision 2242)
+++ 	(revision )
@@ -1,106 +1,0 @@
-## Script (Python) "getRetStudentStatistics"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-# $Id: getStudentStatistics.py 1277 2007-01-11 21:11:37Z joachim $
-"""
-return Student Statistics
-"""
-
-import logging
-logger = logging.getLogger('Skins.getRetStudentStatistics')
-
-logger.info('%s invoked statistics' % context.portal_membership.getAuthenticatedMember())
-if not context.isStaff():
-    return 'Not allowed'
-
-entry_sessions = ('-1','94','95','96','97','98','99','00','01','02','03','04','05','0','1','2','3','4','5')
-
-ret_states =      ('returning',
-                   'school_fee_paid',
-                   'courses_registered',
-                   'courses_validated',
-                   )
-full_time =       ('ume_ft','de_ft','ug_ft','pg_ft')
-part_time =       (         'de_pt','ug_pt','pg_pt')
-
-faculties = context.portal_catalog(portal_type="Faculty")
-
-l = []
-
-
-fac_res = {}
-
-dict = {}
-dict['id'] = 'All Faculties'
-dict['title'] = 'All Faculties'
-
-res_ft = context.students_catalog(entry_session = entry_sessions,  mode = full_time, review_state = ret_states)
-dict['total_ft'] = len(res_ft)
-
-res_pt = context.students_catalog(entry_session = entry_sessions,  mode = part_time, review_state = ret_states)
-dict['total_pt'] = len(res_pt)
-
-for state in ret_states:
-    # full_time
-    res_ft = context.students_catalog(entry_session = entry_sessions, review_state = state,  mode = full_time)
-    state_ft = state + '_ft'
-    dict[state_ft] = len(res_ft)
-    statepercent = state+'_ft_percent'
-    if dict['total_ft'] > 0:
-        dict[statepercent] = "%.0f" % round(dict[state_ft]*100.0/dict['total_ft'])
-    else:
-        dict[statepercent] = 0
-
-    # part_time
-    res_pt = context.students_catalog(entry_session = entry_sessions, review_state = state,  mode = part_time)
-    state_pt = state + '_pt'
-    dict[state_pt] = len(res_pt)
-    statepercent = state+'_pt_percent'
-    if dict['total_pt'] > 0:
-        dict[statepercent] = "%.0f" % round(dict[state_pt]*100.0/dict['total_pt'])
-    else:
-        dict[statepercent] = 0
-
-l.append(dict)
-
-
-for f in faculties:
-    dict = {}
-    dict['id'] = f.getId
-    dict['title'] = f.Title
-    res_ft = context.students_catalog(entry_session = entry_sessions, faculty = f.getId, mode = full_time)
-    dict['total_ft'] = len(res_ft)
-    res_pt = context.students_catalog(entry_session = entry_sessions, faculty = f.getId, mode = part_time)
-    dict['total_pt'] = len(res_pt)
-    for state in ret_states:
-        # full_time
-        res_ft = context.students_catalog(entry_session = entry_sessions, faculty = f.getId, review_state = state, mode = full_time)
-        state_ft = state + '_ft'
-        dict[state_ft] = len(res_ft)
-        statepercent = state+'_ft_percent'
-        if dict['total_ft'] > 0:
-            dict[statepercent] = "%.0f" % round(dict[state_ft]*100.0/dict['total_ft'])
-        else:
-            dict[statepercent] = 0
-
-        # part_time
-        res_pt = context.students_catalog(entry_session = entry_sessions, faculty = f.getId, review_state = state, mode = part_time)
-        state_pt = state + '_pt'
-        dict[state_pt] = len(res_pt)
-        statepercent = state+'_pt_percent'
-        if dict['total_pt'] > 0:
-            dict[statepercent] = "%.0f" % round(dict[state_pt]*100.0/dict['total_pt'])
-        else:
-            dict[statepercent] = 0
-
-    l.append(dict)
-
-return l
-
-
Index: WAeUP_SRP/base/skins/waeup_student/getSimpleStudentStatistics.py
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/getSimpleStudentStatistics.py	(revision 2242)
+++ 	(revision )
@@ -1,148 +1,0 @@
-## Script (Python) "getRetStudentStatistics"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-# $Id: getStudentStatistics.py 1277 2007-01-11 21:11:37Z joachim $
-"""
-return Student Statistics
-"""
-
-import logging
-logger = logging.getLogger('Skins.getSimpleStudentStatistics')
-
-logger.info('%s invoked statistics' % context.portal_membership.getAuthenticatedMember())
-if not context.isStaff():
-    return 'Not allowed'
-
-#entry_sessions = ('-1','94','95','96','97','98','99','00','01','02','03','04','05','0','1','2','3','4','5')
-
-catA =      (      'school_fee_paid',
-                   'courses_registered',
-                   'courses_validated',
-                   )
-
-catB =      (      'courses_registered',
-                   'courses_validated',
-                   )
-
-catC =      (      'returning',
-                   'admitted',
-                   'clearance_pin_entered',
-                   'objection_raised',
-                   'clearance_requested',
-                   'cleared_and_validated',
-                   )
-
-
-full_time =       ('ume_ft','de_ft','ug_ft','pg_ft')
-part_time =       (         'de_pt','ug_pt','pg_pt')
-diploma   =       ('dp_ft','dp_pt')
-
-
-faculties = context.portal_catalog(portal_type="Faculty")
-
-l = []
-
-fac_res = {}
-
-dict = {}
-dict['id'] = 'All Faculties'
-dict['title'] = 'All Faculties'
-
-
-res_ft = context.students_catalog(mode = full_time)
-dict['total_ft'] = len(res_ft)
-
-res_pt = context.students_catalog(mode = part_time)
-dict['total_pt'] = len(res_pt)
-
-res_dp = context.students_catalog(mode = diploma)
-dict['total_dp'] = len(res_dp)
-
-res_Aft = context.students_catalog(review_state = catA, mode = full_time)
-dict['total_Aft'] = len(res_Aft)
-
-res_Apt = context.students_catalog(review_state = catA, mode = part_time)
-dict['total_Apt'] = len(res_Apt)
-
-res_Adp = context.students_catalog(review_state = catA, mode = diploma)
-dict['total_Adp'] = len(res_Adp)
-
-res_Bft = context.students_catalog(review_state = catB, mode = full_time)
-dict['total_Bft'] = len(res_Bft)
-
-res_Bpt = context.students_catalog(review_state = catB, mode = part_time)
-dict['total_Bpt'] = len(res_Bpt)
-
-res_Bdp = context.students_catalog(review_state = catB, mode = diploma)
-dict['total_Bdp'] = len(res_Bpt)
-
-res_Cft = context.students_catalog(review_state = catC, mode = full_time)
-dict['total_Cft'] = len(res_Cft)
-
-res_Cpt = context.students_catalog(review_state = catC, mode = part_time)
-dict['total_Cpt'] = len(res_Cpt)
-
-res_Cdp = context.students_catalog(review_state = catC, mode = diploma)
-dict['total_Cdp'] = len(res_Cdp)
-
-
-res_total = context.students_catalog()
-dict['total_in_catalog'] = len(res_total)
-dict['not_categorized'] = dict['total_in_catalog'] - dict['total_Aft'] - dict['total_Apt'] - dict['total_Adp'] - dict['total_Cft'] - dict['total_Cpt'] - dict['total_Cdp']
-
-l.append(dict)
-
-
-for f in faculties:
-    dict = {}
-    dict['id'] = f.getId
-    dict['title'] = f.Title
-
-    res_ft = context.students_catalog(faculty = f.getId, mode = full_time)
-    dict['total_ft'] = len(res_ft)
-
-    res_pt = context.students_catalog(faculty = f.getId, mode = part_time)
-    dict['total_pt'] = len(res_pt)
-
-    res_dp = context.students_catalog(faculty = f.getId, mode = diploma)
-    dict['total_dp'] = len(res_dp)
-
-    res_Aft = context.students_catalog(faculty = f.getId, review_state = catA, mode = full_time)
-    dict['total_Aft'] = len(res_Aft)
-
-    res_Apt = context.students_catalog(faculty = f.getId, review_state = catA, mode = part_time)
-    dict['total_Apt'] = len(res_Apt)
-
-    res_Adp = context.students_catalog(faculty = f.getId, review_state = catA, mode = diploma)
-    dict['total_Adp'] = len(res_Adp)
-
-    res_Bft = context.students_catalog(faculty = f.getId, review_state = catB, mode = full_time)
-    dict['total_Bft'] = len(res_Bft)
-
-    res_Bpt = context.students_catalog(faculty = f.getId, review_state = catB, mode = part_time)
-    dict['total_Bpt'] = len(res_Bpt)
-
-    res_Bdp = context.students_catalog(faculty = f.getId, review_state = catB, mode = diploma)
-    dict['total_Bdp'] = len(res_Bpt)
-
-    res_Cft = context.students_catalog(faculty = f.getId, review_state = catC, mode = full_time)
-    dict['total_Cft'] = len(res_Cft)
-
-    res_Cpt = context.students_catalog(faculty = f.getId, review_state = catC, mode = part_time)
-    dict['total_Cpt'] = len(res_Cpt)
-
-    res_Cdp = context.students_catalog(faculty = f.getId, review_state = catC, mode = diploma)
-    dict['total_Cdp'] = len(res_Cdp)
-
-
-    l.append(dict)
-
-return l
-
-
Index: WAeUP_SRP/base/skins/waeup_student/layout_application_create.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/layout_application_create.pt	(revision 2242)
+++ 	(revision )
@@ -1,138 +1,0 @@
-<tal:block define="global creation python:1;
-                   global formaction string:apply_admission" />
-<!-- a layout_lib macro -->
-<!-- $Id$ -->
-
-<metal:block define-macro="default_edit"
-  tal:define="layout options/layout;
-  ds options/datastructure;
-  dm ds/getDataModel;
-  formaction options/formaction;
-  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);
-  cpsmcat nocall:here/translation_service;
-  apply request/apply_button|nothing;
-  widgets python:context.getRenderedWidgets(layout);
-  ">
-  <form action="" id="editForm" method="post" 
-        enctype="multipart/form-data" class="workflow"
-        tal:attributes="action formaction"
-        >
-  <table class="layoutDefault" summary="Form layout"
-         tal:condition="layout/rows">
-    <span tal:repeat="row python: layout['rows']" valign="top" >
-      <span tal:repeat="cell row">
-        <tr tal:define="widget cell/widget;
-              wid widget/getWidgetId;
-              err python:ds.getError(wid);
-              err_mapping python:ds.getErrorMapping(wid);
-              is_required python: widget.is_required and creation and ('create' not in widget.readonly_layout_modes);
-              tooltip_id python:wid + '_help';
-              widget_css_class cell/widget_css_class|nothing;
-              css_class python:test(err, 'row error','row')"
-              tal:condition="python: wid != 'passport'"
-              >
-          <div tal:attributes="class widget_css_class;
-          id python:widget.getHtmlWidgetId()+'_widget';"
-          >
-            <td>
-            <div class="label" tal:condition="widget/label_edit"
-                 tal:attributes="class python:test(is_required, 'label required','label')">
-              <label 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>
-            </td>
-            <td>
-            <span class="field">
-              <div tal:replace="structure cell/widget_rendered"/>
-            </span>
-            <div class="tooltipArea" style="visibility: hidden;"
-                 tal:condition="widget/help"
-                 tal:attributes="id tooltip_id;
-                 onclick python:'showElement(false, \'%s\')' % tooltip_id;"
-                 >
-              <tal:block 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>
-            </td>
-          </div>
-        </tr>
-      </span>
-    </span>
-    <tr tal:condition="widgets/passport|nothing" 
-        tal:define="cell widgets/passport|nothing;">
-      <tal:block tal:define="widget cell/widget;
-      wid widget/getWidgetId;
-      err python:ds.getError(wid);
-      err_mapping python:ds.getErrorMapping(wid);
-      is_required python: widget.is_required and creation and ('create' not in widget.readonly_layout_modes);
-      tooltip_id python:wid + '_help';
-      widget_css_class widget/widget_css_class|nothing;
-      css_class python:test(err, 'row error','row')"
-      >
-        <div tal:attributes="class widget_css_class;
-        id python:widget.getHtmlWidgetId()+'_widget';"
-        >
-          <td>
-            <div class="label" tal:condition="widget/label_edit"
-                 tal:attributes="class python:test(is_required, 'label required','label')">
-              <label 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>
-          </td>
-          <td>
-            <span class="field">
-              <div tal:replace="structure cell/widget_rendered"/>
-            </span>
-            <div class="tooltipArea" style="visibility: hidden;"
-                 tal:condition="widget/help"
-                 tal:attributes="id tooltip_id;
-                 onclick python:'showElement(false, \'%s\')' % tooltip_id;"
-                 >
-              <tal:block 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>
-          </td>
-        </div>
-      </tal:block>
-    </tr>
-  </table>
-  <br />
-  <input type="submit" class="standalone" name="cpsdocument_edit_button"
-         value="Save" 
-         id="cpsdocument_edit_button"
-         tal:condition="not:creation" />
-  <input type="submit" class="standalone" name="apply_admission"
-         value="apply for admission"
-         id="cpsdocument_edit_and_view_button"
-         tal:condition="apply" 
-         tal:attributes="value apply"/>
-  <input type="submit" 
-         class="standalone" 
-         name="cpsdocument_create_button"
-         value="apply"
-         tal:attributes="value options/button"
-         tal:condition="creation" />
-
-</form>
-</metal:block>
Index: WAeUP_SRP/base/skins/waeup_student/layout_application_edit.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/layout_application_edit.pt	(revision 2242)
+++ 	(revision )
@@ -1,108 +1,0 @@
-<metal:block define-macro="default_edit"
-  tal:define="layout options/layout;
-  ds options/datastructure;
-  dm ds/getDataModel;
-  formaction options/formaction|string:application_edit;
-  creation creation|nothing;
-  cpsmcat nocall:here/translation_service;
-  proceed options/proceed|nothing;
-  widgets python:context.getRenderedWidgets(layout);
-  ">
-  <table class="layoutDefault" summary="Form layout"
-         tal:condition="layout/rows">
-    <span tal:repeat="row python: layout['rows']" valign="top" >
-      <span tal:repeat="cell row">
-        <tr tal:define="widget cell/widget;
-              wid widget/getWidgetId;
-              err python:ds.getError(wid);
-              err_mapping python:ds.getErrorMapping(wid);
-              is_required python: widget.is_required;
-              tooltip_id python:wid + '_help';
-              widget_css_class cell/widget_css_class|nothing;
-              css_class python:test(err, 'row error','row')"
-              tal:condition="python: wid != 'passport'"
-              >
-          <div tal:attributes="class widget_css_class;
-          id python:widget.getHtmlWidgetId()+'_widget';"
-          >
-            <td>
-            <div class="label" tal:condition="widget/label_edit"
-                 tal:attributes="class python:test(is_required, 'label required','label')">
-              <label 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>
-            </td>
-            <td>
-            <span class="field">
-              <div tal:replace="structure cell/widget_rendered"/>
-            </span>
-            <div class="tooltipArea" style="visibility: hidden;"
-                 tal:condition="widget/help"
-                 tal:attributes="id tooltip_id;
-                 onclick python:'showElement(false, \'%s\')' % tooltip_id;"
-                 >
-              <tal:block 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>
-            </td>
-          </div>
-        </tr>
-      </span>
-    </span>
-    <tr tal:condition="widgets/passport|nothing" 
-        tal:define="cell widgets/passport|nothing;">
-      <tal:block tal:define="widget cell/widget;
-      wid widget/getWidgetId;
-      err python:ds.getError(wid);
-      err_mapping python:ds.getErrorMapping(wid);
-      is_required python: widget.is_required and creation and ('create' not in widget.readonly_layout_modes);
-      tooltip_id python:wid + '_help';
-      widget_css_class widget/widget_css_class|nothing;
-      css_class python:test(err, 'row error','row')"
-      >
-        <div tal:attributes="class widget_css_class;
-        id python:widget.getHtmlWidgetId()+'_widget';"
-        >
-          <td>
-            <div class="label" tal:condition="widget/label_edit"
-                 tal:attributes="class python:test(is_required, 'label required','label')">
-              <label 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>
-          </td>
-          <td>
-            <span class="field">
-              <div tal:replace="structure cell/widget_rendered"/>
-            </span>
-            <div class="tooltipArea" style="visibility: hidden;"
-                 tal:condition="widget/help"
-                 tal:attributes="id tooltip_id;
-                 onclick python:'showElement(false, \'%s\')' % tooltip_id;"
-                 >
-              <tal:block 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>
-          </td>
-        </div>
-      </tal:block>
-    </tr>
-  </table>
-</metal:block>
Index: WAeUP_SRP/base/skins/waeup_student/layout_application_view.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/layout_application_view.pt	(revision 2242)
+++ 	(revision )
@@ -1,71 +1,0 @@
-<!-- a layout_lib macro -->
-<!-- $Id$ -->
-<metal:block define-macro="default_view"
-  tal:define="layout options/layout;
-              dm options/datastructure/getDataModel;
-              widgets python:context.getRenderedWidgets(layout);
-              fields python:('jamb_reg_no',
-                                 'app_ac_pin',
-                                 'app_ac_date',
-                                 'app_email',
-                                 'app_mobile',)"
-                                 >
-  <table cellpadding="2" cellspacing="2" summary="layout">
-    <tr>
-      <td valign="top"><span class="dlabel">Name</span>:
-      </td>
-      <td> 
-        <span tal:content="python:context.getStudentBaseInfo()['student']['name']" />
-      </td>      
-    </tr>
-    <tr>
-      <td valign="top"><span class="dlabel">Sex</span>:
-      </td>
-      <td> 
-        <span tal:content="python:context.getStudentBaseInfo()['student']['sex']" />
-      </td>      
-    </tr>          
-    <tr valign="top">
-      <td><span class="dlabel">Student ID</span>:
-      </td>
-      <td> 
-        <span tal:content="python:context.getStudentBaseInfo()['id']" />
-      </td>      
-    </tr>
-    <tr tal:repeat="field fields">
-      <tal:block tal:define="cell python: widgets[field]">
-        <tal:block define="widget cell/widget">
-          <div tal:attributes="class cell/widget_css_class|string:label;
-            id python:widget.getHtmlWidgetId()+'_widget';">
-            <td >
-             <span class="dlabel"
-                    tal:condition="widget/label"
-                    tal:content="widget/label">label</span>:
-            </td>
-            <td> 
-               <span tal:replace="structure cell/widget_rendered" />
-            </td>
-          </div>
-        </tal:block>
-      </tal:block>
-    </tr>
-    <tr>
-      <tal:block define="cell widgets/passport;
-                         widget cell/widget"
-                         >
-          <div tal:attributes="class cell/widget_css_class|nothing;
-              id python:widget.getHtmlWidgetId()+'_widget';">
-            <td valign="top">
-            <tal:block condition="widget/label">
-              <span class="label"
-                    tal:content="widget/label">label</span>:
-            </tal:block>
-            </td>
-            <td>
-              <img src="img" tal:replace="structure cell/widget_rendered">
-            </td>
-          </div>
-      </tal:block>
-    </tr>    
-  </table>
-</metal:block>
Index: WAeUP_SRP/base/skins/waeup_student/layout_application_view_info.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/layout_application_view_info.pt	(revision 2242)
+++ 	(revision )
@@ -1,83 +1,0 @@
-<metal:block define-macro="default_view"
-  tal:define="layout options/layout;
-              dm options/datastructure/getDataModel;
-              widgets python:context.getRenderedWidgets(layout);
-              info context/getStudentBaseInfo;"
-              >
-  
-      <tal:block define="cell widgets/passport;
-                         widget cell/widget">
-          <img src="img" tal:replace="structure cell/widget_rendered" />
-      </tal:block>
-      
-      <br />
-
-      <table width="" cellpadding="2" cellspacing="0" summary="Form layout">
-        <tr>
-          <td valign="top" width="180px"><span class="dlabel">Name</span>:
-          </td>
-          <td> 
-            <span tal:content="info/student/name" />
-          </td>      
-        </tr>
-        <tr>
-          <td valign="top" width="180px"><span class="dlabel">Sex</span>:
-          </td>
-          <td> 
-            <span tal:content="info/student/sex" />
-          </td>      
-        </tr>          
-        <tr valign="top">
-          <td><span class="dlabel">Student ID</span>:
-          </td>
-          <td> 
-            <span tal:content="info/id" />
-          </td>      
-        </tr>
-        <tr valign="top">
-          <td><span class="dlabel">Matriculation No</span>:
-          </td>
-          <td> 
-            <span tal:content="info/student/matric_no" />
-          </td>      
-        </tr>        
-        <tr valign="top">
-          <td><span class="dlabel">Registration No</span>:
-          </td>
-          <td> 
-            <span tal:content="info/student/jamb_reg_no" />
-          </td>      
-        </tr>   
-        <tr valign="top">
-          <td><span class="dlabel">Email</span>:
-          </td>
-          <td> 
-            <span tal:content="info/student/email" />
-          </td>      
-        </tr>         
-        <tr valign="top">
-          <td><span class="dlabel">Phone</span>:
-          </td>
-          <td> 
-            <span tal:content="info/student/phone" />
-          </td>      
-        </tr>         
-        <tr valign="top">
-          <td><span class="dlabel">Current Session</span>:
-          </td>
-          <td> 
-            <span tal:content="python:context.portal_vocabularies.sessions.get(info['student']['session'])" />  
-          </td>      
-        </tr>           
-        <tr valign="top">
-          <td><span class="dlabel">Current Level</span>:
-          </td>
-          <td> 
-            <span tal:content="python:context.portal_vocabularies.levels.get(info['student']['level'])" />  
-          </td>      
-        </tr>             
-      </table>
-        
-        
-
-</metal:block>
Index: WAeUP_SRP/base/skins/waeup_student/layout_application_view_slip.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/layout_application_view_slip.pt	(revision 2242)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<metal:block define-macro="default_view"
-  tal:define="layout options/layout;
-              info context/getStudentBaseInfo;
-              dm options/datastructure/getDataModel;
-              widgets python:context.getRenderedWidgets(layout);
-              fields python:('jamb_reg_no',
-                                 'app_ac_pin',
-                                 'app_ac_date',
-                                 'app_email',
-                                 'app_mobile',
-                                 'entry_mode',
-                                 'jamb_state',
-                                  )"
-                                 >
-  <table cellpadding="10px" cellspacing="">
-    <tr>
-      <tal:block define="cell widgets/passport;
-                 widget cell/widget"
-                 >
-        <td valign="top">
-          <img src="img" tal:replace="structure cell/widget_rendered" />
-        </td>
-      </tal:block>
-      <td>
-        <table width="" cellpadding="2" cellspacing="0" summary="Form layout">
-          <tr>
-            <td valign="top"><span class="dlabel">Name</span>:
-            </td>
-            <td> 
-              <span tal:content="info/student/name" />
-            </td>      
-          </tr>
-          <tr>
-            <td valign="top"><span class="dlabel">Sex</span>:
-            </td>
-            <td> 
-              <span tal:content="info/student/sex" />
-            </td>      
-          </tr>          
-          <tr valign="top">
-            <td><span class="dlabel">Student ID</span>:
-            </td>
-            <td> 
-              <span tal:content="info/student/id" />
-            </td>      
-          </tr>
-          <tr tal:repeat="field fields">
-            <tal:block tal:define="cell python: widgets[field]">
-              <tal:block define="widget cell/widget">
-                <div tal:attributes="class cell/widget_css_class|string:label;
-                id python:widget.getHtmlWidgetId()+'_widget';"
-                >
-                  <td valign="top">
-                    <span class="dlabel"
-                          tal:condition="widget/label"
-                          tal:content="widget/label">label</span>:
-                  </td>
-                  <td valign="top"> 
-                    <span tal:replace="structure cell/widget_rendered" />
-                  </td>
-                </div>
-              </tal:block>
-            </tal:block>
-          </tr>
-        </table>
-      </td>
-    </tr>
-  </table>
-</metal:block>
Index: WAeUP_SRP/base/skins/waeup_student/layout_apply_pume_create.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/layout_apply_pume_create.pt	(revision 2242)
+++ 	(revision )
@@ -1,58 +1,0 @@
-<tal:block define="global creation python:1;
-                   global formaction string:apply_admission" />
-<!-- a layout_lib macro -->
-<!-- $Id$ -->
-
-<metal:block define-macro="default_table"
-  tal:define="layout options/layout;
-  ds options/datastructure;
-  dm ds/getDataModel;
-  creation creation|nothing;
-  metadata metadata|nothing;
-  cpsmcat nocall:here/translation_service;
-  apply request/apply_button|nothing;">
-  
-  <table  cellpadding="2" cellspacing="2" summary="Form layout" border=0
-       tal:condition="layout/rows">
-  <tr tal:repeat="row layout/rows" valign="top">
-
-  <span tal:repeat="cell row"> 
-        <tal:block define="widget cell/widget;
-                           wid widget/getWidgetId;
-                           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;
-                           css_class python:test(err, 'row error','row')">
-          <span tal:attributes="class widget_css_class;
-                               id python:widget.getHtmlWidgetId()+'_widget';
-                              ">
-                              
-                    
-            <td tal:condition="python:widget.label_edit and widget.label_edit!='label field'">               
-              <div class="label">
-                <label tal:content="widget/label_edit"
-                  tal:attributes="for cell/widget_input_area_id|nothing;">label</label>
-              </div>
-            </td>
-            
-            <td>
-              <div tal:attributes="class python:test(widget.label_edit == 'label field', 'label','')">          
-              <label tal:replace="structure cell/widget_rendered"/> 
-              </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>
-            </td>
-  
-          </span>
-        </tal:block>
-  </span>      
-  </tr>
-  </table>
-  <br/>
-</metal:block>
Index: WAeUP_SRP/base/skins/waeup_student/layout_apply_pume_edit.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/layout_apply_pume_edit.pt	(revision 2242)
+++ 	(revision )
@@ -1,1 +1,0 @@
-<metal:block use-macro="here/layout_apply_pume_create/macros/default_table" />
Index: WAeUP_SRP/base/skins/waeup_student/layout_apply_pume_view.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/layout_apply_pume_view.pt	(revision 2242)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<metal:block use-macro="here/layout_apply_pume_create/macros/default_table" />
-<form action="" id="editForm" method="post" 
-      enctype="multipart/form-data" class="workflow"
-      tal:attributes="action string:${context/absolute_url}/apply_pume"
-      >
-  <input type="hidden" name="reg_no"
-         tal:attributes="value ds/reg_no|nothing"
-         tal:condition="ds/reg_no|nothing"/>
-  <input type="hidden" name="pin"
-         tal:attributes="value ds/pin|nothing"
-         tal:condition="ds/pin|nothing"/>
-  <input type="submit" class="standalone" name="slip"
-         value="Print Aknowledgement Slip"
-         />
-</form>
Index: WAeUP_SRP/base/skins/waeup_student/layout_apply_pume_view_slip.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/layout_apply_pume_view_slip.pt	(revision 2242)
+++ 	(revision )
@@ -1,1 +1,0 @@
-<metal:block use-macro="here/layout_apply_pume_create/macros/default_table" />
Index: WAeUP_SRP/base/skins/waeup_student/layout_clearance_edit.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/layout_clearance_edit.pt	(revision 2242)
+++ 	(revision )
@@ -1,72 +1,0 @@
-<!-- a layout_lib macro -->
-<!-- $Id$ -->
-
-<metal:block define-macro="default_edit"
-  tal:define="layout options/layout;
-  ds options/datastructure;
-  dm ds/getDataModel;
-  formaction options/formaction|string:clearance_edit;
-  creation creation|nothing;
-  metadata metadata|nothing;
-  type_name request/type_name|nothing;
-  cpsmcat nocall:here/translation_service;
-  proceed options/proceed|nothing;
-  widgets python:context.getRenderedWidgets(layout);
-  ">
-  <table class="layoutDefault" summary="Form layout"
-         tal:condition="layout/rows">
-    <span tal:repeat="row python: layout['rows']" valign="top" >
-      <span tal:repeat="cell row">
-        <span tal:define="widget cell/widget;
-              wid widget/getWidgetId;
-              err python:ds.getError(wid);
-              err_mapping python:ds.getErrorMapping(wid);
-              is_required python: widget.is_required;
-              tooltip_id python:wid + '_help';
-              widget_css_class cell/widget_css_class|nothing;
-              css_class python:test(err, 'row error','row')"
-              tal:condition="python: wid != 'passport'"
-              >
-        <tr tal:condition="widget/description|nothing" class="even ajaxtd">
-          <th colspan="5" align="left"><h3 tal:replace="widget/description" /></th>
-        </tr>
-        <tr>
-          <div tal:attributes="class widget_css_class;
-          id python:widget.getHtmlWidgetId()+'_widget';"
-          >
-            <td>
-            <div class="label" tal:condition="widget/label_edit"
-                 tal:attributes="class python:test(is_required, 'label required','label')">
-              <label 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>
-            </td>
-            <td valign="bottom">
-            <span class="field">
-              <div tal:replace="structure cell/widget_rendered"/>
-            </span>
-            <div class="tooltipArea" style="visibility: hidden;"
-                 tal:condition="widget/help"
-                 tal:attributes="id tooltip_id;
-                 onclick python:'showElement(false, \'%s\')' % tooltip_id;"
-                 >
-              <tal:block tal:content="widget/help">This is the help for this field
-              </tal:block>
-            </div>
-            <tal:block condition="python: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>
-            </td>
-          </div>
-        </tr>
-      </span>
-      </span>
-    </span>
-  </table>
-</metal:block>
Index: WAeUP_SRP/base/skins/waeup_student/layout_clearance_view.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/layout_clearance_view.pt	(revision 2242)
+++ 	(revision )
@@ -1,47 +1,0 @@
-<!-- a layout_lib macro -->
-<!-- $Id$ -->
-<metal:block define-macro="default_view"
-  tal:define="layout options/layout;
-              widgets python:context.getRenderedWidgets(layout);
-              fields_not_displayed python:('',)"
-                                 >
-  <table>
-    <span tal:omit-tag=""  tal:repeat="row layout/rows">
-        <span  tal:omit-tag="" tal:repeat="cell row">
-          <span tal:omit-tag="" tal:condition="python:cell['widget_rendered'] 
-                               and not cell['widget_rendered'] in ('None','-',)
-                               or cell['widget_id'] == 'birth_certificate'">
-          <span tal:omit-tag=""  tal:define="widget cell/widget"
-                tal:condition="python:cell['widget_id'] not in fields_not_displayed">
-            <div tal:omit-tag=""
-                 tal:attributes="class cell/widget_css_class|nothing;">
-                 
-            <tr tal:condition="widget/description|nothing" class="even ajaxtd">
-              <th colspan="5" align="left"><h3 tal:replace="widget/description" /></th>
-            </tr>
-            <tr>                         
-            <tal:block condition="widget/label">
-            <td width="180px" valign="top">
-              <span i18n:translate="" tal:condition="widget/is_i18n">
-                  <span tal:content="widget/label" />:</span>
-              <span tal:condition="not:widget/is_i18n">
-                  <span tal:content="widget/label" />:</span>
-            </td>
-            </tal:block>
-            <tal:block condition="not: widget/label">
-            <td valign="top">
-              <div> no label </div>
-            </td>
-            </tal:block>              
-            <td valign="bottom">
-             <div class="ddescription" tal:condition="cell/widget_rendered" tal:content="structure cell/widget_rendered"></div>
-             <div class="ddescription" tal:condition="not:cell/widget_rendered"> none </div>
-              </td>
-            </tr>
-            </div>
-          </span>
-          </span>
-      </span>
-    </span>
-  </table>
-</metal:block>
Index: WAeUP_SRP/base/skins/waeup_student/layout_enter_access_code.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/layout_enter_access_code.pt	(revision 2242)
+++ 	(revision )
@@ -1,138 +1,0 @@
-<tal:block define="global creation python:1;
-                   global formaction string:apply_admission" />
-<!-- a layout_lib macro -->
-<!-- $Id$ -->
-
-<metal:block define-macro="default_edit"
-  tal:define="layout options/layout;
-  ds options/datastructure;
-  dm ds/getDataModel;
-  formaction options/formaction;
-  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);
-  cpsmcat nocall:here/translation_service;
-  apply request/apply_button|nothing;
-  widgets python:context.getRenderedWidgets(layout);
-  ">
-  <form action="" id="editForm" method="post" 
-        enctype="multipart/form-data" class="workflow"
-        tal:attributes="action formaction"
-        >
-  <table class="layoutDefault" summary="Form layout"
-         tal:condition="layout/rows">
-    <span tal:repeat="row python: layout['rows']" valign="top" >
-      <span tal:repeat="cell row">
-        <tr tal:define="widget cell/widget;
-              wid widget/getWidgetId;
-              err python:ds.getError(wid);
-              err_mapping python:ds.getErrorMapping(wid);
-              is_required python: widget.is_required and creation and ('create' not in widget.readonly_layout_modes);
-              tooltip_id python:wid + '_help';
-              widget_css_class cell/widget_css_class|nothing;
-              css_class python:test(err, 'row error','row')"
-              tal:condition="python: wid != 'passport'"
-              >
-          <div tal:attributes="class widget_css_class;
-          id python:widget.getHtmlWidgetId()+'_widget';"
-          >
-            <td>
-            <div class="label" tal:condition="widget/label_edit"
-                 tal:attributes="class python:test(is_required, 'label required','label')">
-              <label 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>
-            </td>
-            <td>
-            <span class="field">
-              <div tal:replace="structure cell/widget_rendered"/>
-            </span>
-            <div class="tooltipArea" style="visibility: hidden;"
-                 tal:condition="widget/help"
-                 tal:attributes="id tooltip_id;
-                 onclick python:'showElement(false, \'%s\')' % tooltip_id;"
-                 >
-              <tal:block 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>
-            </td>
-          </div>
-        </tr>
-      </span>
-    </span>
-    <tr tal:condition="widgets/passport|nothing" 
-        tal:define="cell widgets/passport|nothing;">
-      <tal:block tal:define="widget cell/widget;
-      wid widget/getWidgetId;
-      err python:ds.getError(wid);
-      err_mapping python:ds.getErrorMapping(wid);
-      is_required python: widget.is_required and creation and ('create' not in widget.readonly_layout_modes);
-      tooltip_id python:wid + '_help';
-      widget_css_class widget/widget_css_class|nothing;
-      css_class python:test(err, 'row error','row')"
-      >
-        <div tal:attributes="class widget_css_class;
-        id python:widget.getHtmlWidgetId()+'_widget';"
-        >
-          <td>
-            <div class="label" tal:condition="widget/label_edit"
-                 tal:attributes="class python:test(is_required, 'label required','label')">
-              <label 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>
-          </td>
-          <td>
-            <span class="field">
-              <div tal:replace="structure cell/widget_rendered"/>
-            </span>
-            <div class="tooltipArea" style="visibility: hidden;"
-                 tal:condition="widget/help"
-                 tal:attributes="id tooltip_id;
-                 onclick python:'showElement(false, \'%s\')' % tooltip_id;"
-                 >
-              <tal:block 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>
-          </td>
-        </div>
-      </tal:block>
-    </tr>
-  </table>
-  <br />
-  <input type="submit" class="standalone" name="cpsdocument_edit_button"
-         value="Save" 
-         id="cpsdocument_edit_button"
-         tal:condition="not:creation" />
-  <input type="submit" class="standalone" name="apply_admission"
-         value="apply for admission"
-         id="cpsdocument_edit_and_view_button"
-         tal:condition="apply" 
-         tal:attributes="value apply"/>
-  <input type="submit" 
-         class="standalone" 
-         name="cpsdocument_create_button"
-         value="apply"
-         tal:attributes="value options/button"
-         tal:condition="creation" />
-
-</form>
-</metal:block>
Index: WAeUP_SRP/base/skins/waeup_student/layout_personal_edit.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/layout_personal_edit.pt	(revision 2242)
+++ 	(revision )
@@ -1,121 +1,0 @@
-<metal:block define-macro="default_edit"
-  tal:define="layout options/layout;
-  ds options/datastructure;
-  dm ds/getDataModel;
-  formaction options/formaction|string:personal_edit;
-  creation creation|nothing;
-  cpsmcat nocall:here/translation_service;
-  proceed options/proceed|nothing;
-  widgets python:context.getRenderedWidgets(layout);
-  ">
-  <table class="layoutDefault" summary="Form layout"
-         tal:condition="layout/rows">
-         
-    <tr tal:define="lga python:context.getStudentBaseInfo()['student']['lga'];
-                    lga_voc python:context.portal_vocabularies.local_gov_areas.get(lga)">
-      <td><div class="label">State / LGA</div>:
-      </td>
-      <td tal:condition="lga_voc"> 
-         <span tal:replace="lga_voc" />
-      </td>      
-      <td tal:condition="not: lga_voc"> 
-         <span tal:replace="lga" />
-      </td>           
-    </tr>    
-         
-    <span tal:repeat="row python: layout['rows']" valign="top" >
-      <span tal:repeat="cell row">
-        <tr tal:define="widget cell/widget;
-              wid widget/getWidgetId;
-              err python:ds.getError(wid);
-              err_mapping python:ds.getErrorMapping(wid);
-              is_required python: widget.is_required;
-              tooltip_id python:wid + '_help';
-              widget_css_class cell/widget_css_class|nothing;
-              css_class python:test(err, 'row error','row')"
-              tal:condition="python: wid != 'passport'"
-              >
-          <div tal:attributes="class widget_css_class;
-          id python:widget.getHtmlWidgetId()+'_widget';"
-          >
-            <td>
-            <div class="label" tal:condition="widget/label_edit"
-                 tal:attributes="class python:test(is_required, 'label required','label')">
-              <label 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>
-            </td>
-            <td>
-            <span class="field">
-              <div tal:replace="structure cell/widget_rendered"/>
-            </span>
-            <div class="tooltipArea" style="visibility: hidden;"
-                 tal:condition="widget/help"
-                 tal:attributes="id tooltip_id;
-                 onclick python:'showElement(false, \'%s\')' % tooltip_id;"
-                 >
-              <tal:block 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>
-            </td>
-          </div>
-        </tr>
-      </span>
-    </span>
-    <tr tal:condition="widgets/passport|nothing" 
-        tal:define="cell widgets/passport|nothing;">
-      <tal:block tal:define="widget cell/widget;
-      wid widget/getWidgetId;
-      err python:ds.getError(wid);
-      err_mapping python:ds.getErrorMapping(wid);
-      is_required python: widget.is_required and creation and ('create' not in widget.readonly_layout_modes);
-      tooltip_id python:wid + '_help';
-      widget_css_class widget/widget_css_class|nothing;
-      css_class python:test(err, 'row error','row')"
-      >
-        <div tal:attributes="class widget_css_class;
-        id python:widget.getHtmlWidgetId()+'_widget';"
-        >
-          <td>
-            <div class="label" tal:condition="widget/label_edit"
-                 tal:attributes="class python:test(is_required, 'label required','label')">
-              <label 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>
-          </td>
-          <td>
-            <span class="field">
-              <div tal:replace="structure cell/widget_rendered"/>
-            </span>
-            <div class="tooltipArea" style="visibility: hidden;"
-                 tal:condition="widget/help"
-                 tal:attributes="id tooltip_id;
-                 onclick python:'showElement(false, \'%s\')' % tooltip_id;"
-                 >
-              <tal:block 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>
-          </td>
-        </div>
-      </tal:block>
-    </tr>
-  </table>
-</metal:block>
Index: WAeUP_SRP/base/skins/waeup_student/layout_personal_view.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/layout_personal_view.pt	(revision 2242)
+++ 	(revision )
@@ -1,59 +1,0 @@
-<!-- a layout_lib macro -->
-<!-- $Id: layout_application_view.pt 980 2006-12-02 07:18:27Z henrik $ -->
-<metal:block define-macro="default_view"
-  tal:define="layout options/layout;
-              dm options/datastructure/getDataModel;">
-
-  <table cellpadding="2" cellspacing="2" summary="layout">
-    <tr>
-      <td><span class="dlabel">Student ID</span>:
-      </td>
-      <td> 
-         <span tal:replace="context/getStudentId" />
-      </td>      
-    </tr>
-    
-    <tr tal:define="lga python:context.getStudentBaseInfo()['student']['lga'];
-                    lga_voc python:context.portal_vocabularies.local_gov_areas.get(lga)">
-      <td><span class="dlabel">State / LGA</span>:
-      </td>
-      <td tal:condition="lga_voc"> 
-         <span tal:replace="lga_voc" />
-      </td>      
-      <td tal:condition="not: lga_voc"> 
-         <span tal:replace="lga" />
-      </td>           
-    </tr>    
-    
-    <span tal:repeat="row layout/rows">
-        <span tal:repeat="cell row">
-          <span tal:condition="python:cell['widget_rendered']">
-          <span tal:define="widget cell/widget">
-            <div tal:omit-tag=""
-                 tal:attributes="class cell/widget_css_class|nothing;">
-            <tr>                         
-            <tal:block condition="widget/label">
-            <td width="180px" valign="top" nowrap>
-              <span i18n:translate="" tal:condition="widget/is_i18n">
-                  <span tal:content="widget/label" />:</span>
-              <span tal:condition="not:widget/is_i18n">
-                  <span tal:content="widget/label" />:</span>
-            </td>
-            </tal:block>
-            <tal:block condition="not: widget/label">
-            <td valign="top">
-              <div> no label </div>
-            </td>
-            </tal:block>              
-            <td valign="top">
-             <div class="ddescription" tal:condition="cell/widget_rendered" tal:content="structure cell/widget_rendered"></div>
-             <div class="ddescription" tal:condition="not:cell/widget_rendered"> none </div>
-            </td>
-            </tr>
-            </div>
-          </span>
-          </span>
-      </span>
-    </span>    
-  </table>
-</metal:block>
Index: WAeUP_SRP/base/skins/waeup_student/layout_plain_edit.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/layout_plain_edit.pt	(revision 2242)
+++ 	(revision )
@@ -1,110 +1,0 @@
-<metal:block define-macro="default_edit"
-  tal:define="layout options/layout;
-  ds options/datastructure;
-  dm ds/getDataModel;
-  formaction options/formaction|string:personal_edit;
-  creation creation|nothing;
-  cpsmcat nocall:here/translation_service;
-  proceed options/proceed|nothing;
-  widgets python:context.getRenderedWidgets(layout);
-  ">
-  <table class="layoutDefault" summary="Form layout"
-         tal:condition="layout/rows">
-         
-        
-    <span tal:repeat="row python: layout['rows']" valign="top" >
-      <span tal:repeat="cell row">
-        <tr tal:define="widget cell/widget;
-              wid widget/getWidgetId;
-              err python:ds.getError(wid);
-              err_mapping python:ds.getErrorMapping(wid);
-              is_required python: widget.is_required;
-              tooltip_id python:wid + '_help';
-              widget_css_class cell/widget_css_class|nothing;
-              css_class python:test(err, 'row error','row')"
-              tal:condition="python: wid != 'passport'"
-              >
-          <div tal:attributes="class widget_css_class;
-          id python:widget.getHtmlWidgetId()+'_widget';"
-          >
-            <td>
-            <div class="label" tal:condition="widget/label_edit"
-                 tal:attributes="class python:test(is_required, 'label required','label')">
-              <label 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>
-            </td>
-            <td>
-            <span class="field">
-              <div tal:replace="structure cell/widget_rendered"/>
-            </span>
-            <div class="tooltipArea" style="visibility: hidden;"
-                 tal:condition="widget/help"
-                 tal:attributes="id tooltip_id;
-                 onclick python:'showElement(false, \'%s\')' % tooltip_id;"
-                 >
-              <tal:block 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>
-            </td>
-          </div>
-        </tr>
-      </span>
-    </span>
-    <tr tal:condition="widgets/passport|nothing" 
-        tal:define="cell widgets/passport|nothing;">
-      <tal:block tal:define="widget cell/widget;
-      wid widget/getWidgetId;
-      err python:ds.getError(wid);
-      err_mapping python:ds.getErrorMapping(wid);
-      is_required python: widget.is_required and creation and ('create' not in widget.readonly_layout_modes);
-      tooltip_id python:wid + '_help';
-      widget_css_class widget/widget_css_class|nothing;
-      css_class python:test(err, 'row error','row')"
-      >
-        <div tal:attributes="class widget_css_class;
-        id python:widget.getHtmlWidgetId()+'_widget';"
-        >
-          <td>
-            <div class="label" tal:condition="widget/label_edit"
-                 tal:attributes="class python:test(is_required, 'label required','label')">
-              <label 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>
-          </td>
-          <td>
-            <span class="field">
-              <div tal:replace="structure cell/widget_rendered"/>
-            </span>
-            <div class="tooltipArea" style="visibility: hidden;"
-                 tal:condition="widget/help"
-                 tal:attributes="id tooltip_id;
-                 onclick python:'showElement(false, \'%s\')' % tooltip_id;"
-                 >
-              <tal:block 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>
-          </td>
-        </div>
-      </tal:block>
-    </tr>
-  </table>
-</metal:block>
Index: WAeUP_SRP/base/skins/waeup_student/layout_plain_view.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/layout_plain_view.pt	(revision 2242)
+++ 	(revision )
@@ -1,47 +1,0 @@
-<!-- a layout_lib macro -->
-<!-- $Id: layout_application_view.pt 980 2006-12-02 07:18:27Z henrik $ -->
-<metal:block define-macro="default_view"
-  tal:define="layout options/layout;
-              dm options/datastructure/getDataModel;">
-
-  <table cellpadding="2" cellspacing="2" summary="layout">
-    <tr>
-      <td><span class="dlabel">Student ID</span>:
-      </td>
-      <td> 
-         <span tal:replace="context/getStudentId" />
-      </td>      
-    </tr>
-    
-    <span tal:repeat="row layout/rows">
-        <span tal:repeat="cell row">
-          <span tal:condition="python:cell['widget_rendered']">
-          <span tal:define="widget cell/widget">
-            <div tal:omit-tag=""
-                 tal:attributes="class cell/widget_css_class|nothing;">
-            <tr>                         
-            <tal:block condition="widget/label">
-            <td width="180px" valign="top" nowrap>
-              <span i18n:translate="" tal:condition="widget/is_i18n">
-                  <span tal:content="widget/label" />:</span>
-              <span tal:condition="not:widget/is_i18n">
-                  <span tal:content="widget/label" />:</span>
-            </td>
-            </tal:block>
-            <tal:block condition="not: widget/label">
-            <td valign="top">
-              <div> no label </div>
-            </td>
-            </tal:block>              
-            <td valign="top">
-             <div class="ddescription" tal:condition="cell/widget_rendered" tal:content="structure cell/widget_rendered"></div>
-             <div class="ddescription" tal:condition="not:cell/widget_rendered"> none </div>
-            </td>
-            </tr>
-            </div>
-          </span>
-          </span>
-      </span>
-    </span>    
-  </table>
-</metal:block>
Index: WAeUP_SRP/base/skins/waeup_student/layout_pume_view.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/layout_pume_view.pt	(revision 2242)
+++ 	(revision )
@@ -1,1 +1,0 @@
-<metal:block use-macro="here/layout_waeup_lib/macros/table_view" />
Index: WAeUP_SRP/base/skins/waeup_student/layout_pume_view_slip.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/layout_pume_view_slip.pt	(revision 2242)
+++ 	(revision )
@@ -1,29 +1,0 @@
-<!-- a layout_lib macro -->
-<!-- $Id$ -->
-<metal:block define-macro="default_view"
-       tal:define="layout options/layout;
-              dm options/datastructure/getDataModel;
-              widgets python:context.getRenderedWidgets(layout);
-              fields python:('pume_tot_score',)"
-              >
-  <table width="" cellpadding="2" cellspacing="0" summary="Form layout">
-    <tr tal:repeat="field fields">
-      <tal:block tal:define="cell python: widgets[field]">
-        <tal:block define="widget cell/widget">
-          <div tal:attributes="class cell/widget_css_class|string:label;
-            id python:widget.getHtmlWidgetId()+'_widget';">
-            <td width="180px">
-             <span class="dlabel"
-                    tal:condition="widget/label"
-                    tal:content="widget/label">label</span>:
-            </td>
-            <td> 
-               <span tal:condition="cell" tal:content="structure cell/widget_rendered"></span>
-               <span tal:condition="not:cell/widget_rendered"> none </span>
-            </td>
-          </div>
-        </tal:block>
-      </tal:block>
-    </tr>
-  </table>
-</metal:block>
Index: WAeUP_SRP/base/skins/waeup_student/layout_search_pume_create.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/layout_search_pume_create.pt	(revision 2242)
+++ 	(revision )
@@ -1,138 +1,0 @@
-<tal:block define="global creation python:1;
-                   global formaction string:display_pume_result" />
-<!-- a layout_lib macro -->
-<!-- $Id$ -->
-
-<metal:block define-macro="default_edit"
-  tal:define="layout options/layout;
-  ds options/datastructure;
-  dm ds/getDataModel;
-  formaction options/formaction;
-  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);
-  cpsmcat nocall:here/translation_service;
-  apply request/apply_button|nothing;
-  widgets python:context.getRenderedWidgets(layout);
-  ">
-  <form action="" id="editForm" method="post" 
-        enctype="multipart/form-data" class="workflow"
-        tal:attributes="action formaction"
-        >
-  <table class="layoutDefault" summary="Form layout"
-         tal:condition="layout/rows">
-    <span tal:repeat="row python: layout['rows']" valign="top" >
-      <span tal:repeat="cell row">
-        <tr tal:define="widget cell/widget;
-              wid widget/getWidgetId;
-              err python:ds.getError(wid);
-              err_mapping python:ds.getErrorMapping(wid);
-              is_required python: widget.is_required and creation and ('create' not in widget.readonly_layout_modes);
-              tooltip_id python:wid + '_help';
-              widget_css_class cell/widget_css_class|nothing;
-              css_class python:test(err, 'row error','row')"
-              tal:condition="python: wid != 'passport'"
-              >
-          <div tal:attributes="class widget_css_class;
-          id python:widget.getHtmlWidgetId()+'_widget';"
-          >
-            <td>
-            <div class="label" tal:condition="widget/label_edit"
-                 tal:attributes="class python:test(is_required, 'label required','label')">
-              <label 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>
-            </td>
-            <td>
-            <span class="field">
-              <div tal:replace="structure cell/widget_rendered"/>
-            </span>
-            <div class="tooltipArea" style="visibility: hidden;"
-                 tal:condition="widget/help"
-                 tal:attributes="id tooltip_id;
-                 onclick python:'showElement(false, \'%s\')' % tooltip_id;"
-                 >
-              <tal:block 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>
-            </td>
-          </div>
-        </tr>
-      </span>
-    </span>
-    <tr tal:condition="widgets/passport|nothing" 
-        tal:define="cell widgets/passport|nothing;">
-      <tal:block tal:define="widget cell/widget;
-      wid widget/getWidgetId;
-      err python:ds.getError(wid);
-      err_mapping python:ds.getErrorMapping(wid);
-      is_required python: widget.is_required and creation and ('create' not in widget.readonly_layout_modes);
-      tooltip_id python:wid + '_help';
-      widget_css_class widget/widget_css_class|nothing;
-      css_class python:test(err, 'row error','row')"
-      >
-        <div tal:attributes="class widget_css_class;
-        id python:widget.getHtmlWidgetId()+'_widget';"
-        >
-          <td>
-            <div class="label" tal:condition="widget/label_edit"
-                 tal:attributes="class python:test(is_required, 'label required','label')">
-              <label 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>
-          </td>
-          <td>
-            <span class="field">
-              <div tal:replace="structure cell/widget_rendered"/>
-            </span>
-            <div class="tooltipArea" style="visibility: hidden;"
-                 tal:condition="widget/help"
-                 tal:attributes="id tooltip_id;
-                 onclick python:'showElement(false, \'%s\')' % tooltip_id;"
-                 >
-              <tal:block 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>
-          </td>
-        </div>
-      </tal:block>
-    </tr>
-  </table>
-  <br />
-  <input type="submit" class="standalone" name="cpsdocument_edit_button"
-         value="Save" 
-         id="cpsdocument_edit_button"
-         tal:condition="not:creation" />
-  <input type="submit" class="standalone" name="apply_admission"
-         value="apply for admission"
-         id="cpsdocument_edit_and_view_button"
-         tal:condition="apply" 
-         tal:attributes="value apply"/>
-  <input type="submit" 
-         class="standalone" 
-         name="cpsdocument_create_button"
-         value="apply"
-         tal:attributes="value options/button"
-         tal:condition="creation" />
-
-</form>
-</metal:block>
Index: WAeUP_SRP/base/skins/waeup_student/layout_search_session_create.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/layout_search_session_create.pt	(revision 2242)
+++ 	(revision )
@@ -1,91 +1,0 @@
-<tal:block define="global creation python:1;
-                   global formaction string:display_pume_result" />
-<!-- a layout_lib macro -->
-<!-- $Id$ -->
-
-<metal:block define-macro="default_edit"
-  tal:define="layout options/layout;
-  ds options/datastructure;
-  dm ds/getDataModel;
-  formaction options/formaction;
-  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);
-  cpsmcat nocall:here/translation_service;
-  apply request/apply_button|nothing;
-  ">
-  <form action="" id="editForm" method="post" 
-        enctype="multipart/form-data" class="workflow"
-        tal:attributes="action formaction"
-        >
-  <table class="layoutDefault" summary="Form layout"
-         tal:condition="layout/rows">
-    <span tal:repeat="row python: layout['rows']" valign="top" >
-      <span tal:repeat="cell row">
-        <tr tal:define="widget cell/widget;
-              wid widget/getWidgetId;
-              err python:ds.getError(wid);
-              err_mapping python:ds.getErrorMapping(wid);
-              is_required python: widget.is_required and creation and ('create' not in widget.readonly_layout_modes);
-              tooltip_id python:wid + '_help';
-              widget_css_class cell/widget_css_class|nothing;
-              css_class python:test(err, 'row error','row')"
-              tal:condition="python: wid != 'passport'"
-              >
-          <div tal:attributes="class widget_css_class;
-          id python:widget.getHtmlWidgetId()+'_widget';"
-          >
-            <td>
-            <div class="label" tal:condition="widget/label_edit"
-                 tal:attributes="class python:test(is_required, 'label required','label')">
-              <label 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>
-            </td>
-            <td>
-            <span class="field">
-              <div tal:replace="structure cell/widget_rendered"/>
-            </span>
-            <div class="tooltipArea" style="visibility: hidden;"
-                 tal:condition="widget/help"
-                 tal:attributes="id tooltip_id;
-                 onclick python:'showElement(false, \'%s\')' % tooltip_id;"
-                 >
-              <tal:block 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>
-            </td>
-          </div>
-        </tr>
-      </span>
-    </span>
-  </table>
-  <br />
-  <input type="submit" class="standalone" name="cpsdocument_edit_button"
-         value="Save" 
-         id="cpsdocument_edit_button"
-         tal:condition="not:creation" />
-  <input type="submit" class="standalone" name="apply_admission"
-         value="apply for admission"
-         id="cpsdocument_edit_and_view_button"
-         tal:condition="apply" 
-         tal:attributes="value apply"/>
-  <input type="submit" 
-         class="standalone" 
-         name="cpsdocument_create_button"
-         value="apply"
-         tal:attributes="value options/button"
-         tal:condition="creation" />
-
-</form>
-</metal:block>
Index: WAeUP_SRP/base/skins/waeup_student/layout_search_session_edit.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/layout_search_session_edit.pt	(revision 2242)
+++ 	(revision )
@@ -1,91 +1,0 @@
-<tal:block define="global creation python:0;
-                   global formaction string:set_access_data" />
-<!-- a layout_lib macro -->
-<!-- $Id$ -->
-
-<metal:block define-macro="default_edit"
-  tal:define="layout options/layout;
-  ds options/datastructure;
-  dm ds/getDataModel;
-  formaction options/formaction;
-  matric_no options/matric_no|nothing;
-  name options/name|nothing;
-  creation creation|nothing;
-  cpsmcat nocall:here/translation_service;
-  ">
-  <form action="" id="editForm" method="post" 
-        enctype="multipart/form-data" class="workflow"
-        tal:attributes="action formaction"
-        >
-  
-<input type="hidden" name="name" tal:attributes="value name"/>
-<input type="hidden" name="matric_no" tal:attributes="value matric_no"/>
-  <table class="layoutDefault" summary="Form layout"
-         tal:condition="layout/rows">
-    <span tal:repeat="row python: layout['rows']" valign="top" >
-      <span tal:repeat="cell row">
-        <tr tal:define="widget cell/widget;
-              wid widget/getWidgetId;
-              err python:ds.getError(wid);
-              err_mapping python:ds.getErrorMapping(wid);
-              is_required python: widget.is_required and creation and ('create' not in widget.readonly_layout_modes);
-              tooltip_id python:wid + '_help';
-              widget_css_class cell/widget_css_class|nothing;
-              css_class python:test(err, 'row error','row')"
-              tal:condition="python: wid != 'passport'"
-              >
-          <div tal:attributes="class widget_css_class;
-          id python:widget.getHtmlWidgetId()+'_widget';"
-          >
-            <td>
-            <div class="label" tal:condition="widget/label_edit"
-                 tal:attributes="class python:test(is_required, 'label required','label')">
-              <label 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>
-            </td>
-            <td>
-            <span class="field">
-              <div tal:replace="structure cell/widget_rendered"/>
-            </span>
-            <div class="tooltipArea" style="visibility: hidden;"
-                 tal:condition="widget/help"
-                 tal:attributes="id tooltip_id;
-                 onclick python:'showElement(false, \'%s\')' % tooltip_id;"
-                 >
-              <tal:block 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>
-            </td>
-          </div>
-        </tr>
-      </span>
-    </span>
-  </table>
-  <br />
-  <input type="checkbox" value="True" name="acknowledge" />     &nbsp;
-        <strong>I hereby acknowledge, by ticking this check box, 
-        that I'm the above designated person.</strong>    
-  <br /><br />
-  <input type="submit" class="standalone" name="cpsdocument_edit_button"
-         value="Save & First-time Login" 
-         id="cpsdocument_edit_button"
-         tal:condition="not:creation" />
-  <input type="submit" 
-         class="standalone" 
-         name="cpsdocument_create_button"
-         value="apply"
-         tal:attributes="value options/button"
-         tal:condition="creation" />
-
-</form>
-</metal:block>
Index: WAeUP_SRP/base/skins/waeup_student/layout_student_acco_create.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/layout_student_acco_create.pt	(revision 2242)
+++ 	(revision )
@@ -1,138 +1,0 @@
-<tal:block define="global creation python:1;
-                   global formaction string:apply_admission" />
-<!-- a layout_lib macro -->
-<!-- $Id$ -->
-
-<metal:block define-macro="default_edit"
-  tal:define="layout options/layout;
-  ds options/datastructure;
-  dm ds/getDataModel;
-  formaction options/formaction;
-  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);
-  cpsmcat nocall:here/translation_service;
-  apply request/apply_button|nothing;
-  widgets python:context.getRenderedWidgets(layout);
-  ">
-  <form action="" id="editForm" method="post" 
-        enctype="multipart/form-data" class="workflow"
-        tal:attributes="action formaction"
-        >
-  <table class="layoutDefault" summary="Form layout"
-         tal:condition="layout/rows">
-    <span tal:repeat="row python: layout['rows']" valign="top" >
-      <span tal:repeat="cell row">
-        <tr tal:define="widget cell/widget;
-              wid widget/getWidgetId;
-              err python:ds.getError(wid);
-              err_mapping python:ds.getErrorMapping(wid);
-              is_required python: widget.is_required and creation and ('create' not in widget.readonly_layout_modes);
-              tooltip_id python:wid + '_help';
-              widget_css_class cell/widget_css_class|nothing;
-              css_class python:test(err, 'row error','row')"
-              tal:condition="python: wid != 'passport'"
-              >
-          <div tal:attributes="class widget_css_class;
-          id python:widget.getHtmlWidgetId()+'_widget';"
-          >
-            <td>
-            <div class="label" tal:condition="widget/label_edit"
-                 tal:attributes="class python:test(is_required, 'label required','label')">
-              <label 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>
-            </td>
-            <td>
-            <span class="field">
-              <div tal:replace="structure cell/widget_rendered"/>
-            </span>
-            <div class="tooltipArea" style="visibility: hidden;"
-                 tal:condition="widget/help"
-                 tal:attributes="id tooltip_id;
-                 onclick python:'showElement(false, \'%s\')' % tooltip_id;"
-                 >
-              <tal:block 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>
-            </td>
-          </div>
-        </tr>
-      </span>
-    </span>
-    <tr tal:condition="widgets/passport|nothing" 
-        tal:define="cell widgets/passport|nothing;">
-      <tal:block tal:define="widget cell/widget;
-      wid widget/getWidgetId;
-      err python:ds.getError(wid);
-      err_mapping python:ds.getErrorMapping(wid);
-      is_required python: widget.is_required and creation and ('create' not in widget.readonly_layout_modes);
-      tooltip_id python:wid + '_help';
-      widget_css_class widget/widget_css_class|nothing;
-      css_class python:test(err, 'row error','row')"
-      >
-        <div tal:attributes="class widget_css_class;
-        id python:widget.getHtmlWidgetId()+'_widget';"
-        >
-          <td>
-            <div class="label" tal:condition="widget/label_edit"
-                 tal:attributes="class python:test(is_required, 'label required','label')">
-              <label 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>
-          </td>
-          <td>
-            <span class="field">
-              <div tal:replace="structure cell/widget_rendered"/>
-            </span>
-            <div class="tooltipArea" style="visibility: hidden;"
-                 tal:condition="widget/help"
-                 tal:attributes="id tooltip_id;
-                 onclick python:'showElement(false, \'%s\')' % tooltip_id;"
-                 >
-              <tal:block 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>
-          </td>
-        </div>
-      </tal:block>
-    </tr>
-  </table>
-  <br />
-  <input type="submit" class="standalone" name="cpsdocument_edit_button"
-         value="Save" 
-         id="cpsdocument_edit_button"
-         tal:condition="not:creation" />
-  <input type="submit" class="standalone" name="apply_admission"
-         value="apply for admission"
-         id="cpsdocument_edit_and_view_button"
-         tal:condition="apply" 
-         tal:attributes="value apply"/>
-  <input type="submit" 
-         class="standalone" 
-         name="cpsdocument_create_button"
-         value="apply"
-         tal:attributes="value options/button"
-         tal:condition="creation" />
-
-</form>
-</metal:block>
Index: WAeUP_SRP/base/skins/waeup_student/layout_student_acco_edit.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/layout_student_acco_edit.pt	(revision 2242)
+++ 	(revision )
@@ -1,138 +1,0 @@
-<tal:block define="global creation python:0;
-                   global formaction string:apply_admission" />
-<!-- a layout_lib macro -->
-<!-- $Id$ -->
-
-<metal:block define-macro="default_edit"
-  tal:define="layout options/layout;
-  ds options/datastructure;
-  dm ds/getDataModel;
-  formaction options/formaction;
-  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);
-  cpsmcat nocall:here/translation_service;
-  apply request/apply_button|nothing;
-  widgets python:context.getRenderedWidgets(layout);
-  ">
-  <form action="" id="editForm" method="post" 
-        enctype="multipart/form-data" class="workflow"
-        tal:attributes="action formaction"
-        >
-  <table class="layoutDefault" summary="Form layout"
-         tal:condition="layout/rows">
-    <span tal:repeat="row python: layout['rows']" valign="top" >
-      <span tal:repeat="cell row">
-        <tr tal:define="widget cell/widget;
-              wid widget/getWidgetId;
-              err python:ds.getError(wid);
-              err_mapping python:ds.getErrorMapping(wid);
-              is_required python: widget.is_required and creation and ('create' not in widget.readonly_layout_modes);
-              tooltip_id python:wid + '_help';
-              widget_css_class cell/widget_css_class|nothing;
-              css_class python:test(err, 'row error','row')"
-              tal:condition="python: wid != 'passport'"
-              >
-          <div tal:attributes="class widget_css_class;
-          id python:widget.getHtmlWidgetId()+'_widget';"
-          >
-            <td>
-            <div class="label" tal:condition="widget/label_edit"
-                 tal:attributes="class python:test(is_required, 'label required','label')">
-              <label 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>
-            </td>
-            <td>
-            <span class="field">
-              <div tal:replace="structure cell/widget_rendered"/>
-            </span>
-            <div class="tooltipArea" style="visibility: hidden;"
-                 tal:condition="widget/help"
-                 tal:attributes="id tooltip_id;
-                 onclick python:'showElement(false, \'%s\')' % tooltip_id;"
-                 >
-              <tal:block 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>
-            </td>
-          </div>
-        </tr>
-      </span>
-    </span>
-    <tr tal:condition="widgets/passport|nothing" 
-        tal:define="cell widgets/passport|nothing;">
-      <tal:block tal:define="widget cell/widget;
-      wid widget/getWidgetId;
-      err python:ds.getError(wid);
-      err_mapping python:ds.getErrorMapping(wid);
-      is_required python: widget.is_required and creation and ('create' not in widget.readonly_layout_modes);
-      tooltip_id python:wid + '_help';
-      widget_css_class widget/widget_css_class|nothing;
-      css_class python:test(err, 'row error','row')"
-      >
-        <div tal:attributes="class widget_css_class;
-        id python:widget.getHtmlWidgetId()+'_widget';"
-        >
-          <td>
-            <div class="label" tal:condition="widget/label_edit"
-                 tal:attributes="class python:test(is_required, 'label required','label')">
-              <label 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>
-          </td>
-          <td>
-            <span class="field">
-              <div tal:replace="structure cell/widget_rendered"/>
-            </span>
-            <div class="tooltipArea" style="visibility: hidden;"
-                 tal:condition="widget/help"
-                 tal:attributes="id tooltip_id;
-                 onclick python:'showElement(false, \'%s\')' % tooltip_id;"
-                 >
-              <tal:block 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>
-          </td>
-        </div>
-      </tal:block>
-    </tr>
-  </table>
-  <br />
-  <input type="submit" class="standalone" name="cpsdocument_edit_button"
-         value="Save" 
-         id="cpsdocument_edit_button"
-         tal:condition="not:creation" />
-  <input type="submit" class="standalone" name="apply_admission"
-         value="apply for admission"
-         id="cpsdocument_edit_and_view_button"
-         tal:condition="apply" 
-         tal:attributes="value apply"/>
-  <input type="submit" 
-         class="standalone" 
-         name="cpsdocument_create_button"
-         value="apply"
-         tal:attributes="value options/button"
-         tal:condition="creation" />
-
-</form>
-</metal:block>
Index: WAeUP_SRP/base/skins/waeup_student/layout_student_acco_view.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/layout_student_acco_view.pt	(revision 2242)
+++ 	(revision )
@@ -1,1 +1,0 @@
-<metal:block use-macro="here/layout_waeup_lib/macros/table_view" />
Index: WAeUP_SRP/base/skins/waeup_student/layout_student_acco_view_slip.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/layout_student_acco_view_slip.pt	(revision 2242)
+++ 	(revision )
@@ -1,34 +1,0 @@
-<!-- a layout_lib macro -->
-<!-- $Id$ -->
-<metal:block define-macro="default_view"
-  tal:define="layout options/layout;
-              dm options/datastructure/getDataModel;
-              widgets python:context.getRenderedWidgets(layout);
-              fields python:('bed',
-                                 'acco_res_sc_pin',
-                                 'acco_res_date',
-                                 'acco_maint_sc_pin', 
-                                 'acco_maint_date',
-                                 )"
-                                 >
-  <table width="" cellpadding="2" cellspacing="0" summary="Form layout">
-    <tr tal:repeat="field fields">
-      <tal:block tal:define="cell python: widgets[field]">
-        <tal:block define="widget cell/widget">
-          <div tal:attributes="class cell/widget_css_class|string:label;
-            id python:widget.getHtmlWidgetId()+'_widget';">
-            <td width="180px" valign="top">
-             <span class="dlabel"
-                    tal:condition="widget/label"
-                    tal:content="widget/label">label</span>:
-            </td>
-            <td> 
-               <span tal:condition="cell" tal:content="structure cell/widget_rendered"></span>
-               <span tal:condition="not:cell/widget_rendered"> none </span>
-            </td>
-          </div>
-        </tal:block>
-      </tal:block>
-    </tr>
-  </table>
-</metal:block>
Index: WAeUP_SRP/base/skins/waeup_student/layout_waeup_view_student_course.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/layout_waeup_view_student_course.pt	(revision 2242)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<!-- $Id$ -->
-<metal:block define-macro="table_view"
-             tal:define="layout options/layout;
-             widgets python:context.getRenderedWidgets(layout);
-             fields python:(
-                            'title',
-                            'study_course',
-                            'faculty',
-                            'department',
-                            )"
-                                  >
-  <table>
-    <tr tal:repeat="field fields">
-      <tal:block tal:define="cell python: widgets[field]">
-        <tal:block define="widget cell/widget">
-          <div tal:attributes="class cell/widget_css_class|string:label;
-          id python:widget.getHtmlWidgetId()+'_widget';"
-          >
-            <td >
-              <span class="dlabel"
-                    tal:condition="widget/label"
-                    tal:content="widget/label">label</span>:
-            </td>
-            <td> 
-              <span tal:replace="structure cell/widget_rendered" />
-            </td>
-          </div>
-        </tal:block>
-      </tal:block>
-    </tr>
-  </table>
-</metal:block>
Index: WAeUP_SRP/base/skins/waeup_student/portlet_student_notice_display.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/portlet_student_notice_display.pt	(revision 2242)
+++ 	(revision )
@@ -1,6 +1,0 @@
-<span tal:condition="python: getattr(context.campus.documents,'student_notice_doc',None)">
-<div style="margin: 5px; padding: 5px; background-color: black; color: white"
-     tal:define="doc python: context.campus.documents.student_notice_doc.getContent()"
-     tal:content="structure python:doc.wdrender()" />
-</span>
-
Index: WAeUP_SRP/base/skins/waeup_student/portlet_student_workflow_display.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/portlet_student_workflow_display.pt	(revision 2242)
+++ 	(revision )
@@ -1,158 +1,0 @@
-<tal:block define="item nocall:options/context_obj;
-           info item/getStudentWorkflowInfo;"
-           condition="context/isStudent">       
-
-           
-<table>           
-<tr><td style="padding: 1em 0em 0.2em 0em;">
-   <strong>Registration Status:</strong>
-</td></tr>
-</table>
-
-<table class="registration" tal:condition="not:info/cr">
-  <span tal:condition="python:path('info/review_state')=='application_pin_entered'">
-  <tr><td class="active">
-    <a href="" tal:attributes="href string:${info/url}/application_edit_form">
-    Admission started
-    </a>
-  </td></tr>
-  </span>
-  <span tal:condition="python:path('info/review_state')!='application_pin_entered'">
-  <tr><td>
-    Admission started
-  </td></tr>
-  </span>
-  <span tal:condition="python:path('info/review_state')=='admission_applied'">
-  <tr><td class="active">
-    <a href="" tal:attributes="href string:${info/url}/application_view">
-    Admission requested
-    </a>
-  </td></tr>
-  </span>
-  <span tal:condition="python:path('info/review_state')!='admission_applied'">
-  <tr><td>
-    Admission requested
-  </td></tr>
-  </span>
-  <span tal:condition="python:path('info/review_state')=='pume_passed'">
-  <tr><td class="active">PUME passed</td></tr>
-  </span>
-  <span tal:condition="python:path('info/review_state')=='pume_failed'">
-  <tr><td class="stopped">PUME failed</td></tr>
-  </span>
-  <span tal:condition="python:not path('info/review_state') in ('pume_passed', 'pume_failed',)">
-  <tr><td>PUME passed</td></tr>
-  </span>  
-  <span tal:condition="python:path('info/review_state')=='admitted'">
-  <tr>
-    <td class="active">
-    <a href="" tal:attributes="href string:${info/url}/admission_form">
-    Admitted
-    </a>
-    </td>
-  </tr>
-  </span>
-  <span tal:condition="python:path('info/review_state')=='admission_rejected'">
-  <tr><td class="stopped">Admission rejected</td></tr>
-  </span>
-  <span tal:condition="python:path('info/review_state') in ('objection_raised','clearance_pin_entered','clearance_requested','cleared_and_validated',)">
-  <tr>
-    <td>
-    <a href="" tal:attributes="href string:${info/url}/admission_form">
-    Admitted
-    </a>
-    </td>
-  </tr>
-  </span>  
-  <span tal:condition="python:path('info/review_state')=='objection_raised'">
-  <tr>
-    <td class="stopped">
-    <a href="" tal:attributes="href string:${info/url}/admission_form">
-    Objection raised
-    </a>
-    </td>
-  </tr>
-  </span>
-  <span tal:condition="python:path('info/review_state')!='objection_raised'">
-  <tr><td>Objection raised</td></tr>
-  </span>  
-  <span tal:condition="python:path('info/review_state')=='clearance_pin_entered'">
-  <tr>
-    <td class="active">
-    <a href="" tal:attributes="href string:${info/url}/clearance_edit_form">
-    Clearance started
-    </a>    
-    </td>
-  </tr>
-  </span>
-  <span tal:condition="python:path('info/review_state')!='clearance_pin_entered'">
-  <tr><td>Clearance started</td></tr>
-  </span> 
-  <span tal:condition="python:path('info/review_state')=='clearance_requested'">
-  <tr><td class="active">Clearance requested</td></tr>
-  </span>
-  <span tal:condition="python:path('info/review_state')!='clearance_requested'">
-  <tr><td>Clearance requested</td></tr>
-  </span> 
-  <span tal:condition="python:path('info/review_state')=='cleared_and_validated'">
-  <tr><td class="active">Cleared</td></tr>
-  </span>
-  <span tal:condition="python:path('info/review_state')!='cleared_and_validated'">
-  <tr><td>Cleared</td></tr>
-  </span> 
-  <span tal:condition="python:path('info/review_state')=='deferred'">
-  <tr><td class="active">Admission deferred</td></tr>
-  </span>
-  <span tal:condition="python:path('info/review_state')!='deferred'">
-  <tr><td>Admission deferred</td></tr>
-  </span>   
-</table>
-
-<table class="registration" tal:condition="info/cr">
-  <span tal:condition="python:info['review_state']=='returning'">
-  <tr><td class="active">
-    <a href="" tal:attributes="href string:${info/url}/session_results_view">
-    Returning
-    </a>
-  </td></tr>
-  </span>
-  <span tal:condition="python:info['review_state']=='school_fee_paid'">
-  <tr><td class="active">
-    <a href="" tal:attributes="href string:${info/url}/student_view">
-    School fee paid
-    </a>
-  </td></tr>
-  </span>
-  <span tal:condition="python:info['review_state']!='school_fee_paid'">
-  <tr><td>
-    School fee paid
-  </td></tr>
-  </span>  
-  <span tal:condition="python:info['review_state']=='courses_registered'">
-  <tr><td class="active">
-    <a href="" tal:attributes="href string:${info/url}/student_view">
-    Courses registered
-    </a>
-  </td></tr>
-  </span>
-  <span tal:condition="python:info['review_state']!='courses_registered'">
-  <tr><td>
-    Courses registered
-  </td></tr>
-  </span>    
-  <span tal:condition="python:info['review_state']=='courses_validated'">
-  <tr><td class="active">
-    <a href="" tal:attributes="href string:${info/url}/student_view">
-    Courses vaildated
-    </a>
-  </td></tr>
-  </span>
-  <span tal:condition="python:info['review_state']!='courses_validated'">
-  <tr><td>
-    Courses vaildated
-  </td></tr>
-  </span>     
-</table>
-
-</tal:block>
-
Index: WAeUP_SRP/base/skins/waeup_student/statistics_new_view.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/statistics_new_view.pt	(revision 2242)
+++ 	(revision )
@@ -1,159 +1,0 @@
-<metal:body use-macro="here/main_template/macros/master">
-  <metal:main fill-slot="main">
-  <metal:block tal:define="faculties context/getNewStudentStatistics;
-                        mtool here/portal_membership;
-                        member mtool/getAuthenticatedMember;">       
-
-      <span tal:condition="not: faculties">
-        <span tal:content="here/illegal_view" />
-      </span>
-      <span tal:condition="faculties">
-  
-      <strong>
-      <nobr><a href="search_students">Search Students</a>
-      &nbsp;&nbsp;&nbsp;&nbsp;</nobr>      
-      <nobr><a href="statistics_ret_view">Returning Student Statistics</a>
-      &nbsp;&nbsp;&nbsp;&nbsp;</nobr>
-      </strong>     
-
-      <h3>New Student Statistics</h3>
-      <br />      
-      <span tal:condition="not:isAnon">
-
-      <h3>Full-Time Students (UME, DE, UG, PG)</h3>
-      <br />      
-      
-        <table>
-          <tr class="odd ajaxtd">
-            <th >Faculty</th>
-            <th align="right">Total New</th>
-            <th align="right">AD</th>
-            <th align="right">OR</th>
-            <th align="right">CPE</th>
-            <th align="right">CR</th>
-            <th align="right">VC</th>
-            <th align="right">SFP</th>
-            <th align="right">CLR</th>
-            <th align="right">CLV</th>
-
-          </tr>
-          <tr tal:repeat="d faculties"
-              tal:attributes="class python:test(repeat['d'].even(), 'even ajaxtd', 'odd ajaxtd')">
-              <td width="80px"> <span tal:content="d/id" /> </td>
-              <td width="80px" align="right">
-                <span tal:content="d/total_ft" />
-              </td>
-              <td width="80px" align="right"> 
-                <span tal:content="d/admitted_ft" />
-                (<span tal:content="d/admitted_ft_percent" />%)
-              </td>              
-              <td width="80px" align="right"> 
-                <span tal:content="d/objection_raised_ft" />
-                (<span tal:content="d/objection_raised_ft_percent" />%)
-              </td>
-              <td width="80px" align="right"> 
-                <span tal:content="d/clearance_pin_entered_ft" />
-                (<span tal:content="d/clearance_pin_entered_ft_percent" />%)
-              </td>
-              <td width="80px" align="right"> 
-                <span tal:content="d/clearance_requested_ft" />
-                (<span tal:content="d/clearance_requested_ft_percent" />%)
-              </td>
-              <td width="80px" align="right"> 
-                <span tal:content="d/cleared_and_validated_ft" />
-                (<span tal:content="d/cleared_and_validated_ft_percent" />%)
-              </td>
-              <td width="80px" align="right"> 
-                <span tal:content="d/school_fee_paid_ft" />
-                (<span tal:content="d/school_fee_paid_ft_percent" />%)
-              </td>
-              <td width="80px" align="right"> 
-                <span tal:content="d/courses_registered_ft" />
-                (<span tal:content="d/courses_registered_ft_percent" />%)
-              </td>
-              <td width="80px" align="right"> 
-                <span tal:content="d/courses_validated_ft" />
-                (<span tal:content="d/courses_validated_ft_percent" />%)
-              </td>                                          
-
-          </tr>
-        </table>
-
-      <h3>Part-Time Students (DE, UG, PG)</h3>
-      <br />      
-
-        <table>
-          <tr class="odd ajaxtd">
-            <th >Faculty</th>
-            <th align="right">Total New</th>
-            <th align="right">AD</th>
-            <th align="right">OR</th>
-            <th align="right">CPE</th>
-            <th align="right">CR</th>
-            <th align="right">VC</th>
-            <th align="right">SFP</th>
-            <th align="right">CLR</th>
-            <th align="right">CLV</th>
-
-          </tr>
-          <tr tal:repeat="d faculties"
-              tal:attributes="class python:test(repeat['d'].even(), 'even ajaxtd', 'odd ajaxtd')">
-              <td width="80px"> <span tal:content="d/id" /> </td>
-              <td width="80px" align="right">
-                <span tal:content="d/total_pt" />
-              </td>
-              <td width="80px" align="right"> 
-                <span tal:content="d/admitted_pt" />
-                (<span tal:content="d/admitted_pt_percent" />%)
-              </td>              
-              <td width="80px" align="right"> 
-                <span tal:content="d/objection_raised_pt" />
-                (<span tal:content="d/objection_raised_pt_percent" />%)
-              </td>
-              <td width="80px" align="right"> 
-                <span tal:content="d/clearance_pin_entered_pt" />
-                (<span tal:content="d/clearance_pin_entered_pt_percent" />%)
-              </td>
-              <td width="80px" align="right"> 
-                <span tal:content="d/clearance_requested_pt" />
-                (<span tal:content="d/clearance_requested_pt_percent" />%)
-              </td>
-              <td width="80px" align="right"> 
-                <span tal:content="d/cleared_and_validated_pt" />
-                (<span tal:content="d/cleared_and_validated_pt_percent" />%)
-              </td>
-              <td width="80px" align="right"> 
-                <span tal:content="d/school_fee_paid_pt" />
-                (<span tal:content="d/school_fee_paid_pt_percent" />%)
-              </td>
-              <td width="80px" align="right"> 
-                <span tal:content="d/courses_registered_pt" />
-                (<span tal:content="d/courses_registered_pt_percent" />%)
-              </td>
-              <td width="80px" align="right"> 
-                <span tal:content="d/courses_validated_pt" />
-                (<span tal:content="d/courses_validated_pt_percent" />%)
-              </td>                                          
-
-          </tr>
-        </table>
-
-
-
-        <br />
-        <table>
-        <tr><td>AD:</td> <td>Admitted</td></tr>
-        <tr><td>OR:</td> <td>Objection raised</td></tr>
-        <tr><td>CPE:</td> <td>Clearance PIN entered</td></tr>
-        <tr><td>CR: </td> <td>Clearance requested</td></tr>
-        <tr><td>VC: </td> <td>Validated and cleared</td></tr>
-        <tr><td>SFP: </td> <td>School fee paid</td></tr>
-        <tr><td>CLR: </td> <td>Course list registered</td></tr>
-        <tr><td>CLV: </td> <td>Course list validated</td></tr>                
-        </table>
-      </span>
-      </span>
-  </metal:block>      
-  </metal:main>
-</metal:body>
-      
Index: WAeUP_SRP/base/skins/waeup_student/statistics_ret_view.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/statistics_ret_view.pt	(revision 2242)
+++ 	(revision )
@@ -1,115 +1,0 @@
-<metal:body use-macro="here/main_template/macros/master">
-  <metal:main fill-slot="main">
-  <metal:block tal:define="faculties context/getRetStudentStatistics;
-                        mtool here/portal_membership;
-                        member mtool/getAuthenticatedMember;">       
-
-      <span tal:condition="not: faculties">
-        <span tal:content="here/illegal_view" />
-      </span>
-      <span tal:condition="faculties">
-  
-      <strong>
-      <nobr><a href="search_students">Search Students</a>
-      &nbsp;&nbsp;&nbsp;&nbsp;</nobr>        
-      <nobr><a href="statistics_new_view">New Student Statistics</a>
-      &nbsp;&nbsp;&nbsp;&nbsp;</nobr>
-      </strong>     
-
-      <h3>Returning Student Statistics</h3>
-      <br />      
-      <span tal:condition="not:isAnon">
-
-      <h3>Full-Time Students (UME, DE, UG, PG)</h3>
-      <br />            
-      
-        <table>
-          <tr class="odd ajaxtd">
-            <th >Faculty</th>
-            <th align="right">Total</th>
-            <th align="right">RET</th>
-            <th align="right">SFP</th>
-            <th align="right">CLR</th>
-            <th align="right">CLV</th>
-
-          </tr>
-          <tr tal:repeat="d faculties"
-              tal:attributes="class python:test(repeat['d'].even(), 'even ajaxtd', 'odd ajaxtd')">
-              <td width="80px"> <span tal:content="d/id" /> </td>
-              <td width="80px" align="right">
-                <span tal:content="d/total_ft" />
-              </td>
-              <td width="80px" align="right"> 
-                <span tal:content="d/returning_ft" />
-                (<span tal:content="d/returning_ft_percent" />%)
-              </td>              
-              <td width="80px" align="right"> 
-                <span tal:content="d/school_fee_paid_ft" />
-                (<span tal:content="d/school_fee_paid_ft_percent" />%)
-              </td>
-              <td width="80px" align="right"> 
-                <span tal:content="d/courses_registered_ft" />
-                (<span tal:content="d/courses_registered_ft_percent" />%)
-              </td>
-              <td width="80px" align="right"> 
-                <span tal:content="d/courses_validated_ft" />
-                (<span tal:content="d/courses_validated_ft_percent" />%)
-              </td>                                          
-
-          </tr>
-        </table>
-
-      <h3>Part-Time Students (DE, UG, PG)</h3>
-      <br />           
-
-        <table>
-          <tr class="odd ajaxtd">
-            <th >Faculty</th>
-            <th align="right">Total</th>
-            <th align="right">RET</th>
-            <th align="right">SFP</th>
-            <th align="right">CLR</th>
-            <th align="right">CLV</th>
-
-          </tr>
-          <tr tal:repeat="d faculties"
-              tal:attributes="class python:test(repeat['d'].even(), 'even ajaxtd', 'odd ajaxtd')">
-              <td width="80px"> <span tal:content="d/id" /> </td>
-              <td width="80px" align="right">
-                <span tal:content="d/total_pt" />
-              </td>
-              <td width="80px" align="right"> 
-                <span tal:content="d/returning_pt" />
-                (<span tal:content="d/returning_pt_percent" />%)
-              </td>              
-              <td width="80px" align="right"> 
-                <span tal:content="d/school_fee_paid_pt" />
-                (<span tal:content="d/school_fee_paid_pt_percent" />%)
-              </td>
-              <td width="80px" align="right"> 
-                <span tal:content="d/courses_registered_pt" />
-                (<span tal:content="d/courses_registered_pt_percent" />%)
-              </td>
-              <td width="80px" align="right"> 
-                <span tal:content="d/courses_validated_pt" />
-                (<span tal:content="d/courses_validated_pt_percent" />%)
-              </td>                                          
-
-          </tr>
-        </table>
-
-        
-        <br />
-        <table>
-        <tr><td>Total: </td> <td>Those who have logged in</td></tr>
-        <tr><td>RET: </td> <td>Returning</td></tr>
-        <tr><td>SFP: </td> <td>School fee paid</td></tr>
-        <tr><td>CLR: </td> <td>Course list registered</td></tr>
-        <tr><td>CLV: </td> <td>Course list validated</td></tr>                
-        </table>
-      </span>
-      </span>
-  </metal:block>      
-  </metal:main>
-</metal:body>
-      
Index: WAeUP_SRP/base/skins/waeup_student/statistics_simple_view.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/statistics_simple_view.pt	(revision 2242)
+++ 	(revision )
@@ -1,136 +1,0 @@
-<metal:body use-macro="here/main_template/macros/master">
-  <metal:main fill-slot="main">
-  <metal:block tal:define="faculties context/getSimpleStudentStatistics;
-                        mtool here/portal_membership;
-                        member mtool/getAuthenticatedMember;">       
-
-      <span tal:condition="not: faculties">
-        <span tal:content="here/illegal_view" />
-      </span>
-      <span tal:condition="faculties">
-  
-      <strong>
-      <nobr><a href="search_students">Search Students</a>
-      &nbsp;&nbsp;&nbsp;&nbsp;</nobr>        
-      <nobr><a href="statistics_new_view">New Student Statistics</a>
-      &nbsp;&nbsp;&nbsp;&nbsp;</nobr>
-      <nobr><a href="statistics_ret_view">Returning Student Statistics</a>
-      &nbsp;&nbsp;&nbsp;&nbsp;</nobr>      
-      </strong>     
-
-      <h3>Basic Student Statistics</h3>
-      <br />      
-      <span tal:condition="not:isAnon">
-      Student records imported: <span tal:content="python: faculties[0]['total_in_catalog']" />
-      <br />  <br />  
-        <table >  
-
-          <tr>
-            <th>&nbsp;</th>
-            
-            <th style="border-style:solid; border-width:1px; border-color:black" align="center" colspan="3">Total</th>
-            
-            <th style="border-style:solid; border-width:1px; border-color:black" align="center" colspan="3">Category A</th>
-
-            <th style="border-style:solid; border-width:1px; border-color:black" align="center" colspan="3">Category B</th>
-
-            <th style="border-style:solid; border-width:1px; border-color:black" align="center" colspan="3">Category C</th>
-
-
-          </tr>
-
-          <tr class="odd ajaxtd">
-            <th >Faculty</th>
-            <th align="right">FT</th>
-            <th align="right">PT</th>
-            <th align="right">DP</th>
-            <th align="right">FT</th>
-            <th align="right">PT</th>
-            <th align="right">DP</th>
-            <th align="right">FT</th>
-            <th align="right">PT</th>
-            <th align="right">DP</th>
-            <th align="right">FT</th>
-            <th align="right">PT</th>
-            <th align="right">DP</th>
-
-          </tr>
-          <tr tal:repeat="d faculties"
-              tal:attributes="class python:test(repeat['d'].even(), 'even ajaxtd', 'odd ajaxtd')">
-              <td width="80px"> <span tal:content="d/id" /> </td>
-
-              <td width="60px" align="right"> 
-                <span tal:content="d/total_ft" />
-              </td>              
-
-              <td width="60px" align="right"> 
-                <span tal:content="d/total_pt" />
-              </td>              
-
-              <td width="60px" align="right"> 
-                <span tal:content="d/total_dp" />
-              </td>                 
-              
-              <td width="60px" align="right"> 
-                <span tal:content="d/total_Aft" />
-              </td>              
-
-              <td width="60px" align="right"> 
-                <span tal:content="d/total_Apt" />
-              </td>              
-
-              <td width="60px" align="right"> 
-                <span tal:content="d/total_Adp" />
-              </td>              
-
-              <td width="60px" align="right"> 
-                <span tal:content="d/total_Bft" />
-              </td>              
-
-              <td width="60px" align="right"> 
-                <span tal:content="d/total_Bpt" />
-              </td>              
-              
-              <td width="60px" align="right"> 
-                <span tal:content="d/total_Bdp" />
-              </td>      
-              
-              <td width="60px" align="right"> 
-                <span tal:content="d/total_Cft" />
-              </td>      
-              
-              <td width="60px" align="right"> 
-                <span tal:content="d/total_Cpt" />
-              </td>      
-              
-              <td width="60px" align="right"> 
-                <span tal:content="d/total_Cdp" />
-              </td>                                                
-
-                                       
-
-          </tr>
-        </table>
-
-        <br />
-        <table   border=0>
-
-        <tr><td>Category A: </td> <td>students who paid their school fee</td></tr>
-        <tr><td>Category B: </td> <td>students who registered their courses online (A contains B)</td></tr>
-        <tr><td>Category C: </td> <td>students who have not yet paid their school fee</td></tr>
-        <tr><td>&nbsp;</td><td>&nbsp;</td></tr>
-        <tr><td colspan="2"><strong>Notice:</strong> Category C is not complete. 
-                <span tal:content="python: faculties[0]['not_categorized']" /> returning full-time students have not yet logged in and are thus not categorized. 
-             </td>
-        </tr>
-          
-        </table>
-        
-        
-        
-      </span>
-      </span>
-  </metal:block>      
-  </metal:main>
-</metal:body>
-      
Index: WAeUP_SRP/base/skins/waeup_student/view_logs.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/view_logs.pt	(revision 2242)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<metal:body use-macro="here/main_template/macros/master">
-  <metal:main fill-slot="main">
-  <metal:block tal:define="data context/getLogData;
-			mtool here/portal_membership;
-                        member mtool/getAuthenticatedMember;">       
-
-      <h3>Current Log Entries (<span tal:replace="data/filename"/>)</h3>
-      <br />      
-
-      <span tal:condition="not:isAnon">
-
-        <form method="post" action="view_logs">
-          Show last <input type="text" name="numlines" value="20"
-		           tal:attributes="value data/numlines" />
-	  lines of
-	  <select name="filename">
-	    <option 
-	       tal:attributes="selected python: data['filename']=='event.log'"
-	       value="event.log">Event Log</option>
-            <option 
-	       tal:attributes="selected python: data['filename']=='Z2.log'"
-               value="Z2.log">Access Log</option>
-          </select>
-          <input type="submit" value="Refresh" />
-        </form>
-
-	<hr />
-
-        <table>
-          <tr class="even ajaxtd" tal:repeat="line data/lines">
-	    <td><span tal:replace="line" /></td>
-          </tr>
-        </table>
-
-	<hr />
-
-        <form method="post" action="view_logs">
-          Show last <input type="text" name="numlines" value="20"
-		           tal:attributes="value data/numlines" />
-	  lines of
-	  <select name="filename">
-	    <option 
-	       tal:attributes="selected python: data['filename']=='event.log'"
-	       value="event.log">Event Log</option>
-            <option 
-	       tal:attributes="selected python: data['filename']=='Z2.log'"
-               value="Z2.log">Access Log</option>
-          </select>
-          <input type="submit" value="Refresh" />
-        </form>
-
-      </span> <!-- condition: not:isAnon -->
-  </metal:block>      
-  </metal:main>
-</metal:body>
-      
Index: WAeUP_SRP/base/skins/waeup_student/widget_scratch_card_pin_render.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/widget_scratch_card_pin_render.pt	(revision 2242)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<tal:block define="mode options/mode;
-                   id here/getWidgetId;
-                   id_p string:${id}_p;
-                   id_b string:${id}_b;
-                   id_n string:${id}_n;
-                   prefix options/datastructure/?id_p;
-                   batch options/datastructure/?id_b;
-                   nr options/datastructure/?id_n;
-">
-<tal:block condition="python: mode == 'view'">
-<span tal:replace="prefix" />-<span tal:replace="batch" />-<span tal:replace="nr" />
-</tal:block>
-<tal:block define="name here/getHtmlWidgetId;"
-           condition="python: mode == 'edit'">
-  <span tal:replace="prefix" />-
-  <input type="text" size="2" maxlength="2"
-    tal:attributes="name string:${name}_b;
-                    id string:${name}_b;
-                    value batch" />-
-  <input type="text" size="10" maxlength="10"
-    tal:attributes="name string:${name}_n;
-                    id string:${name}_n;
-                    value nr" />
-</tal:block>
-</tal:block>
Index: WAeUP_SRP/base/skins/waeup_student/widget_waeup_multiline_result_render.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/widget_waeup_multiline_result_render.pt	(revision 2242)
+++ 	(revision )
@@ -1,80 +1,0 @@
-<tal:block define="mode options/mode;
-                   id here/getWidgetId;
-                   id_s string:${id}_s;
-                   id_g string:${id}_g;
-                   results options/datastructure/?id;
-                   subject options/datastructure/?id_s;
-                   grade options/datastructure/?id_g;
-                   grade_voc context/portal_vocabularies/exam_grades;   
-                   subjects_voc context/portal_vocabularies/exam_subjects;   
-">
-<tal:block condition="python: mode == 'view'">
-    <div tal:repeat="res results">
-      <span tal:content="python:subjects_voc.get(res[0])" />: <span tal:content="python:grade_voc.get(res[1])" />
-    </div>
-</tal:block>
-<tal:block define="name here/getHtmlWidgetId;"
-           condition="python: mode == 'edit'">
-  <table border=0 cellpadding=0 cellspacing=0>
-    <tr><th>Subject</th><th>Grade</th>
-      <tr tal:repeat="res results">
-        <span tal:define="wnr python:'%02d' % (repeat['res'].number())">
-          <td><select size="1"
-                      tal:attributes="name string:${name}${wnr}_s;
-                      id string:${name}_s;"
-                      >
-              <option tal:repeat="sub subjects_voc/items"
-                      tal:attributes="value python:sub[0];
-                      selected python: res[0] == sub[0];"
-                      tal:content="python: sub[1]">
-              </option>
-            </select>
-          </td>
-          <td> 
-            <select size="1"
-                    tal:attributes="name string:${name}${wnr}_g;
-                    id string:${name}_g;"
-                    >
-              <option tal:repeat="sub grade_voc/items"
-                      tal:attributes="value python:sub[0];
-                      selected python: res[1] == sub[0]"
-                      tal:content="python: sub[1]">
-              </option>
-            </select>
-          </td>
-        </span>
-      </tr>
-      <tr>
-        <td colspan="2">
-          <hr />
-        </td>
-      </tr>
-    <tr>
-      <td><select size="1"
-                  tal:attributes="name string:${name}_s;
-                  id string:${name}_s;">
-              <option tal:repeat="sub subjects_voc/items"
-                      tal:attributes="value python:sub[0]"
-                      tal:content="python: sub[1]">
-              </option>
-            </select>
-      </td>
-      <td> 
-          <select size="1"
-                  tal:attributes="name string:${name}_g;
-                  id string:${name}_g;">
-                  <option tal:repeat="sub grade_voc/items"
-                          tal:attributes="value python:sub[0]"
-                          tal:content="python: sub[1]">
-          </option>
-        </select>
-      </td>
-      <td> 
-        <input type="submit" class="standalone" name="cpsdocument_edit_button"
-         value="Add/Modify" 
-         id="cpsdocument_edit_button" />
-      </td>
-    </tr>
-  </table>
-</tal:block>
-</tal:block>
Index: WAeUP_SRP/base/skins/waeup_student/widget_waeup_result_render.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_student/widget_waeup_result_render.pt	(revision 2242)
+++ 	(revision )
@@ -1,51 +1,0 @@
-<tal:block define="mode options/mode;
-                   id here/getWidgetId;
-                   id_s string:${id}_s;
-                   id_g string:${id}_g;
-                   results options/datastructure/?id;
-                   subject options/datastructure/?id_s;
-                   grade options/datastructure/?id_g;
-                   grade_voc context/portal_vocabularies/exam_grades;   
-                   subjects_voc context/portal_vocabularies/exam_subjects;   
-">
-<tal:block condition="python: mode == 'view'">
-    <div tal:repeat="res results">
-      <span tal:content="python:subjects_voc.get(res[0])" />: <span tal:content="python:grade_voc.get(res[1])" />
-    </div>
-</tal:block>
-<tal:block define="name here/getHtmlWidgetId;"
-           condition="python: mode == 'edit'">
-  <table border=0 cellpadding=0 cellspacing=0>
-    <tr><th>Subject</th><th>Grade</th>
-    <tr tal:repeat="res results">
-      <td tal:content="python:subjects_voc.get(res[0])" /><td tal:content="python:grade_voc.get(res[1])" />
-    </tr>
-    <tr>
-      <td><select size="1"
-                  tal:attributes="name string:${name}_s;
-                  id string:${name}_s;">
-              <option tal:repeat="sub subjects_voc/items"
-                      tal:attributes="value python:sub[0]"
-                      tal:content="python: sub[1]">
-              </option>
-            </select>
-      </td>
-      <td> 
-          <select size="1"
-                  tal:attributes="name string:${name}_g;
-                  id string:${name}_g;">
-                  <option tal:repeat="sub grade_voc/items"
-                          tal:attributes="value python:sub[0]"
-                          tal:content="python: sub[1]">
-          </option>
-        </select>
-      </td>
-      <td> 
-        <input type="submit" class="standalone" name="cpsdocument_edit_button"
-         value="Add/Modify" 
-         id="cpsdocument_edit_button" />
-      </td>
-    </tr>
-  </table>
-</tal:block>
-</tal:block>
