Changeset 1988

Timestamp:

5 Jul 2007, 11:14:12 (17 years ago)

Author:

joachim

Message:

merged r1979:r1987 from trunk

Location:

WAeUP_SRP/branches/joachim-azax-branch

Files:

• WAeUPTables.py (modified) (2 diffs)
• WAeUPTool.py (modified) (1 diff)
• Widgets.py (modified) (6 diffs)
• __init__.py (modified) (2 diffs)
• profiles/default/layouts/import_student.xml (modified) (5 diffs)
• profiles/default/schemas/import_student.xml (modified) (1 diff)
• profiles/default/skins.xml (modified) (1 diff)
• profiles/default/toolset.xml (modified) (1 diff)
• profiles/default/vocabularies/courselevel.xml (modified) (1 diff)
• profiles/default/vocabularies/entry_modes.xml (modified) (1 diff)
• profiles/default/vocabularies/verdicts.xml (modified) (2 diffs)
• skins/waeup_academics/academicsParent.py (modified) (1 diff)
• skins/waeup_academics/academics_index.py (modified) (1 diff)
• skins/waeup_academics/getCertificatesInfo.py (modified) (2 diffs)
• skins/waeup_academics/getCoursesCertificatesInfo.py (modified) (2 diffs)
• skins/waeup_academics/getCoursesInfo.py (modified) (1 diff)
• skins/waeup_academics/getDepartmentsInfo.py (modified) (3 diffs)
• skins/waeup_academics/getDocumentInfo.py (modified) (1 diff)
• skins/waeup_default/sessions_voc.py (modified) (2 diffs)
• skins/waeup_default/waeup_edit.py (modified) (1 diff)
• skins/waeup_design/main_template.pt (modified) (2 diffs)
• skins/waeup_student/create_level.py (modified) (2 diffs)
• skins/waeup_student/external_study_level_view.pt (modified) (5 diffs)
• skins/waeup_student/layout_clearance_view.pt (modified) (1 diff)
• skins/waeup_student/student_view.pt (modified) (2 diffs)
• skins/waeup_utilities/ti_294_resolve.py (copied) (copied from WAeUP_SRP/trunk/skins/waeup_utilities/ti_294_resolve.py)

WAeUP_SRP/branches/joachim-azax-branch/WAeUPTables.py

@@ -61 +61 @@
     def manage_catalogClear(self, REQUEST=None, RESPONSE=None, URL1=None):
         """ clears the whole enchilada """
-        
+
         #if REQUEST and RESPONSE:
         #    RESPONSE.redirect(
@@ -357 +357 @@
             digit = int(doc.jamb_reg_no[0])
         except:
-            return "xx"
+            return "-1"
         if digit < 8:
             return "0%c" % doc.jamb_reg_no[0]
         return "9%c" % doc.jamb_reg_no[0]
-
-    def get_from_doc_session(self,doc):
-        "return the students session"
-        if doc is None:
-            return None
-        return getattr(doc,'current_session',None)
 
     def get_from_doc_course(self,doc):

WAeUP_SRP/branches/joachim-azax-branch/WAeUPTool.py

@@ -855 +855 @@
                         d[zu] = mapping[von]
             sub_doc.edit(mapping = d)
-
-            new_state = f2t[pt]['wf_transition_admitted']
+            transition = mapping.get('reg_transition','admitted')
+            if transition not in ('admitted','returning'):
+                transition = 'admitted'
+            #import pdb;pdb.set_trace()
+            new_state = f2t[pt]['wf_transition_%(transition)s' % vars()]
             if new_state != "remain":
                 self.portal_workflow.doActionFor(sub_obj,new_state,dest_container=sub_obj)

WAeUP_SRP/branches/joachim-azax-branch/Widgets.py

@@ -177 +177 @@
 
 class WAeUPStudyModeWidget(CPSSelectWidget): ###(
-    """WAeUP StudyMode widget."""
+    """WAeUP StudyMode Widget."""
     meta_type = 'WAeUP StudyMode Widget'
     vocabulary = 'entry_modes'
@@ -246 +246 @@
 
 class WAeUPSessionWidget(CPSSelectWidget): ###(
-    """WAeUP Session widget."""
+    """WAeUP Session Widget."""
     meta_type = 'WAeUP Session Widget'
 
     def _getSessions(self):
         current_year = DateTime().year()
