Changeset 840 for WAeUP_SRP/trunk

Timestamp:

11 Nov 2006, 13:17:52 (18 years ago)

Author:

Henrik Bettermann

Message:

'Clearance/Eligibility? Record' instead of 'Clearance Data'
dynamical view title of StudentClearance? objects

Location:

WAeUP_SRP/trunk

Files:

• Students.py (modified) (3 diffs)
• profiles/default/types/StudentClearance.xml (modified) (1 diff)
• skins/waeup_student/clearance_view.pt (modified) (2 diffs)

WAeUP_SRP/trunk/Students.py

@@ -136 +136 @@
                 student_obj.invokeFactory('StudentClearance','clearance')
                 clearance = student_obj.clearance
-                dc = {'Title': 'Clearance Data'}
+                dc = {'Title': 'Clearance/Eligibility Record'}
                 dc['matric_no'] = matric_no
                 state = student.get('State')
@@ -324 +324 @@
             student.invokeFactory('StudentClearance','clearance')
             #wftool.doActionFor(student.clearance,'open')
-            dp = {'Title': 'Clearance Data'}
+            dp = {'Title': 'Clearance/Eligibility Record'}
             student.clearance.manage_setLocalRoles(sid, ['Owner',])
             student.invokeFactory('StudentPume','pume')
@@ -762 +762 @@
         """compose title"""
         content = self.getContent()
-        #return "Clearance Data for %s %s" % (content.firstname,content.lastname)
-        return "Clearance Data"
+        #return "Clearance/Eligibility Record for %s %s" % (content.firstname,content.lastname)
+        return "Clearance/Eligibility Record"
 
 

WAeUP_SRP/trunk/profiles/default/types/StudentClearance.xml

@@ -2 +2 @@
 <object name="StudentClearance" meta_type="CPS Flexible Type Information"
    xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">WAeUP Student Clearance Data</property>
+ <property name="title">WAeUP Student Clearance/Eligibility Data</property>
  <property name="description"></property>
  <property name="content_icon"></property>

WAeUP_SRP/trunk/skins/waeup_student/clearance_view.pt

@@ -1 @@
-<metal:html tal:define="info context/getStudentInfo">
+<metal:html tal:define="info context/getStudentInfo;
+                        is_manager info/is_manager|nothing;
+                        is_student info/is_student|nothing;
+                        s_info context/getStudentInfo;">
   <metal:body use-macro="here/waeup_content_master/macros/master">
     <metal:main fill-slot="main">
@@ -18 +21 @@
         </div>
 
-        <h3>My Clearance/Eligibility Record</h3>
+        <h3> 
+           <span tal:condition="python:is_manager and s_info">
+             <span tal:content="s_info/student/Title" />:
+           </span>
+           <span tal:condition="python:is_student">
+             My
+           </span>
+           <span tal:content="here/title_or_id" />
+        </h3>        
+
         <br />
         <span tal:omit-tag=""