Changeset 871 for WAeUP_SRP/trunk/skins

Timestamp:

16 Nov 2006, 06:06:53 (18 years ago)

Author:

Henrik Bettermann

Message:

layout of admission form/slip modified

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• admission_form.pt (modified) (2 diffs)
• admission_slip.pt (modified) (2 diffs)
• isClearanceOfficer.py (modified) (2 diffs)
• layout_application_view_info.pt (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_student/admission_form.pt

@@ -22 +22 @@
       </h3>
 
-      <h4>Application Data</h4>
+      <br />
       <span tal:omit-tag=""
             tal:content="structure python: info['app_doc'].render(proxy=info['app_doc'],
@@ -29 +29 @@
             />
 
-      <h4>Study Course</h4>
+      <h4>Your Study Course:</h4>
       <table tal:define="sc python: info['course_doc']">
         <tr>

WAeUP_SRP/trunk/skins/waeup_student/admission_slip.pt

@@ -12 +12 @@
       <br />
       
-      <h4>Application Data</h4>
       <span tal:omit-tag=""
             tal:content="structure python: info['app_doc'].render(proxy=info['app_doc'],
@@ -19 +18 @@
             />
 
-      <h4>Study Course</h4>
+      <h4>Your Study Course:</h4>
       <table tal:define="sc python: info['course_doc']">
         <tr>

WAeUP_SRP/trunk/skins/waeup_student/isClearanceOfficer.py

@@ -21 +21 @@
 if info['course'] is None:
     return False
-    
+
 res = context.portal_catalog(portal_type="Department",id=info['course_doc'].department)
 if len(res) != 1:
@@ -27 +27 @@
 
 roles = member.getRolesInContext(res[0].getObject())
-    
-return "ClearanceOfficer" in roles 
 
+return "ClearanceOfficer" in roles or context.isManager
+

WAeUP_SRP/trunk/skins/waeup_student/layout_application_view_info.pt

@@ -12 +12 @@
           <img src="img" tal:replace="structure cell/widget_rendered" />
       </tal:block>
+      
+      <br />
 
       <table width="" cellpadding="2" cellspacing="0" summary="Form layout">