-        d = {'xx': 'unknown'}
+        d = {'-1': 'N/A'}
         for y in range(current_year - 9,current_year + 1):
             d['%s' % str(y)[-2:]] = '%4d/%4d' % (y,y+1)
@@ -295 +295 @@
             vocabulary_items = sessions.items()
             if self.sorted:
-                vocabulary_items.sort(key=operator.itemgetter(1))
+                vocabulary_items.sort(key=operator.itemgetter(0))
             for k, v in vocabulary_items:
                 kw = {'value': k, 'contents': v}
@@ -321 +321 @@
 
     def _getLevels(self):
-        d = {'999':'unknown'}
+        d = {'000':'N/A'}
         for y in range(100,800,100):
             d['%s' % str(y)] = 'Year %1d (%3d Level)' % (y/100,y)
@@ -363 +363 @@
             vocabulary_items = levels.items()
             if self.sorted:
-                vocabulary_items.sort(key=operator.itemgetter(1))
+                vocabulary_items.sort(key=operator.itemgetter(0))
             for k, v in vocabulary_items:
                 kw = {'value': k, 'contents': v}
@@ -385 +385 @@
 
 class WAeUPVerdictWidget(CPSSelectWidget): ###(
-    """WAeUP Verdict widget."""
+    """WAeUP Verdict Widget."""
     meta_type = 'WAeUP Verdict Widget'
 

WAeUP_SRP/branches/joachim-azax-branch/__init__.py

@@ -30 +30 @@
 import Products.WAeUP_SRP.WAeUPPermissions
 import WAeUPTool
+import Azax
 
 import Widgets
