Changeset 837 for WAeUP_SRP/trunk/skins

Timestamp:

11 Nov 2006, 11:12:39 (18 years ago)

Author:

Henrik Bettermann

Message:

clearance_view and admission_form re-built

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_custom/logged_in.py (modified) (1 diff)
• waeup_student/admission_accept_form.pt (deleted)
• waeup_student/admission_form.pt (added)
• waeup_student/admission_slip.pt (added)
• waeup_student/clearance_slip.pt (added)
• waeup_student/clearance_view.pt (modified) (1 diff)
• waeup_student/layout_clearance_view.pt (modified) (1 diff)
• waeup_student/portlet_student_workflow_display.pt (modified) (1 diff)
• waeup_student/student_index.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py

@@ -95 +95 @@
         return response.redirect("%s/application_edit" % student.absolute_url())
     elif info['review_state'] == "admitted":
-        return response.redirect("%s/admission_accept_form" % student.absolute_url())
+        return response.redirect("%s/admission_form" % student.absolute_url())
     elif info['review_state'] == "clearance_pin_entered":
-        return response.redirect("%s/clearance_edit" % student.absolute_url())        
+        return response.redirect("%s/clearance_edit" % student.absolute_url())
     return response.redirect("%s/student_index" % info['url'])
 

WAeUP_SRP/trunk/skins/waeup_student/clearance_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 ('clearance_requested', 'cleared','clearance_pin_entered',)">
+        <a href="" target="slip" tal:attributes="href string:clearance_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
+            Clearance/Eligibility Slip
         </a>
         

WAeUP_SRP/trunk/skins/waeup_student/layout_clearance_view.pt

@@ -3 +3 @@
 <metal:block define-macro="default_view"
   tal:define="layout options/layout;
-              dm options/datastructure/getDataModel;
               widgets python:context.getRenderedWidgets(layout);
-              fields python:('')"
+              fields_not_displayed python:('',)"
                                  >
-  <table cellpadding="2" cellspacing="2" summary="layout">
-    <tr>
-      <td><span class="dlabel">Student ID</span>:
-      </td>
-      <td> 
-         <span tal:replace="python:here.aq_parent.aq_parent.id" />
-      </td>      
-    </tr>
-    <tr tal:repeat="field fields">
-      <tal:block tal:define="cell python: widgets[field]">
-        <tal:block define="widget cell/widget">
-          <div tal:attributes="class cell/widget_css_class|string:label;
-            id python:widget.getHtmlWidgetId()+'_widget';">
-            <td >
-             <span class="dlabel"
-                    tal:condition="widget/label"
-                    tal:content="widget/label">label</span>:
+  <table>
+    <span tal:repeat="row layout/rows">
+        <span tal:repeat="cell row">
+          <span tal:define="widget cell/widget"
+                tal:condition="python:cell['widget_id'] not in fields_not_displayed
+                                       and widget.meta_type!='Image Widget' ">
+            <div tal:omit-tag=""
+                 tal:attributes="class cell/widget_css_class|nothing;">
+                 
+            <tr tal:condition="widget/description|nothing" class="even ajaxtd">
+              <th colspan="5" align="left"><h3 tal:replace="widget/description" /></th>
+            </tr>
+            <tr>                         
+            <tal:block condition="widget/label">
+            <td valign="top" nowrap>
+              <span i18n:translate="" tal:condition="widget/is_i18n">
+                  <span tal:content="widget/label" />:</span>
+              <span tal:condition="not:widget/is_i18n">
+                  <span tal:content="widget/label" />:</span>
             </td>
-            <td> 
-               <span tal:replace="structure cell/widget_rendered" />
+            </tal:block>
+            <tal:block condition="not: widget/label">
+            <td>
+              <div valign="top"> no label </div>
             </td>
-          </div>
-        </tal:block>
-      </tal:block>
-    </tr>
+            </tal:block>              
+            <td>
+             <div class="ddescription" tal:condition="cell" tal:content="structure cell/widget_rendered"></div>
+             <div class="ddescription" tal:condition="not:cell/widget_rendered"> none </div>
+            </td>
+            </tr>
+            </div>
+          </span>
+          <span tal:define="widget cell/widget;
+                            title_name string:${cell/widget_id}_filename;"
+                tal:condition="python:cell['widget_id'] not in fields_not_displayed
+                                       and widget.meta_type=='Image Widget' 
+                                       and cell['widget_rendered']">
+            <div tal:omit-tag=""
+                 tal:attributes="class cell/widget_css_class|nothing;">
+            <tr>
+            <td valign="top"><span tal:content="widget/title" />:</td>
+            <td>
+            <a href="" target="slip" tal:attributes="href widget/getWidgetId">
+            <span tal:content="string: Hier sollte der Dateiname stehen." />
+            </a>
+            
+            
+            </td>
+            </tr>
+            </div>
+          </span>
+        </span>
+    </span>
   </table>
 </metal:block>

WAeUP_SRP/trunk/skins/waeup_student/portlet_student_workflow_display.pt

@@ -53 +53 @@
   <tr>
     <td class="active">
-    <a href="" tal:attributes="href string:${info/url}/admission_accept_form">
+    <a href="" tal:attributes="href string:${info/url}/admission_form">
     Admitted
     </a>

WAeUP_SRP/trunk/skins/waeup_student/student_index.py

@@ -35 +35 @@
         return redirect("%s/application_edit" % info['app'].absolute_url())
     elif state in ('admitted',):
-        return redirect("%s/admission_accept_form" % student.absolute_url())
+        return redirect("%s/admission_form" % student.absolute_url())
     elif state == 'clearance_pin_entered':
         return redirect("%s/student_view" % info['clear'].absolute_url())