Changeset 477 for WAeUP_SRP/trunk/skins

Timestamp:

3 Sep 2006, 11:42:20 (19 years ago)

Author:

Henrik Bettermann

Message:

more layout work

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_default/layout_waeup_create.pt (modified) (1 diff)
• waeup_default/layout_waeup_edit.pt (modified) (1 diff)
• waeup_default/layout_waeup_lib.pt (modified) (2 diffs)
• waeup_student/acknowledge_print.pt (deleted)
• waeup_student/acknowledge_slip.pt (deleted)
• waeup_student/application.py (deleted)
• waeup_student/application_form.pt (modified) (1 diff)
• waeup_student/apply_admission.py (added)

WAeUP_SRP/trunk/skins/waeup_default/layout_waeup_create.pt

@@ -1 +1 @@
 <tal:block define="global creation python:1" />
-<metal:block use-macro="here/layout_lib_default_edit/macros/default_edit" />
+<metal:block use-macro="here/layout_waeup_lib/macros/default_edit" />

WAeUP_SRP/trunk/skins/waeup_default/layout_waeup_edit.pt

@@ -1 @@
-<metal:block use-macro="here/layout_lib_default_edit/macros/default_edit" />
+<metal:block use-macro="here/layout_waeup_lib/macros/default_edit" />

WAeUP_SRP/trunk/skins/waeup_default/layout_waeup_lib.pt

@@ -27 +27 @@
 
 <!-- table view -->
+
 <metal:block define-macro="table_view"
              tal:define="layout options/layout">
-<table border="0">
+<table border="0" width=100%>
     <tal:block repeat="row layout/rows">
       <tr>
@@ -40 +41 @@
                  >
               <tal:block condition="widget/label">
-              <td valign="top">
+              <td valign="top" width=40%>
                 <span i18n:translate="" tal:condition="widget/is_i18n">
                     <span tal:content="widget/label" />:</span>

WAeUP_SRP/trunk/skins/waeup_student/application_form.pt

@@ -19 +19 @@
       <tal:block tal:define="
                           appl python:here.application;
-                          appl_proxy python:appl.getContent();
-                          clear python:here.clearance;
-                          clear_proxy python:clear.getContent();
-                          pers python:here.personal;
-                          pers_proxy python:pers.getContent();"
+                          appl_proxy python:appl.getContent();"
                           >
 
-      <h2>Acknowledgement Slip for <span tal:content="pers_proxy/firstname" /> <span tal:content="pers_proxy/lastname" /></h2>      
-  
+      <h2>Application Form for <span tal:content="appl_proxy/jamb_firstname" /> <span tal:content="appl_proxy/jamb_lastname" /></h2>      
    
-      <tal:block tal:content="structure python:appl_proxy.render(cluster='appl_slip')" />
-      <tal:block tal:content="structure python:clear_proxy.render(cluster='appl_slip')" /> 
-      <tal:block tal:content="structure python:pers_proxy.render(cluster='appl_slip')" />
-
+      <tal:block tal:content="structure python:appl_proxy.renderEdit(request=request, layout_id='student_application_fe', proxy=appl_proxy, layout_mode='edit')" />
+      
+      <tal:block tal:content="structure python:appl_proxy.renderEdit(layout_id='student_application_fe', layout_mode='view')" />
+            
+      <tal:block tal:content="structure python:appl_proxy.render(layout_id='student_application_fe')" />
 
       </tal:block>