-tools = (WAeUPTool.WAeUPTool,)
+tools = (WAeUPTool.WAeUPTool,
+         Azax.KSSTool)
 
 waeup_types = (
@@ -100 +102 @@
 
 def initialize(registrar):
-    ToolInit('WAeUP Tool',
+    ToolInit('WAeUP Tools',
               tools=tools,
               icon='tool.gif',

WAeUP_SRP/branches/joachim-azax-branch/profiles/default/layouts/import_student.xml

@@ -8 +8 @@
  <property name="flexible_widgets"/>
  <property name="validate_values_expr"></property>
+ <widget name="reg_transition" meta_type="String Widget">
+  <property name="title">Transition after import</property>
+  <property name="fields">
+   <element value="reg_transition"/>
+  </property>
+  <property name="label">Transition</property>
+  <property name="label_edit">Transition</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
  <widget name="email" meta_type="Email Widget">
   <property name="title">Email</property>
@@ -164 +175 @@
   <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
-  <property name="vocabulary">sessions</property>
+  <property name="vocabulary">unset</property>
   <property name="sorted">True</property>
  </widget>
@@ -179 +190 @@
   <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
-  <property name="vocabulary">courselevel</property>
+  <property name="vocabulary">unset</property>
   <property name="sorted">True</property>
  </widget>
@@ -195 +206 @@
   <property name="hidden_readonly_layout_modes"/>
   <property name="vocabulary">verdicts</property>
+  <property name="sorted">True</property>
  </widget>
  <widget name="entry_session" meta_type="WAeUP Session Widget">
@@ -206 +218 @@
   <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
-  <property name="vocabulary">sessions</property>
+  <property name="vocabulary">unset</property>
   <property name="sorted">True</property>
  </widget>

WAeUP_SRP/branches/joachim-azax-branch/profiles/default/schemas/import_student.xml

@@ -2 +2 @@
 <?xml-stylesheet type="text/xsl" href="schema.xsl"?>
 <object name="import_student" meta_type="CPS Schema">
+ <field name="reg_transition" meta_type="CPS String Field"/>
  <field name="firstname" meta_type="CPS String Field"/>
  <field name="middlename" meta_type="CPS String Field"/>

WAeUP_SRP/branches/joachim-azax-branch/profiles/default/skins.xml

@@ -3 +3 @@
    cookie_persistence="False" default_skin="CPSSkins"
    request_varname="portal_skin">
+ <object name="waeup_azax" meta_type="Filesystem Directory View"
+    directory="WAeUP_SRP/skins/waeup_azax"/>
  <object name="waeup_custom" meta_type="Filesystem Directory View"
     directory="WAeUP_SRP/skins/waeup_custom"/>

WAeUP_SRP/branches/joachim-azax-branch/profiles/default/toolset.xml

@@ -23 +23 @@
  <required tool_id="waeup_tool"
            class="Products.WAeUP_SRP.WAeUPTool.WAeUPTool"/>
+ <required tool_id="kss_tool"
+           class="Products.WAeUP_SRP.Azax.KSSTool"/>
 </tool-setup>

WAeUP_SRP/branches/joachim-azax-branch/profiles/default/vocabularies/courselevel.xml

@@ -6 +6 @@
  <property name="description"></property>
  <property name="acl_write_roles">Manager</property>
- <item key="unknown" msgid="">unknown</item>
+ <item key="000" msgid="">N/A</item>
  <item key="100" msgid="">Year 1 (100 Level)</item>
  <item key="200" msgid="">Year 2 (200 Level)</item>

WAeUP_SRP/branches/joachim-azax-branch/profiles/default/vocabularies/entry_modes.xml

@@ -6 +6 @@
  <property name="description"></property>
  <property name="acl_write_roles">Manager</property>
- <item key="unknown" msgid="">unknown</item>
+ <item key="unknown" msgid="">N/A</item>
  <item key="ume_ft" msgid="">UME Full Time</item>
  <item key="de_ft" msgid="">Direct Entry Full Time</item>

WAeUP_SRP/branches/joachim-azax-branch/profiles/default/vocabularies/verdicts.xml

@@ -6 +6 @@
  <property name="description"></property>
  <property name="acl_write_roles">Manager</property>
+ <item key="N/A" msgid="">N/A</item>
  <item key="A" msgid="">successful student</item>
  <item key="B" msgid="">student with carryover courses</item>
@@ -18 +19 @@
  <item key="K" msgid="">unregistered student</item>
  <item key="L" msgid="">referred student</item>
- <item key="N/A" msgid="">N/A</item>
 </object>

WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_academics/academicsParent.py

@@ -12 +12 @@
     obj=context
 
+
 parent=obj.aq_parent
 

WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_academics/academics_index.py

@@ -12 +12 @@
 return the appropriate page in the academics section
 """
+try:
+    from Products.zdb import set_trace
+except:
+    def set_trace():
+        pass
 
 request = context.REQUEST

WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_academics/getCertificatesInfo.py

@@ -12 +12 @@
 return Info about the Faculties
 """
+try:
+    from Products.zdb import set_trace
+except:
+    def set_trace():
+        pass
 request = context.REQUEST
 
@@ -19 +24 @@
 
 info = {}
-#dep_id = request.get('PATH_TRANSLATED').split('/')[-2]
-dep_id = context.aq_parent.getId()
+dep_id = path_info[-2]
+#set_trace()
 info['action'] = "%s" % context.absolute_url()
 info['choosen_ids'] = request.get('ids',[])
 info['doc'] = context.getContent()
-res = context.portal_catalog(meta_type="Department",id = dep_id)
+#res = context.portal_catalog(meta_type="Department",id = dep_id)
 info['courses'] = []
-if not res:
-    return info
-brain = res[-1]
-cp = brain.getPath()
+# if not res:
+#     return info
+# brain = res[-1]
+# cp = brain.getPath()
+cp = '/'.join(path_info[:-2])
 info['container_path'] = cp
 info['dep_id'] = dep_id

WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_academics/getCoursesCertificatesInfo.py

@@ -15 +15 @@
 
 wf = context.portal_workflow
-path_info = request.get('PATH_INFO').split('/')
 
 info = {}
@@ -21 +20 @@
 info['choosen_ids'] = request.get('ids',[])
 info['doc'] = context.getContent()
-brain = context.portal_catalog(meta_type="Department", id = context.getId())[-1]
-cp = brain.getPath()
+# brain = context.portal_catalog(meta_type="Department", id = context.getId())[-1]
+# cp = brain.getPath()
+cp = request.get('PATH_INFO')
 info['container_path'] = cp
-#res = context.portal_catalog(container_path="%s/courses" % cp)
-#items = []
-#for r in res:
-#    row = {}
-#    ro = r.getObject()
-#    rd = ro.getContent()
-#    row['id'] = r.getId
-#    row['title'] = rd.Title()
-#    row['url'] = ro.absolute_url()
-#    items.append(row)
-#info['courses'] = items
 res = context.portal_catalog(container_path="%s/certificates" % cp)
 items = []

WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_academics/getCoursesInfo.py

@@ -28 +28 @@
 
 info = {}
-#dep_id = request.get('PATH_TRANSLATED').split('/')[-2]
-dep_id = context.aq_parent.getId()
+dep_id = path_info[-2]
+#dep_id = context.aq_parent.getId()
 info['action'] = "%s" % context.absolute_url()
 info['choosen_ids'] = request.get('ids',[])
 info['doc'] = context.getContent()
-res = context.portal_catalog(meta_type="Department",id = dep_id)
-info['courses'] = []
-if not res:
-    return info
-brain = res[-1]
-cp = brain.getPath()
+# res = context.portal_catalog(meta_type="Department",id = dep_id)
+# info['courses'] = []
+# if not res:
+#     return info
+# brain = res[-1]
+# cp = brain.getPath()
+cp = '/'.join(path_info[:-2])
 info['container_path'] = cp
 info['dep_id'] = dep_id

WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_academics/getDepartmentsInfo.py

@@ -12 +12 @@
 return Info about the Faculties
 """
+try:
+    from Products.zdb import set_trace
+except:
+    def set_trace():
+        pass
 request = context.REQUEST
 
@@ -17 +22 @@
 mtool = context.portal_membership
 member = mtool.getAuthenticatedMember()
-path_info = request.get('PATH_INFO').split('/')
+#path_info = request.get('PATH_INFO').split('/')
 
 info = {}
@@ -26 +31 @@
 items = []
 info['doc'] = context.getContent()
-brain = context.portal_catalog(meta_type="Faculty", id = context.getId())[-1]
-cp = brain.getPath()
+# set_trace()
+# brain = context.portal_catalog(portal_type="Faculty", id = context.getId())[-1]
+# cp = brain.getPath()
+cp = request.get('PATH_INFO')
 info['container_path'] = cp
 res = context.portal_catalog(container_path=cp)

WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_academics/getDocumentInfo.py

@@ -10 +10 @@
 # $Id:getDocumentInfo.py 486 2006-09-06 10:09:39Z joachim $
 """
-return Info about the Faculties
+return Info about the Documents
 """
-request = context.REQUEST
-
-wf = context.portal_workflow
-path_info = request.get('PATH_INFO').split('/')
 
 info = {}

WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_default/sessions_voc.py

@@ -6 +6 @@
 """
 if key is None:
-    l = [('xx','unknown')]
+    # not used for WAeUPSessionWidget, only for SelectWidget
+    l = [('-1','N/A')]
     for y in range(1998,2008):
         l.append( ('%s' % str(y)[-2:],'%4d/%4d' % (y,y+1)))
@@ -14 +15 @@
     y = int(key)
 except:
-    return 'unknown'
+    return 'N/A'
+if y == -1:
+    return 'N/A' 
 if y < 90:
     cent = 2000

WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_default/waeup_edit.py

@@ -19 +19 @@
 import logging
 logger = logging.getLogger('Skins.waeup_edit')
+try:
+    from Products.zdb import set_trace
+except:
+    def set_trace():
+        pass
 
 mtool = context.portal_membership

WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_design/main_template.pt

@@ -3 +3 @@
   emptybody emptybody|request/emptybody|nothing;
   mtool here/portal_membership;
-  
   utool nocall:here/portal_url;
   atool here/portal_actions;
@@ -39 +38 @@
           <metal:block define-slot="base">
             <base href=""
-                  tal:attributes="href string:${here_url}/" />
+                  tal:attributes="href string:${context/get_proxy_url}" />
           </metal:block>
         </metal:block>

WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_student/create_level.py

@@ -34 +34 @@
 current_level = student.level
 in_progress =  request.get('in_progress','not started')
-level_created =  request.get('level_created','xxx')
+#level_created =  request.get('level_created','xxx')
 create_level =  request.get('create_level',None)
 
@@ -71 +71 @@
     l = []
     carry_overs = results
-    
+
     # carry_overs for probation students: yes or not, that is the question
     #if student.verdict == "C": # on probation

WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_student/external_study_level_view.pt

@@ -1 @@
-<metal:html>
-  <metal:body use-macro="here/slip_template/macros/master">
-    <metal:block fill-slot="header" 
-                 tal:define="global info context/getStudyLevelInfo;
-                 global is_so context/isSectionOfficer;
-                 global is_ca info/is_ca;
-                 global show_check_boxes info/show_check_boxes;
-                             global is_student info/is_student;
-                             global status_info info/status_info;
-                             global review_state info/review_state;
-                             global view_only info/view_only">
-              <div style="text-align: right"
-             tal:condition="python:review_state == 'courses_validated'">
-        <a href="" target="slip" tal:attributes="href string:course_registration_slip"
-            onclick="javascript:window.open('','slip','width=600, height=700, directories=no, toolbar=no, location=no, menubar=yes, scrollbars=yes, status=no, resizable=no, dependent=no')">
-            <img tal:attributes="src string:${here/portal_url}/actionicon_print.png" />
-            Course Registration Slip
-        </a>
-        
-        </div>
+<metal:body use-macro="here/slip_template/macros/master">
+  <metal:main fill-slot="main"
+          tal:define="info context/getStudyLevelInfo;">
+             
+    <span tal:condition="not: info">
+      <span tal:content="here/illegal_view" />
+    </span>
+    <span tal:condition="info">
+    <span tal:define= "is_so context/isSectionOfficer;
+                       is_ca info/is_ca;
+                       show_check_boxes info/show_check_boxes;
+                       is_student info/is_student;
+                       status_info info/status_info;
+                       review_state info/review_state;
+                       view_only info/view_only">       
+
+    <div style="text-align: right" 
+         tal:condition="python:review_state in ('courses_registered','courses_validated',)">
+    <a href="" target="slip" tal:attributes="href string:course_registration_slip"
+        onclick="javascript:window.open('','slip','width=600, height=700, directories=no, toolbar=no, location=no, menubar=yes, scrollbars=yes, status=no, resizable=no, dependent=no')">
+        <img tal:attributes="src string:${here/portal_url}/actionicon_print.png" />
+        Course Registration Slip
+    </a>
+    </div>
+
 
       <h3> 
@@ -27 +32 @@
       </h3>
 
-    </metal:block>
-    <metal:main fill-slot="main" tal:condition="python:1">
       <form action="." method="post" class="group">
         <span tal:condition="info/carry_overs" tal:omit-tag="">
@@ -46 +49 @@
             </td>
             <td width="78%" tal:content="row/title"></td>
-            <td align="center" width="10%" tal:content="row/code"></td>
-            <td align="center" width="2%">S<span tal:content="row/semester" /></td>
-            <td align="center" width="2%" tal:content="row/credits"></td>
-            <td align="center" width="8%" tal:content="row/grade|string:"></td>
+            <td width="10%" tal:content="row/code"></td>
+            <td width="2%">S<span tal:content="row/semester" /></td>
+            <td width="2%" tal:content="row/credits"></td>
+            <td width="8%" tal:content="row/grade|string:"></td>
           </tr>
         </table>
@@ -73 +76 @@
             </td>
             <td width="78%" tal:content="row/title"></td>
-            <td align="center" width="10%" tal:content="row/code"></td>
-            <td align="center" width="2%">S<span tal:content="row/semester" /></td>
-            <td align="center" width="2%" tal:content="row/credits"></td>
-            <td align="center" width="8%" tal:content="row/coe|nothing"></td>
+            <td width="10%" tal:content="row/code"></td>
+            <td width="2%">S<span tal:content="row/semester" /></td>
+            <td width="2%" tal:content="row/credits"></td>
+            <td width="8%" tal:content="row/coe|nothing"></td>
           </tr>
           <tr>
@@ -196 +199 @@
         </table>
         </form>         
-    </metal:main>
-  </metal:body>
-</metal:html>
+  </span>
+  </span>          
+  </metal:main>
+</metal:body>
   

WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_student/layout_clearance_view.pt

@@ -22 +22 @@
             <tr>                         
             <tal:block condition="widget/label">
-            <td width="180px">
+            <td width="180px" valign="top">
               <span i18n:translate="" tal:condition="widget/is_i18n">
                   <span tal:content="widget/label" />:</span>

WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_student/student_view.pt

@@ -1 +1 @@
 <metal:body use-macro="here/main_template/macros/master">
     <metal:main fill-slot="main" 
-           tal:define="info context/getStudentFolderInfo;">
+           tal:define="info context/getStudentFolderInfo;
+                       baseinfo context/getStudentBaseInfo">
       <metal:block tal:condition="not: info">
         <span tal:content="here/illegal_view" />
@@ -19 +20 @@
         <h3 tal:content="info/name" />
         <br />
-
-        <table tal:condition="is_staff" class="contentListing" width="100%" summary="content layout" id="folder_content">      
-          <tr tal:repeat="row rows"
-            tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
-            <td><a href="view" tal:attributes="href string:${row/url}">
-              <strong tal:content="row/title" /></a> </td>
-            <td> 
-            <a tal:condition="python: row['is_editable'] and not row['type'] in ('StudentClearance','StudentAccommodation',)"
-                href="edit" tal:attributes="href string:${row/url}/external_edit_form"
-                target="edit"
-                onclick="javascript:window.open('','edit','width=600, height=700, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')">
-                [edit]
-            </a> 
-            <a tal:condition="python: row['is_editable'] and row['type']=='StudentClearance'"
-                href="edit" tal:attributes="href string:${row/url}/external_clearance_edit_form"
-                target="edit"
-                onclick="javascript:window.open('','edit','width=600, height=700, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')">
-                [edit and change state]
-            </a>  
-            <a tal:condition="python: context.isClearanceOfficer() and row['type']=='StudentClearance'"
-                href="edit" tal:attributes="href string:${row/url}/external_clearance_edit_form"
-                target="edit"
-                onclick="javascript:window.open('','edit','width=600, height=700, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')">
-                [change state]
-            </a>                            
-            </td>
-            
-          </tr>
-          <tr tal:condition="info/session">
-            <td>
-                <a href="edit" tal:attributes="href string:session_results_view">
-                <strong>Session Results</strong>
-            </a>             
-            </td>
-            <td>
-               &nbsp;
-            </td>
-          </tr>
-        </table>
         
-                  
-         <span tal:condition="python:info['member'].id in 
-                             ('admin','joachim','kehindesamuel','med','isouaba','obadejo',
-                              'ehioaiks','despej','shinakale','igadoghe','benamechi','edafeohwo')">
-         <br />
-         <form action="mail_password_form" method="post" class="group">
-            <input type="submit" class="context" value="Send Email with Authentication Data" />
-         </form>
-         </span> 
+        
+        
+      <table>
+        <tr>
+          <td width="220px">Registration Number:</td> 
+          <td><span tal:content="baseinfo/student/jamb_reg_no" /></td>
+        </tr>
+        <tr>
+          <td>Matriculation Number:</td> 
+          <td><span tal:content="baseinfo/student/matric_no" /></td>
+        </tr>      
+        <tr>
+          <td>Certificate Code:</td> 
+          <td><span tal:content="baseinfo/student/course" /></td>
+        </tr>
+        <tr>
+          <td>Faculty Id:</td>
+          <td tal:content="baseinfo/student/faculty" />
+        </tr>
+        <tr>
+          <td>Department Id:</td> 
+          <td><span tal:content="baseinfo/student/department" /></td>
+        </tr>
+        <tr>
+          <td>Current Session:</td> 
+          <td><span tal:content="python:context.portal_vocabularies.sessions.get(baseinfo['student']['session'])" /></td>
+        </tr>
+        <tr>
+          <td>Current Study Level:</td> 
+          <td><span tal:content="python:context.portal_vocabularies.courselevel.get(baseinfo['student']['level'])" /></td>
+        </tr>
+        <tr>
+          <td>Current Study Mode:</td> 
+          <td><span tal:content="python:context.portal_vocabularies.entry_modes.get(baseinfo['student']['mode'])" /></td>
+        </tr>        
+        <tr tal:define="verdict python:context.portal_vocabularies.verdicts.get(baseinfo['student']['verdict'])">
+          <td>Current Verdict:</td> 
+          <td><span tal:condition="verdict" tal:content="python:verdict.upper()" /></td>
+        </tr>
+      </table>           
+        
+      <br />
+      
+      <table tal:condition="is_staff" class="contentListing" width="100%" summary="content layout" id="folder_content">      
+        <tr tal:repeat="row rows"
+          tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
+          <td><a href="view" tal:attributes="href string:${row/url}">
+            <strong tal:content="row/title" /></a> </td>
+          <td> 
+          <a tal:condition="python: row['is_editable'] and not row['type'] in ('StudentClearance','StudentAccommodation','PaymentsFolder')"
+              href="edit" tal:attributes="href string:${row/url}/external_edit_form"
+              target="edit"
+              onclick="javascript:window.open('','edit','width=600, height=700, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')">
+              [edit]
+          </a> 
+          <a tal:condition="python: row['is_editable'] and row['type']=='StudentClearance'"
+              href="edit" tal:attributes="href string:${row/url}/external_clearance_edit_form"
+              target="edit"
+              onclick="javascript:window.open('','edit','width=600, height=700, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')">
+              [edit and change state]
+          </a>  
+          <a tal:condition="python: context.isClearanceOfficer() and row['type']=='StudentClearance'"
+              href="edit" tal:attributes="href string:${row/url}/external_clearance_edit_form"
+              target="edit"
+              onclick="javascript:window.open('','edit','width=600, height=700, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')">
+              [change state]
+          </a>                            
+          </td>
+          
+        </tr>
+        <tr tal:condition="info/session">
+          <td>
+              <a href="edit" tal:attributes="href string:session_results_view">
+              <strong>Session Results</strong>
+          </a>             
+          </td>
+          <td>
+             &nbsp;
+          </td>
+        </tr>
+      </table>
+      
+                
+      <span tal:condition="python:info['member'].id in 
+                         ('admin','joachim','kehindesamuel','med','isouaba','obadejo',
+                          'ehioaiks','despej','shinakale','igadoghe','benamechi','edafeohwo')">
+      <br />
+      <form action="mail_password_form" method="post" class="group">
+         <input type="submit" class="context" value="Send Email with Authentication Data" />
+      </form>
+      </span> 
 
 
-        
+      
 
-    <table tal:condition="is_student" class="contentListing" width="" summary="content layout" id="folder_content">      
-      <span tal:repeat="row rows">
-        <tr tal:condition="row/display">
-          <td><a href="view" tal:condition="row/s_view_link"
-                 tal:attributes="href string:${row/s_view_link}">
-              <strong tal:content="row/title" /></a>
-           <strong tal:condition="not:row/s_view_link" tal:content="row/title" />
+      <table tal:condition="is_student" class="contentListing" width="" summary="content layout" id="folder_content">      
+        <span tal:repeat="row rows">
+          <tr tal:condition="row/display">
+            <td width="220px"><a href="view" tal:condition="row/s_view_link"
+                   tal:attributes="href string:${row/s_view_link}">
+                <strong tal:content="row/title" /></a>
+             <strong tal:condition="not:row/s_view_link" tal:content="row/title" />
+            </td>
+  
+            <td align="left"> 
+                <span tal:content="row/review_state" />
+            </td>          
+            
+            <td width="40px" align="center"> 
+              <a tal:condition="python: row['s_edit_link'] and row['is_editable']"
+                 href="edit" tal:attributes="href string:${row/s_edit_link}">
+                [edit]
+              </a>     
+            </td>                 
+            
+  
+          </tr>
+        </span>
+        <tr tal:condition="info/session">
+          <td>
+              <a href="edit" tal:attributes="href string:session_results_view">
+              <strong>Session Results</strong>
+          </a>             
           </td>
-
-          <td width="80px" align="center"> 
-            <a tal:condition="python: row['s_edit_link'] and row['is_editable']"
-               href="edit" tal:attributes="href string:${row/s_edit_link}">
-              [edit]
-            </a>     
-          </td>                 
-          
-          <td width="100px" align="left"> 
-              <span tal:content="row/review_state" />
+          <td>
+             &nbsp;
           </td>
         </tr>
-      </span>
-      <tr tal:condition="info/session">
-        <td>
-            <a href="edit" tal:attributes="href string:session_results_view">
-            <strong>Session Results</strong>
-        </a>             
-        </td>
-        <td>
-           &nbsp;
-        </td>
-      </tr>
-    </table>
+      </table>
         
     </metal:block>