Index: /WAeUP_SRP/trunk/profiles/default/actionicons.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/actionicons.xml	(revision 502)
+++ /WAeUP_SRP/trunk/profiles/default/actionicons.xml	(revision 503)
@@ -191,9 +191,12 @@
               title="Apply for PUME" priority="100"
               icon_expr="bell.png"/>
- <action-icon category="student_navigation" action_id="registration"
-              title="Registration" priority="1"
-              icon_expr="blank.gif"/>
- <action-icon category="student_navigation" action_id="prospectus"
-              title="Prospectus" priority="2"
-              icon_expr="blank.gif"/>
+ <action-icon category="student_navigation"
+              action_id="registration" title="Registration"
+              priority="1" icon_expr="blank.gif"/>
+ <action-icon category="student_navigation"
+              action_id="prospectus" title="Prospectus"
+              priority="2" icon_expr="blank.gif"/>
+ <action-icon category="student_object" action_id="slip"
+              title="Acknowledegement Slip" priority="1"
+              icon_expr="bell.png"/>
 </action-icons>
Index: /WAeUP_SRP/trunk/profiles/default/actions.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/actions.xml	(revision 502)
+++ /WAeUP_SRP/trunk/profiles/default/actions.xml	(revision 503)
@@ -116,5 +116,5 @@
   <action title="Students" action_id="view_students" category="navigation"
      condition_expr="" url_expr="string:${portal_url}/campus/students"
-     visible="False">
+     visible="True">
    <permission>Modify portal content</permission>
   </action>
@@ -123,4 +123,8 @@
    <permission>Modify portal content</permission>
   </action>
+  <action title="  " action_id="dummy" category="student_object"
+     condition_expr="" url_expr="" visible="True"/>
+  <action title="  " action_id="dummy2" category="object" condition_expr=""
+     url_expr="" visible="True"/>
  </action-provider>
  <action-provider name="portal_registration">
Index: /WAeUP_SRP/trunk/profiles/default/types/StudentApplication.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/types/StudentApplication.xml	(revision 502)
+++ /WAeUP_SRP/trunk/profiles/default/types/StudentApplication.xml	(revision 503)
@@ -28,6 +28,7 @@
  <alias from="(Default)" to="academics_contents"/>
  <alias from="view" to="academics_contents"/>
- <action title="Standard View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/academics_contents" visible="True">
+ <action title="Standard View" action_id="view" category="object"
+    condition_expr="" url_expr="string:${object_url}/academics_contents"
+    visible="True">
   <permission value="View"/>
  </action>
@@ -42,3 +43,8 @@
   <permission value="Modify portal content"/>
  </action>
+ <action title="Ackowledgement Slip" action_id="slip"
+    category="student_object" condition_expr=""
+    url_expr="string:${object_url}/application_slip" visible="True">
+  <permission value="View"/>
+ </action>
 </object>
Index: /WAeUP_SRP/trunk/profiles/default/types/University.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/types/University.xml	(revision 502)
+++ /WAeUP_SRP/trunk/profiles/default/types/University.xml	(revision 503)
@@ -8,5 +8,5 @@
  <property name="product">WAeUP_SRP</property>
  <property name="factory">addUniversity</property>
- <property name="immediate_view">university_view_all</property>
+ <property name="immediate_view">academics_contents</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
@@ -14,5 +14,4 @@
   <element value="AcademicsFolder"/>
   <element value="AccoFolder"/>
-  <element value="Chat"/>
   <element value="FAQ"/>
   <element value="Section"/>
@@ -37,10 +36,8 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="temporary_view_all"/>
- <alias from="view" to="temporary_view_all"/>
- <action title="View" action_id="view" category="object"
-    condition_expr="" url_expr="string:${object_url}/temporary_view_all"
-    visible="True">
-  <permission value="View"/>
+ <alias from="(Default)" to="home_student"/>
+ <action title="View" action_id="view" category="object" condition_expr=""
+    url_expr="string:${object_url}/academics_contents" visible="True">
+  <permission value="Modify portal content"/>
  </action>
  <action title="New content" action_id="new_content" category="object"
Index: /WAeUP_SRP/trunk/skins/waeup_custom/custom.css.dtml
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_custom/custom.css.dtml	(revision 502)
+++ /WAeUP_SRP/trunk/skins/waeup_custom/custom.css.dtml	(revision 503)
@@ -9,5 +9,5 @@
 table.registration td.active{
   white-space: nowrap;
-  color: green;
+  color: #00C600;
   font-weight: bold;
 }
