Changeset 786 for WAeUP_SRP

Timestamp:

7 Nov 2006, 08:11:13 (18 years ago)

Author:

Henrik Bettermann

Message:

status views adapted

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/vocabularies/searchable_student_states.xml (modified) (1 diff)
• skins/waeup_custom/custom.css.dtml (modified) (1 diff)
• skins/waeup_default/portlet_waeup_status_display.pt (modified) (1 diff)
• skins/waeup_student/portlet_student_workflow_display.pt (modified) (1 diff)

WAeUP_SRP/trunk/profiles/default/vocabularies/searchable_student_states.xml

@@ -11 +11 @@
  <item key="pume_passed" msgid="">pume passed</item>
  <item key="pume_failed" msgid="">pume failed</item>
+ <item key="deferred" msgid="">deferred</item>
  <item key="admission_rejected" msgid="">admission rejected</item>
  <item key="finally_rejected" msgid="">finally rejected</item>

WAeUP_SRP/trunk/skins/waeup_custom/custom.css.dtml

@@ -43 +43 @@
 }
 
+table.registration td.stopped{
+  white-space: nowrap;
+  color: red;
+  font-weight: bold;
+}
+
+table.registration td.stopped a {
+  white-space: nowrap;  
+  color: red;
+}
+
+table.registration td.stopped a:visited {
+  white-space: nowrap;  
+  color: red;
+}
+
+table.registration td.stopped a:hover {
+  text-decoration: underline;
+  white-space: nowrap;  
+}
+
 </dtml-with>

WAeUP_SRP/trunk/skins/waeup_default/portlet_waeup_status_display.pt

@@ -9 +9 @@
                                         'pume_failed',
                                         'admitted',
+                                        'deferred',
+                                        'admission_rejected',
+                                        'finally_rejected',
                                         'clearance_pin_entered',
                                         'category_A',

WAeUP_SRP/trunk/skins/waeup_student/portlet_student_workflow_display.pt

@@ -43 +43 @@
   <tr><td class="active">PUME passed</td></tr>
   </span>
-  <span tal:condition="python:path('info/review_state')!='pume_passed'">
+  <span tal:condition="python:path('info/review_state')=='pume_failed'">
+  <tr><td class="stopped">PUME failed</td></tr>
+  </span>
+  <span tal:condition="python:not path('info/review_state') in ('pume_passed', 'pume_failed',)">
   <tr><td>PUME passed</td></tr>
   </span>  
 
-  <span tal:condition="python:path('info/review_state')=='pume_failed'">
-  <tr><td class="active">PUME failed</td></tr>
-  </span>
-  <span tal:condition="python:path('info/review_state')!='pume_failed'">
-  <tr><td>PUME failed</td></tr>
-  </span>    
-  
   <span tal:condition="python:path('info/review_state')=='admitted'">
   <tr><td class="active">Admitted</td></tr>
   </span>
-  <span tal:condition="python:path('info/review_state')!='admitted'">
+  <span tal:condition="python:path('info/review_state')=='admission_rejected'">
+  <tr><td class="stopped">Admission rejected</td></tr>
+  </span>
+  <span tal:condition="python:not path('info/review_state') in ('admitted', 'admission_rejected',)">
   <tr><td>Admitted</td></tr>
+  </span>  
+
+  
+  <span tal:condition="python:path('info/review_state')=='deferred'">
+  <tr><td class="stopped">Deferred</td></tr>
+  </span>
+  <span tal:condition="python:path('info/review_state')!='deferred'">
+  <tr><td>Deferred</td></tr>
   </span>