Changeset 863 for WAeUP_SRP/trunk/skins

Timestamp:

14 Nov 2006, 11:09:10 (18 years ago)

Author:

Henrik Bettermann

Message:

state deferred moved to the end of the workflow
objection_raised (raise_objection) instead of deferment by student
(not yet tested)

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_default/portlet_waeup_status_display.pt (modified) (1 diff)
• waeup_student/admission_form.pt (modified) (1 diff)
• waeup_student/defer_admission.py (deleted)
• waeup_student/defer_view.pt (deleted)
• waeup_student/objection_raised_view.pt (added)
• waeup_student/portlet_student_workflow_display.pt (modified) (2 diffs)
• waeup_student/raise_objection.py (added)

WAeUP_SRP/trunk/skins/waeup_default/portlet_waeup_status_display.pt

@@ -10 +10 @@
                                         'admitted',
                                         'deferred',
+                                        'objection_raised',
                                         'admission_rejected',
                                         'finally_rejected',

WAeUP_SRP/trunk/skins/waeup_student/admission_form.pt

@@ -63 +63 @@
             <td align="left" valign="top" rowspan="3"></td>
             <td align="left" valign="top">
-                <input type="submit" name="defer_admission:method" value="Reject/Defer Admission"
+                <input type="submit" name="raise_objection:method" value="Raise an Objection"
                        class="destructive"
                        tal:attributes="onclick python:'return window.confirm(\'%s\')' %
-                       (cpsmcat('Confirm that you want to reject/defer your admision.'), )" 
+                       (cpsmcat('Confirm that you want to raise an objection.'), )" 
                        />
                 <input type="submit" name="application_edit:method"

WAeUP_SRP/trunk/skins/waeup_student/portlet_student_workflow_display.pt

@@ -67 +67 @@
 
   
-  <span tal:condition="python:path('info/review_state')=='deferred'">
-  <tr><td class="stopped">Admission deferred</td></tr>
+  <span tal:condition="python:path('info/review_state')=='objection_raised'">
+  <tr><td class="stopped">Objection raised</td></tr>
   </span>
-  <span tal:condition="python:path('info/review_state')!='deferred'">
-  <tr><td>Admission deferred</td></tr>
+  <span tal:condition="python:path('info/review_state')!='objection_raised'">
+  <tr><td>Objection raised</td></tr>
   </span>  
 
@@ -100 +100 @@
   <tr><td>Cleared</td></tr>
   </span> 
+  
+  <span tal:condition="python:path('info/review_state')=='deferred'">
+  <tr><td class="active">Admission deferred</td></tr>
+  </span>
+  <span tal:condition="python:path('info/review_state')!='deferred'">
+  <tr><td>Admission deferred</td></tr>
+  </span>   
 
 </table>