Changeset 2920 for WAeUP_SRP/base/skins/waeup_layout

Timestamp:

11 Dec 2007, 15:40:35 (17 years ago)

Author:

Henrik Bettermann

Message:

upload missing passport before starting clearance (logic in application_edit.py completely changed)

fix Title for student_accommodation object

File:

• WAeUP_SRP/base/skins/waeup_layout/layout_application_edit.pt (modified) (4 diffs)

WAeUP_SRP/base/skins/waeup_layout/layout_application_edit.pt

@@ -2 +2 @@
                           isStudent context/isStudent;
                           info context/getApplicationInfo;
-                          app_email info/app_doc/app_email">
+                          app_email info/app_doc/app_email|nothing;
+                          app_passport info/has_passport;
+                          ">
 
 <metal:block tal:condition="isStaff">              
@@ -10 +12 @@
 
 <metal:block define-macro="application_student_edit"
-  tal:condition="python:isStudent and not app_email"
+  tal:condition="python:isStudent"
   tal:define="layout options/layout;
   ds options/datastructure;
@@ -19 +21 @@
   proceed options/proceed|nothing;
   widgets python:context.getRenderedWidgets(layout);
-  fields python:( 'app_email',
-                  'app_mobile',)">
+  widget_email widgets/app_email|nothing;
+  widget_passport widgets/passport|nothing;
+  ">
   <table class="layoutDefault" summary="Form layout"
-         tal:condition="layout/rows">
+         >
 
-    <tr tal:condition="widgets/app_email|nothing" 
-        tal:define="cell widgets/app_email|nothing;">
+    <tr tal:condition="python: widget_email and not app_email" 
+        tal:define="cell widget_email">
       <tal:block tal:define="widget cell/widget;
       wid widget/getWidgetId;
@@ -56 +59 @@
       </tal:block>
     </tr>
+    <tr tal:condition="python: widget_passport and not app_passport" 
+        tal:define="cell widget_passport">
+      <tal:block tal:define="widget cell/widget;
+      wid widget/getWidgetId;
+      err python:ds.getError(wid);
+      err_mapping python:ds.getErrorMapping(wid);
+      is_required python: widget.is_required and creation and ('create' not in widget.readonly_layout_modes);
+      tooltip_id python:wid + '_help';
+      widget_css_class widget/widget_css_class|nothing;
+      css_class python:test(err, 'row error','row')"
+      >
+        <div tal:attributes="class widget_css_class;
+        id python:widget.getHtmlWidgetId()+'_widget';"
+        >
+          <td>
+            <div class="label" tal:condition="widget/label_edit"
+                 tal:attributes="class python:test(is_required, 'label required','label')">
+              <label tal:content="widget/label_edit"
+                     tal:attributes="for cell/widget_input_area_id|nothing;">label</label>:
+            
+            <button type="button" class="tooltipControl"
+                    tal:condition="widget/help"
+                    tal:attributes="onclick python:'toggleElementVisibility(\'%s\')' % tooltip_id;"> ? </button>
+            </div>
+          </td>
+          <td>
+            <span class="field">
+              <div tal:replace="structure cell/widget_rendered"/>
+            </span>
+            <div class="tooltipArea" style="visibility: hidden;"
+                 tal:condition="widget/help"
+                 tal:attributes="id tooltip_id;
+                 onclick python:'showElement(false, \'%s\')' % tooltip_id;"
+                 >
+              <tal:block tal:content="widget/help">This is the help for this field
+              </tal:block>
+            </div>
+            <tal:block condition="err">
+              <tal:block define="msg python:cpsmcat(err, mapping=err_mapping)">
+                <br /><em style="color: red"
+                          tal:content="msg">err</em>
+              </tal:block>
+            </tal:block>
+          </td>
+        </div>
+      </tal:block>
+    </tr>    
   </table>
 </metal:block>