Changeset 1783 for WAeUP_SRP/trunk/skins/waeup_default

Timestamp:

15 May 2007, 07:49:50 (18 years ago)

Author:

Henrik Bettermann

Message:

• assertViewable removed and page templates adjusted, so that no traceback occurs.
• 'Previous Session' action added
• waeup_content_master.pt removed
• and more

Location:

WAeUP_SRP/trunk/skins/waeup_default

Files:

• import_form.pt (modified) (1 diff)
• srp_anonymous_view.pt (modified) (2 diffs)
• waeup_content_master.pt (deleted)
• waeup_document_view.pt (modified) (1 diff)
• waeup_edit_form.pt (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_default/import_form.pt

@@ -7 +7 @@
            >
   <metal:block define-macro="edit_form">
-    <metal:block use-macro="here/waeup_content_master/macros/master">
+    <metal:block use-macro="here/main_template/macros/master">
       <metal:block fill-slot="main">
       <h3>Import Data!</h3>

WAeUP_SRP/trunk/skins/waeup_default/srp_anonymous_view.pt

@@ -40 +40 @@
           <li> Print your Sessional Result Slip (it includes your new Student Id for further logins), </li> 
           <li> edit your personal data record,</li> 
-          <li> book your accommodation.</li> 
+          <li> book your accommodation,</li> 
+          <li> pay your school fee,</li>
+          <li> register your courses.</li>          
           </ul>
           
+          <br />
+          <p>If you have to register for previous sessions, click "Previous Sessions" 
+          instead of "View Sess. Results".</p> 
+         
           <br />
           
@@ -89 +95 @@
           <strong><a target="_blank" href="http://files.saoas.org/Procedure_for_clearance.pdf">UME</a></strong>,
           <strong><a target="_blank" href="http://files.saoas.org/Procedure_for_clearance_Direct.pdf">DE</a></strong> (1 page).
-          After being cleared you are eligible for booking your accommodation on campus.
+          After being cleared you are eligible for booking your accommodation on campus, 
+          you must pay your school fee and register your courses online.
           </p>
           <br />

WAeUP_SRP/trunk/skins/waeup_default/waeup_document_view.pt

@@ -1 @@
-<metal:body use-macro="here/waeup_content_master/macros/master">
+<metal:body use-macro="here/main_template/macros/master">
     <metal:block fill-slot="header"
                  tal:define="s_name context/getStudentNameInContext;

WAeUP_SRP/trunk/skins/waeup_default/waeup_edit_form.pt

@@ -9 +9 @@
            is_allowed context/isSectionOfficer;
            metadata metadata|nothing;
-           template here/waeup_content_master/macros/master;
+           template here/main_template/macros/master;
            ">
 <metal:block define-macro="edit_form">
@@ -16 +16 @@
   <metal:block fill-slot="header">
     <span tal:condition="not: is_allowed">
-        <metal:block use-macro="here/error_not_found/macros/not_found" />
+        <span tal:content="here/illegal_view" />
     </span>
     <span tal:condition="is_allowed">