Index: /WAeUP_SRP/trunk/skins/waeup_custom/msie.css.dtml
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_custom/msie.css.dtml	(revision 503)
+++ /WAeUP_SRP/trunk/skins/waeup_custom/msie.css.dtml	(revision 503)
@@ -0,0 +1,28 @@
+/*
+Internet Explorer CSS customization.
+This file is used and read *only* by MSIE through the use of a MSIE conditional
+comment. This is the place to put instructions to correct the rendering problems
+specific to MSIE.
+
+$Id: msie.css.dtml 28860 2005-10-31 16:34:08Z ogrisel $
+*/
+
+<dtml-let last_modified="_.DateTime()-14" expires="_.DateTime()+1" >
+<dtml-call "REQUEST.RESPONSE.setHeader( 'Content-Type', 'text/css' )">
+<dtml-call "REQUEST.RESPONSE.setHeader( 'Last-Modified', last_modified.toZone('GMT').rfc822() )">
+<dtml-call "REQUEST.RESPONSE.setHeader( 'Cache-Control', 'max-age=36000, must-revalidate' )">
+<dtml-call "REQUEST.RESPONSE.setHeader( 'Expires', expires.toZone('GMT').rfc822() )" >
+</dtml-let>
+
+/*
+The MSIE PNG behavior is disabled by default but kept here in case you need it.
+This MSIE behavior was supposed to work for MSIE >= 5.5, but *some* versions of
+MSIE 5.5 have problems with it. So feel free to use it back again if your
+visitors do not use MSIE 5.5 or when MSIE 5.5 becomes history.
+*/
+
+
+img {
+  behavior: url(pngbehavior.htc);
+}
+
Index: /WAeUP_SRP/trunk/skins/waeup_default/login_default.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_default/login_default.pt	(revision 503)
+++ /WAeUP_SRP/trunk/skins/waeup_default/login_default.pt	(revision 503)
@@ -0,0 +1,80 @@
+<metal:block define-macro="master"
+  tal:define="showthirdcol showthirdcol|python:1;
+              emptybody emptybody|request/emptybody|nothing;
+              mtool here/portal_membership;
+              can_raise python:mtool.assertViewable(here);
+              utool nocall:here/portal_url;
+              atool here/portal_actions;
+              ttool here/portal_trees;
+              wtool here/portal_workflow;
+              context_url python:here.getContextUrl(utool=utool);
+              base_url here/cpsskins_getBaseUrl;
+              here_url here/absolute_url;
+              member mtool/getAuthenticatedMember;
+              isAnon mtool/isAnonymousUser;
+              isHomeless python:isAnon or member.getProperty('homeless', 0);
+              isHomeless python:(isHomeless == '0' and [0] or [isHomeless])[0];
+              actions python:atool.listFilteredActionsFor(here);
+              wf_state python:wtool.getInfoFor(here,'review_state','');
+              uname python: isAnon and 'Guest' or member.getUserName();
+              checkPerm nocall: mtool/checkPermission;
+              cpsmcat nocall:here/translation_service;
+              locale here/translation_service/getSelectedLanguage;
+              in_ws here/isInWorkspace;
+              dummy python: request.set('cpsskins_cmfactions', actions);
+              username request/username | request/__ac_name | nothing">
+
+  <h1 i18n:translate="heading_login_form">Log in</h1>
+
+  <form id="loginForm" action="" method="post"
+        tal:attributes="action string:${base_url}logged_in">
+
+  <table id="login" class="form"
+         summary="Table for entering login information">
+    <tbody>
+    <tr>
+    <th>
+        <label for="username"
+               i18n:translate="label_user_name">User name</label></th>
+    <td>
+        <input type="text" id="username" name="__ac_name"
+               class="focus" size="20" value=""
+               tal:attributes="value username" /></td>
+    </tr>
+    <tr>
+    <th>
+        <label for="password"
+               i18n:translate="label_password">Password</label></th>
+    <td>
+        <input type="password" id="password" name="__ac_password" size="20"
+               value="" /></td>
+    </tr>
+    </tbody>
+  </table>
+
+  <p class="buttonArea">
+    <!-- ****** Enable the automatic redirect ***** -->
+    <input type="hidden" name="came_from" value=""
+           tal:condition="exists: request/came_from"
+           tal:attributes="value request/came_from" />
+    <!-- ****** Enable the automatic redirect ***** -->
+    <input i18n:attributes="value" class="standalone"
+           type="submit" name="submit" value="button_login" />
+  </p>
+
+  </form>
+
+  <p i18n:translate="help_login_aware_logout">
+    Don't forget to logout or exit your browser when you're done.
+  </p>
+  <p i18n:translate="help_login_troubles_cookies">
+    Having trouble logging in? Make sure to enable cookies in
+    your web browser.
+  </p>
+  <p i18n:translate="">
+    help_password_forgotten
+    <tal:block i18n:name="link_password_forgotten"
+               replace="string:${base_url}account_lost_password_form"/>
+  </p>
+
+</metal:block>
Index: eUP_SRP/trunk/skins/waeup_default/msie.css
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_default/msie.css	(revision 502)
+++ 	(revision )
@@ -1,26 +1,0 @@
-/*
-Internet Explorer CSS customization.
-This file is used and read *only* by MSIE through the use of a MSIE conditional
-comment. This is the place to put instructions to correct the rendering problems
-specific to MSIE.
-
-$Id$
-*/
-
-<dtml-let last_modified="_.DateTime()-14" expires="_.DateTime()+1" >
-<dtml-call "REQUEST.RESPONSE.setHeader( 'Content-Type', 'text/css' )">
-<dtml-call "REQUEST.RESPONSE.setHeader( 'Last-Modified', last_modified.toZone('GMT').rfc822() )">
-<dtml-call "REQUEST.RESPONSE.setHeader( 'Cache-Control', 'max-age=36000, must-revalidate' )">
-<dtml-call "REQUEST.RESPONSE.setHeader( 'Expires', expires.toZone('GMT').rfc822() )" >
-</dtml-let>
-
-/*
-The MSIE PNG behavior is disabled by default but kept here in case you need it.
-This MSIE behavior was supposed to work for MSIE >= 5.5, but *some* versions of
-MSIE 5.5 have problems with it. So feel free to use it back again if your
-visitors do not use MSIE 5.5 or when MSIE 5.5 becomes history.
-*/
-
-img {
-  behavior: url(pngbehavior.htc);
-}
Index: /WAeUP_SRP/trunk/skins/waeup_default/portlet_waeup_status_display.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_default/portlet_waeup_status_display.pt	(revision 502)
+++ /WAeUP_SRP/trunk/skins/waeup_default/portlet_waeup_status_display.pt	(revision 503)
@@ -3,11 +3,6 @@
                    base_url python: request.get('cpsskins_base_url');">
 
