Changeset 779 for WAeUP_SRP/trunk

Timestamp:

30 Oct 2006, 22:19:05 (18 years ago)

Author:

Henrik Bettermann

Message:

pume anonnymous view and slip added
old view and slip reverted

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/themes.xml (modified) (1 diff)
• skins/waeup_student/display_pume_result.py (modified) (1 diff)
• skins/waeup_student/layout_accommodation_view.pt_not_used (deleted)
• skins/waeup_student/pume_anon_slip.pt (added)
• skins/waeup_student/pume_anon_view.pt (added)
• skins/waeup_student/pume_slip.pt (modified) (3 diffs)
• skins/waeup_student/pume_view.pt (modified) (1 diff)

WAeUP_SRP/trunk/profiles/default/themes.xml

@@ -11 +11 @@
   <element key="accommodation_slip" value="WAeUP_Student+Slippage"/>
   <element key="pume_slip" value="WAeUP_Student+Slippage"/>
+  <element key="pume_anon_slip" value="WAeUP_Student+Slippage"/>  
  </property>
  <object name="default" meta_type="Portal Theme"/>

WAeUP_SRP/trunk/skins/waeup_student/display_pume_result.py

@@ -44 +44 @@
                                  )
 elif psm == 'valid':
-    url = "%s/campus/students/%s/pume_slip" % (context.portal_url(),ds['s_id'])
+    url = "%s/campus/students/%s/pume/pume_anon_view" % (context.portal_url(),ds['s_id'])
     return REQUEST.RESPONSE.redirect(url)
-    
+
 
 return

WAeUP_SRP/trunk/skins/waeup_student/pume_slip.pt

@@ -1 @@
-<metal:html tal:define="app_doc python: context.application.getContent()">
+<metal:html tal:define="info context/getStudentInfo"> 
   <metal:body use-macro="here/main_template/macros/master">
     <metal:main fill-slot="main">
@@ -5 +5 @@
         <metal:block use-macro="here/error_not_found/macros/not_found" />
       </span>
-      <h3>Hostel Allocation Slip (and Maintenance Receipt)</h3>
+      <h3>PUME Result Slip</h3>
       <br />
       <span tal:omit-tag=""
@@ -12 +12 @@
             layout_id='student_application_fe')" 
             />
-      <span tal:condition="python:0" tal:omit-tag=""
-            tal:content="structure python: info['acco_doc'].render(proxy=info['acco_doc'],
+      <span tal:omit-tag=""
+            tal:content="structure python: info['pume_doc'].render(proxy=info['pume_doc'],
             layout_mode='view_slip', 
-            layout_id='student_accommodation_fe')" 
+            layout_id='student_pume_fe')" 
             />
     </metal:main>

WAeUP_SRP/trunk/skins/waeup_student/pume_view.pt

@@ -9 +9 @@
             
         <div style="text-align: right"
-             tal:condition="python:review_state in ('admitted', )">
+             tal:condition="python:review_state in ('admitted', 'pume_passed', 'pume_failed',)">
         <a href="" target="slip" tal:attributes="href string:pume_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')">