Changeset 774 for WAeUP_SRP/trunk/skins

Timestamp:

29 Oct 2006, 09:55:22 (18 years ago)

Author:

Henrik Bettermann

Message:

pume rendering adapted
pume_slip added
portlet_session_info simplified

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_default/portlet_session_info.pt (modified) (1 diff)
• waeup_student/layout_accommodation_view.pt (deleted)
• waeup_student/layout_accommodation_view.pt_not_used (added)
• waeup_student/layout_application_view_info.pt (modified) (1 diff)
• waeup_student/layout_pume_view.pt (added)
• waeup_student/layout_pume_view_slip.pt (added)
• waeup_student/pume_slip.pt (added)
• waeup_student/pume_view.pt (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_default/portlet_session_info.pt

@@ -2 +2 @@
            member mtool/getAuthenticatedMember;
            isAnon mtool/isAnonymousUser;
-           roles member/getRoles;
-           backend python:'Manager' in roles or 'SectionManager' in roles;
-           frontend python:'Student' in roles or isAnon;
            info context/getStudentInfo;"
            >
-  <tal:block condition="info">
+  <tal:block condition="context/isStudent">
        <strong> 
          <span tal:condition="info/is_student" tal:content="python:info['student_doc'].Title()" /> 
-         <span tal:condition="not:info/is_student" tal:content="python:member.getProperty('fullname',None)" /> 
        </strong>
   </tal:block>
-  <tal:block condition="not:info">
+  <tal:block condition="not:context/isStudent">
        <strong> 
          <span tal:content="python:member.getProperty('fullname',None)" /> 

WAeUP_SRP/trunk/skins/waeup_student/layout_application_view_info.pt

@@ -5 +5 @@
               dm options/datastructure/getDataModel;
               widgets python:context.getRenderedWidgets(layout);
-              fields python:('jamb_lastname','jamb_sex','app_email','app_mobile')"
+              fields python:('jamb_reg_no','jamb_lastname','jamb_sex','app_email','app_mobile')"
               >
   

WAeUP_SRP/trunk/skins/waeup_student/pume_view.pt

@@ -9 +9 @@
             
         <div style="text-align: right"
-             tal:condition="python:review_state=='admission_applied'">
-        <a href="" target="slip" tal:attributes="href string:application_slip"
+             tal:condition="python:review_state in ('admitted', )">
+        <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')">
             <img tal:attributes="src string:${here/portal_url}/actionicon_print.png" />
-            Application Slip
+            PUME Result Slip
         </a>
         
@@ -23 +23 @@
               tal:content="structure python: info['pume_doc'].render(proxy=info['pume_doc'],
               layout_mode='view', 
-              layout_id='student_pume')" 
+              layout_id='student_pume_fe')" 
               />
       </span>