Changeset 869 for WAeUP_SRP/trunk/skins

Timestamp:

15 Nov 2006, 13:46:49 (18 years ago)

Author:

Henrik Bettermann

Message:

comments field removed in mail form
admission slip shown in objection_raised_view

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_default/mail2admin.py (modified) (2 diffs)
• waeup_student/admission_form.pt (modified) (1 diff)
• waeup_student/contact_student.pt (modified) (1 diff)
• waeup_student/objection_raised_view.pt (modified) (3 diffs)

WAeUP_SRP/trunk/skins/waeup_default/mail2admin.py

@@ -26 +26 @@
 Problem Type: %s
 Description: %s
-Comment: %s
 """
 
@@ -43 +42 @@
      probtype,
      descr,
-     commt,
      )
 mhost.send(msg)

WAeUP_SRP/trunk/skins/waeup_student/admission_form.pt

@@ -10 +10 @@
 
       <div style="text-align: right"
-           tal:condition="python:review_state in ('admitted', 'clearance_pin_entered', 'clearance_requested', 'cleared',)">
+           tal:condition="python:review_state in ('admitted', 'clearance_pin_entered', 'clearance_requested', 'cleared', 'objection_raised',)">
       <a href="" target="slip" tal:attributes="href string:admission_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')">

WAeUP_SRP/trunk/skins/waeup_student/contact_student.pt

@@ -52 +52 @@
           </td>
         </tr>
-        <tr>
-          <td valign="top">
-             <strong>Comments: </strong>
-          </td>
-          <td>
-             <textarea name="commt" rows="10" cols="60" id="commt"></textarea>
-          </td>
-        </tr>
       
         <tr>

WAeUP_SRP/trunk/skins/waeup_student/objection_raised_view.pt

@@ -1 @@
-<metal:html tal:define="info options/info|context/getStudentInfo">
+<metal:html tal:define="info options/info|context/getStudentInfo;
+                        review_state info/review_state">
   <metal:body use-macro="here/waeup_content_master/macros/master">
     <metal:main fill-slot="main">
+    
+      <div style="text-align: right"
+           tal:condition="python:review_state in ('admitted', 'clearance_pin_entered', 'clearance_requested', 'cleared', 'objection_raised',)">
+      <a href="" target="slip" tal:attributes="href string:admission_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" />
+          Admission Slip
+      </a>
+      </div>        
+    
       <h3>You raised an objection, please explain why!</h3>
       
@@ -17 +28 @@
           </td>
           <td>
-             <input name="fullname" type="text" id="fullname" 
+             <input name="fullname" type="text" id="fullname" size="30"
                     tal:attributes="value info/student/Title"/>
           </td>
@@ -26 +37 @@
           </td>
           <td>
-             <input name="email" type="text" id="email" 
+             <input name="email" type="text" id="email"  size="30"
                     tal:attributes="value info/app_doc/app_email"/>
           </td>