Changeset 3727 for WAeUP_SRP/trunk/skins

Timestamp:

15 Oct 2008, 05:04:28 (16 years ago)

Author:

Henrik Bettermann

Message:

• more customizations for OIS
• fetch all student object titles from getStudentObjectTitles.py

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_layout/layout_search_session_edit.pt (modified) (1 diff)
• waeup_ois/academic_report_slip.pt (modified) (2 diffs)
• waeup_ois/academic_report_view.pt (modified) (4 diffs)
• waeup_ois/application_view.pt (added)
• waeup_ois/clearance_slip.pt (added)
• waeup_ois/clearance_view.pt (added)
• waeup_ois/getPaymentsFolderInfo.py (deleted)
• waeup_ois/getSchoolFee.py (deleted)
• waeup_ois/getStudentObjectTitles.py (added)
• waeup_ois/goto_interswitch_form.pt (deleted)
• waeup_ois/interswitch_form.pt (deleted)
• waeup_ois/layout_application_view.pt (added)
• waeup_ois/layout_application_view_info.pt (modified) (1 diff)
• waeup_ois/layout_application_view_slip.pt (added)
• waeup_ois/layout_personal_view.pt (added)
• waeup_ois/pay_interswitch.py (deleted)
• waeup_ois/payments_view.pt (deleted)
• waeup_ois/personal_view.pt (added)
• waeup_ois/set_access_data.py (added)
• waeup_ois/student_view.pt (modified) (1 diff)
• waeup_ois/study_course_view.pt (modified) (3 diffs)
• waeup_student/application_slip.pt (modified) (2 diffs)
• waeup_student/application_view.pt (modified) (2 diffs)
• waeup_student/clearance_slip.pt (modified) (2 diffs)
• waeup_student/clearance_view.pt (modified) (3 diffs)
• waeup_student/lecturer_course_edit_form.pt (modified) (1 diff)
• waeup_student/personal_view.pt (modified) (2 diffs)
• waeup_student/study_course_view.pt (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_layout/layout_search_session_edit.pt

@@ -78 +78 @@
   <br /><br />
   <input type="submit" class="standalone" name="cpsdocument_edit_button"
-         value="Save & First-time Login" 
+         value="Save & Login" 
          id="cpsdocument_edit_button"
          tal:condition="not:creation" />

WAeUP_SRP/trunk/skins/waeup_ois/academic_report_slip.pt

@@ -23 +23 @@
                     <tr tal:condition="python:info[sem[2]]">
                         <th tal:content="python:sem[1]" />
+                        <th align='center'>ATL</th>  
                         <th align='center'>CA 1 <br />Marks</th>
                         <th align='center'>CA 2 <br />Marks</th>    
@@ -34 +35 @@
                         tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')"> 
                         <td tal:content="row/title"></td> 
+                        <td align="center" tal:content="python:context.portal_vocabularies.pastoral_grade.get(row['atl'])"></td>
                         <td align="center" tal:content="row/ca1"></td> 
                         <td align="center" tal:content="row/ca2"></td> 

WAeUP_SRP/trunk/skins/waeup_ois/academic_report_view.pt

@@ -44 +44 @@
         <span tal:content="info/student/name" />:
       </span>
-      <span tal:condition="is_student">My </span>
-      
       Subject Registration Form for <span tal:content="info/level_str" />
     </h3>
-    
-        <br />
+        
+    <br />
            
-        <table>
-           <tr>
-            <th valign='top'>Pastoral Reports:</th> 
-            <td>
-              <span tal:repeat="item python:info['items']">
-                <a href="view" 
-                   tal:attributes="href item/id"
-                   tal:content="item/title"/><br />
-              </span>
-            </td>
-          </tr>
-          <tr>
-            <th>Session:</th> 
-            <td><span tal:content="info/session" /></td>
-          </tr>
-          <tr tal:condition="has_verdict">
-            <th>Verdict:</th> 
-            <td><span tal:content="info/verdict" /></td>
-          </tr>      
-        </table>           
+    <table>
+      <tr>
+        <th>Session:</th> 
+        <td><span tal:content="info/session" /></td>
+      </tr>
+      <tr tal:condition="has_verdict">
+        <th>Verdict:</th> 
+        <td><span tal:content="info/verdict" /></td>
+      </tr>      
+    </table>           
    
              
@@ -89 +77 @@
         <th tal:attributes="colspan python: test(show_check_boxes,'2','1')" 
             tal:content="python:sem[1]" />
+        <th align='center'>ATL</th>    
         <th align='center'>CA 1 <br />Marks</th>
         <th align='center'>CA 2 <br />Marks</th>    
@@ -110 +99 @@
           </td>
           <td tal:content="row/title"></td>
+          <td align="center" tal:content="python:context.portal_vocabularies.pastoral_grade.get(row['atl'])"></td>
           <td align="center" tal:content="row/ca1"></td>
           <td align="center" tal:content="row/ca2"></td>
@@ -275 +265 @@
       </table>
       </form>   
+      
+      <table>      
+           <tr>
+            <th valign='top'>Pastoral Reports:</th> 
+            <td>
+              <span tal:repeat="item python:info['items']">
+                <a href="view" 
+                   tal:attributes="href item/id"
+                   tal:content="item/title"/><br />
+              </span>
+            </td>
+          </tr>
+       </table>      
   </span>
   </span>        

WAeUP_SRP/trunk/skins/waeup_ois/layout_application_view_info.pt

@@ -29 +29 @@
         </tr>          
         <tr valign="top">
-          <td><span class="dlabel">Student ID</span>:
+          <td><span class="dlabel">Online Student ID</span>:
           </td>
           <td> 

WAeUP_SRP/trunk/skins/waeup_ois/student_view.pt

@@ -38 +38 @@
             <td><span tal:content="python:context.portal_vocabularies.student_levels.get(baseinfo['level'])" /></td>
           </tr>
-          <tr>
+          <tr tal:condition="is_staff">
             <td>Current Study Mode:</td> 
             <td><span tal:content="python:context.portal_vocabularies.entry_modes.get(baseinfo['mode'])" /></td>
           </tr>        
-          <tr tal:define="verdict python:context.portal_vocabularies.verdicts.get(baseinfo['verdict'])">
+          <tr tal:define="verdict python:context.portal_vocabularies.verdicts.get(baseinfo['verdict'])"
+              tal:condition="is_staff">
             <td>Current Verdict:</td> 
             <td><span tal:condition="verdict" tal:content="python:verdict.upper()" /></td>

WAeUP_SRP/trunk/skins/waeup_ois/study_course_view.pt

@@ -7 +7 @@
     <span tal:condition="info">
     <span tal:define="create_level info/create_level|nothing;
-                      is_so info/is_so;">               
+                      is_so info/is_so;
+                      titles here/getStudentObjectTitles;">               
     <a href=""
        tal:attributes="href string:${here/academicsParent}">
@@ -17 +18 @@
          <span tal:content="info/student/name" />:
        </span>
-        Study Course
+       <span tal:content="titles/StudentStudyCourse" />
     </h3>
     <br />  
@@ -33 +34 @@
         <td><span tal:content="python:context.portal_vocabularies.student_levels.get(info['doc'].current_level)" /></td>
       </tr>
-      <tr>
+      <tr tal:condition="is_so">
         <td width="220px">Current Study Mode:</td> 
         <td><span tal:content="python:context.portal_vocabularies.entry_modes.get(info['doc'].current_mode)" /></td>

WAeUP_SRP/trunk/skins/waeup_student/application_slip.pt

@@ -1 +1 @@
 <metal:body use-macro="here/slip_template/macros/master">
     <metal:main fill-slot="main"
-                tal:define="info context/getApplicationInfo">
+                tal:define="info context/getApplicationInfo;
+                            titles here/getStudentObjectTitles;">
       <span tal:condition="not: info">
         <span tal:content="here/illegal_view" />
@@ -7 +8 @@
       <span tal:condition="info">
             
-        <h3>Application Slip</h3>
+        <h3><span tal:content="titles/StudentApplication" /> Slip</h3>
         <br />
         <span tal:omit-tag=""

WAeUP_SRP/trunk/skins/waeup_student/application_view.pt

@@ -1 +1 @@
 <metal:body use-macro="here/main_template/macros/master">
    <metal:main fill-slot="main"
-                 tal:define="info context/getApplicationInfo">
+                 tal:define="info context/getApplicationInfo;
+                             titles here/getStudentObjectTitles;">
       <span tal:condition="not: info">
         <span tal:content="here/illegal_view" />
@@ -13 +14 @@
           Up one level
         </a>
-        <h3>My Application Record</h3>
+        <h3>My <span tal:content="titles/StudentApplication" /></h3>
         <br />
         <span tal:omit-tag=""

WAeUP_SRP/trunk/skins/waeup_student/clearance_slip.pt

@@ -1 +1 @@
 <metal:body use-macro="here/slip_template/macros/master">
     <metal:main fill-slot="main"
-                 tal:define="info context/getClearanceInfo">
+                 tal:define="info context/getClearanceInfo;
+                             titles here/getStudentObjectTitles;">
       <span tal:condition="not: info">
         <span tal:content="here/illegal_view" />
@@ -9 +10 @@
       <strong>Late Clearance!</strong></div>
             
-        <h3>Clearance/Eligibility Slip</h3>
+        <h3><span tal:content="titles/StudentClearance" /> Slip</h3>
         <br />
         <span tal:omit-tag=""

WAeUP_SRP/trunk/skins/waeup_student/clearance_view.pt

@@ -1 +1 @@
 <metal:body use-macro="here/main_template/macros/master">
   <metal:main fill-slot="main"
-              tal:define="info context/getClearanceInfo">
+              tal:define="info context/getClearanceInfo;
+                          titles here/getStudentObjectTitles;">
     <span tal:condition="not: info">
       <span tal:content="here/illegal_view" />
@@ -12 +13 @@
            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" />
-          Clearance/Eligibility Slip
+          <span tal:content="titles/StudentClearance" /> Slip
         </a>
       </div>
@@ -29 +30 @@
           My
         </span>
-        Clearance/Elegibility Record
+        <span tal:content="titles/StudentClearance" />
       </h3>        
       

WAeUP_SRP/trunk/skins/waeup_student/lecturer_course_edit_form.pt

@@ -21 +21 @@
                  value="Save" 
                  id="edit"/>
+          <input type="submit" name="external_close_button"
+                 class="standalone" value="Close"
+                 onclick="window.opener.location.reload();window.close()"
+                 id="external_close_button"
+                 i18n:attributes="value" />                   
         </form>
       </metal:block>

WAeUP_SRP/trunk/skins/waeup_student/personal_view.pt

@@ -1 +1 @@
 <metal:body use-macro="here/main_template/macros/master">
     <metal:main fill-slot="main"
-                tal:define="info context/getPersonalInfo">
+                tal:define="info context/getPersonalInfo;
+                            titles here/getStudentObjectTitles;">
       <span tal:condition="not: info">
         <span tal:content="here/illegal_view" />
@@ -11 +12 @@
           Up one level
         </a>            
-        <h3>My Personal Record</h3>
+        <h3>My <span tal:content="titles/StudentPersonal" /></h3>
         <br />
         <span tal:omit-tag=""

WAeUP_SRP/trunk/skins/waeup_student/study_course_view.pt

@@ -7 +7 @@
     <span tal:condition="info">
     <span tal:define="create_level info/create_level|nothing;
-                      is_so info/is_so;">               
+                      is_so info/is_so;
+                      titles here/getStudentObjectTitles;">               
     <a href=""
        tal:attributes="href string:${here/academicsParent}">
@@ -17 +18 @@
          <span tal:content="info/student/name" />:
        </span>
-        Study Course
+       My <span tal:content="titles/StudentStudyCourse" />
     </h3>
     <br />