Index: /WAeUP_SRP/trunk/skins/waeup_default/portlet_waeup_status_display.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_default/portlet_waeup_status_display.pt	(revision 660)
+++ /WAeUP_SRP/trunk/skins/waeup_default/portlet_waeup_status_display.pt	(revision 661)
@@ -3,8 +3,8 @@
                    base_url python: request.get('cpsskins_base_url');
                    status_list python: ['checked', 'unchecked', 'opened', 'closed', 
-                                        'created', 'admission_pin_entered', 'admission_applied'];">
+                                        'created', 'application_pin_entered', 'admission_applied'];">
 
 <span tal:condition="python:path('info/review_state') in status_list ">
-  Status: <span tal:content="info/review_state" />
+  <span tal:content="info/review_state" />
 </ span>
 
Index: /WAeUP_SRP/trunk/skins/waeup_student/application_view.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/application_view.pt	(revision 660)
+++ /WAeUP_SRP/trunk/skins/waeup_student/application_view.pt	(revision 661)
@@ -8,5 +8,6 @@
             tal:define="review_state info/review_state">
             
-        <div style="text-align: right">
+        <div style="text-align: right"
+             tal:condition="python:review_state=='admission_applied'">
         <a href="" target="slip" tal:attributes="href string:application_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')">
Index: eUP_SRP/trunk/skins/waeup_student/portlet_student_status_display.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/portlet_student_status_display.pt	(revision 660)
+++ 	(revision )
@@ -1,8 +1,0 @@
-<tal:block define="item nocall:options/context_obj;
-                   info item/getContentInfo;">
-
-<img tal:attributes="src string:${here/portal_url}/cpsskins_images/actionicon_publish.png"/>
-<span tal:content="info/review_state" />
-
-</tal:block>
-
Index: /WAeUP_SRP/trunk/skins/waeup_student/portlet_student_status_display.pt_not_used
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/portlet_student_status_display.pt_not_used	(revision 661)
+++ /WAeUP_SRP/trunk/skins/waeup_student/portlet_student_status_display.pt_not_used	(revision 661)
@@ -0,0 +1,8 @@
+<tal:block define="item nocall:options/context_obj;
+                   info item/getContentInfo;">
+
+<img tal:attributes="src string:${here/portal_url}/cpsskins_images/actionicon_publish.png"/>
+<span tal:content="info/review_state" />
+
+</tal:block>
+
