Index: WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_student/create_level.py
===================================================================
--- WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_student/create_level.py	(revision 1979)
+++ WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_student/create_level.py	(revision 1988)
@@ -34,5 +34,5 @@
 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,5 +71,5 @@
     l = []
     carry_overs = results
-    
+
     # carry_overs for probation students: yes or not, that is the question
     #if student.verdict == "C": # on probation
Index: WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_student/external_study_level_view.pt
===================================================================
--- WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_student/external_study_level_view.pt	(revision 1979)
+++ WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_student/external_study_level_view.pt	(revision 1988)
@@ -1,22 +1,27 @@
-<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,6 +32,4 @@
       </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,8 +49,8 @@
             </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,8 +76,8 @@
             </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,6 +199,7 @@
         </table>
         </form>         
-    </metal:main>
-  </metal:body>
-</metal:html>
+  </span>
+  </span>          
+  </metal:main>
+</metal:body>
   
Index: WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_student/layout_clearance_view.pt
===================================================================
--- WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_student/layout_clearance_view.pt	(revision 1979)
+++ WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_student/layout_clearance_view.pt	(revision 1988)
@@ -22,5 +22,5 @@
             <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>
Index: WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_student/student_view.pt
===================================================================
--- WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_student/student_view.pt	(revision 1979)
+++ WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_student/student_view.pt	(revision 1988)
@@ -1,5 +1,6 @@
 <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,89 +20,134 @@
         <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>