-<span tal:condition="python:path('info/review_state')=='checked'">
+<span tal:condition="python:path('info/review_state')!='work'">
   <img tal:attributes="src string:${here/portal_url}/cpsskins_images/actionicon_publish.png"/>
-  <span tal:content="info/review_state" />
-</ span>
-
-<span tal:condition="python:path('info/review_state')=='unchecked'">
-  <img tal:attributes="src string:${here/portal_url}/cpsskins_images/actionicon_reject.png"/>
   <span tal:content="info/review_state" />
 </ span>
Index: /WAeUP_SRP/trunk/skins/waeup_student/login_student.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/login_student.pt	(revision 503)
+++ /WAeUP_SRP/trunk/skins/waeup_student/login_student.pt	(revision 503)
@@ -0,0 +1,63 @@
+<metal:html>
+
+<metal:body use-macro="here/main_template/macros/master">
+
+<metal:main fill-slot="main"
+      tal:define="username request/username | request/__ac_name | nothing">
+
+  <h1 i18n:translate="heading_login_form">Log in</h1>
+
+  <form id="loginForm" action="" method="post"
+        tal:attributes="action string:${base_url}logged_in">
+
+  <table id="login" class="form"
+         summary="Table for entering login information">
+    <tbody>
+    <tr>
+    <th>
+        <label for="username"
+               i18n:translate="label_user_name">User name</label></th>
+    <td>
+        <input type="text" id="username" name="__ac_name"
+               class="focus" size="20" value=""
+               tal:attributes="value username" /></td>
+    </tr>
+    <tr>
+    <th>
+        <label for="password"
+               i18n:translate="label_password">Password</label></th>
+    <td>
+        <input type="password" id="password" name="__ac_password" size="20"
+               value="" /></td>
+    </tr>
+    </tbody>
+  </table>
+
+  <p class="buttonArea">
+    <!-- ****** Enable the automatic redirect ***** -->
+    <input type="hidden" name="came_from" value=""
+           tal:condition="exists: request/came_from"
+           tal:attributes="value request/came_from" />
+    <!-- ****** Enable the automatic redirect ***** -->
+    <input i18n:attributes="value" class="standalone"
+           type="submit" name="submit" value="button_login" />
+  </p>
+
+  </form>
+
+  <p i18n:translate="help_login_aware_logout">
+    Don't forget to logout or exit your browser when you're done.
+  </p>
+  <p i18n:translate="help_login_troubles_cookies">
+    Having trouble logging in? Make sure to enable cookies in
+    your web browser.
+  </p>
+  <p i18n:translate="">
+    help_password_forgotten
+    <tal:block i18n:name="link_password_forgotten"
+               replace="string:${base_url}account_lost_password_form"/>
+  </p>
+
+</metal:main>
+</metal:body>
+</metal:html>
