Changeset 1805 for WAeUP_SRP/trunk/skins

Timestamp:

22 May 2007, 20:46:45 (18 years ago)

Author:

Henrik Bettermann

Message:

preparations for viewing CEST results

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_default/srp_anonymous_view.pt (modified) (2 diffs)
• waeup_student/check_admission_pin_form.pt (modified) (1 diff)
• waeup_student/display_cest_results.py (added)
• waeup_student/display_cest_results_form.pt (added)
• waeup_student/entry_results_anon_slip.pt (modified) (2 diffs)
• waeup_student/entry_results_anon_view.pt (modified) (4 diffs)
• waeup_student/firsttime_login_form.pt (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_default/srp_anonymous_view.pt

@@ -54 +54 @@
           <h2>New Students</h2>
 
-          <p>can view their 2006 PUME/PDE results and admission status (free of charge):</p>
+          <p>can view their 2006 PUME/PDE/CEST results and admission status (free of charge):</p>
           <br />
           <ul>
-          <li> Simply click "View PUME or PDE Results", </li> 
-          <li> enter your JAMB Registration Number and  </li> 
+          <li> Simply click "View PUME, PDE or CEST Results", </li> 
+          <li> enter your Registration Number and  </li> 
           <li> press the "Search" button. </li> 
           </ul>
           <br />
-          <p>Your PUME/PDE result record will be shown.</p>
+          <p>Your result record will be shown.</p>
           
           <p>If you are admitted, proceed with checking your admission details: </p>
@@ -68 +68 @@
           <ul>
           <li>Buy your Admission Checking Scratch Card,</li> 
-          <li>click "Check Adm. Details",</li> 
-          <li>enter your JAMB Registration Number and your Admission Checking PIN (prefix APP)</li> 
+          <li>click "Check Admission",</li> 
+          <li>enter your Registration Number and your Admission Checking PIN (prefix APP)</li> 
           <li>press the "Check" button,</li> 
           <li>print your admission slip and log out.</li> 

WAeUP_SRP/trunk/skins/waeup_student/check_admission_pin_form.pt

@@ -20 +20 @@
           <ul>
             <li>Buy an Application Scratch Card.</li> 
-            <li>Enter your JAMB Registration Number and the Admission PIN.</li> 
+            <li>Enter your Registration Number and the Admission PIN.</li> 
             <li>If you already checked admission, you can use this form to retrieve your Student Id but not 
                 to log in. <strong><font color="red">You must proceed to "Student Login".</font></strong></li> 

WAeUP_SRP/trunk/skins/waeup_student/entry_results_anon_slip.pt

@@ -4 +4 @@
     
     
-       <span tal:condition="python:pume['result_type']!='DE'">
+       <span tal:condition="python:pume['result_type'] not in ('DE','CEST')">
          <h3>PUME Results of <span tal:content="pume/name" /></h3>
        </span>
@@ -12 +12 @@
        </span>         
 
+       <span tal:condition="python:pume['result_type']=='CEST'">
+         <h3>CEST Results of <span tal:content="pume/name" /></h3>
+       </span>       
 
        <br />      

WAeUP_SRP/trunk/skins/waeup_student/entry_results_anon_view.pt

@@ -4 +4 @@
                       result_type pume/result_type">
 
-        <span tal:condition="python:result_type !='DE'">        
+                      
+        <span tal:condition="python:result_type not in ('DE','CEST')">        
         <div style="text-align: right">
         <a href="" target="slip" tal:attributes="href string:entry_results_anon_slip?nr=${pume/jamb_reg_no}"
@@ -15 +16 @@
         </span>       
                      
+
         <span tal:condition="python:result_type == 'DE'">
         <div style="text-align: right">
@@ -25 +27 @@
           <h3>PDE Results of <span tal:content="pume/name" /></h3>
         </span>     
+        
+        <span tal:condition="python:result_type == 'CEST'">
+        <div style="text-align: right">
+        <a href="" target="slip" tal:attributes="href string:entry_results_anon_slip?nr=${pume/jamb_reg_no}"
+            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" />
+            PDE Result Slip
+        </a>
+        </div>          
+          <h3>CEST Results of <span tal:content="pume/name" /></h3>
+        </span>             
         
        <br />              
@@ -37 +50 @@
        <table>
         <tr>
-          <th>JAMB Registration Number:</th><td tal:content="pume/jamb_reg_no"></td>
+          <th>Registration Number:</th><td tal:content="pume/jamb_reg_no"></td>
         </tr>
         <tr>

WAeUP_SRP/trunk/skins/waeup_student/firsttime_login_form.pt

@@ -1 +1 @@
 <metal:block use-macro="here/main_template/macros/master">
- <metal:block fill-slot="main"
-         tal:define="rendered_main options/rendered;
-             portal_status_message options/psm;
-             data_storage options/ds;
-             edition python:1;">
-    <h3>Data not yet imported!</h3>
-  </metal:block>
+
   
-  <metal:block fill-slot="mainx" tal:condition="python:0"
+  <metal:block fill-slot="main" tal:condition="python:1"
          tal:define="rendered_main options/rendered;
              portal_status_message options/psm;