Index: /WAeUP_SRP/trunk/TODO.txt
===================================================================
--- /WAeUP_SRP/trunk/TODO.txt	(revision 407)
+++ /WAeUP_SRP/trunk/TODO.txt	(revision 408)
@@ -2,5 +2,7 @@
 role of the current user.
 
-- More detailed error messages
+- A StudyLevel Delete Button is still missing.
+
+- Approve und Retract should only be visible for the waeup_base workflow.
 
 - An 'Up' action should be included
Index: /WAeUP_SRP/trunk/profiles/default/cps_portlets.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/cps_portlets.xml	(revision 407)
+++ /WAeUP_SRP/trunk/profiles/default/cps_portlets.xml	(revision 408)
@@ -71,8 +71,4 @@
  <object name="portlet_882630613" meta_type="CPS Portlet"
     portal_type="Actions Portlet"/>
- <object name="portlet_916675861" meta_type="CPS Portlet"
-    portal_type="Custom Portlet"/>
- <object name="portlet_916675862" meta_type="CPS Portlet"
-    portal_type="Custom Portlet"/>
  <object name="portlet_951449960" meta_type="CPS Portlet"
     portal_type="Breadcrumbs Portlet"/>
Index: eUP_SRP/trunk/profiles/default/themes/WAeUP_Alpha/Default/main/1706504860.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/themes/WAeUP_Alpha/Default/main/1706504860.xml	(revision 407)
+++ 	(revision )
@@ -1,30 +1,0 @@
-<?xml version="1.0"?>
-<object name="1706504860" meta_type="Portal Box Group Templet">
- <property name="title">portal_session</property>
- <property name="cacheable">False</property>
- <property name="cache_lifetime">60</property>
- <property name="hidden_in_text_mode">False</property>
- <property name="display_title_in_text_mode">False</property>
- <property name="xpos">1</property>
- <property name="align">left</property>
- <property name="padding">0.2em</property>
- <property name="margin">0.2em 0.2em 0em 0.2em</property>
- <property name="templet_height"></property>
- <property name="fontcolor">defaultnovisitedlinks</property>
- <property name="fontshape">average</property>
- <property name="shape"></property>
- <property name="color"></property>
- <property name="formstyle"></property>
- <property name="visibility">always</property>
- <property name="visibility_paths"/>
- <property name="languages"/>
- <property name="esi_fragment">False</property>
- <property name="boxshape">navbox</property>
- <property name="boxcolor"></property>
- <property name="boxcorners"></property>
- <property name="portaltabstyle">PortalTabStyleuseractions</property>
- <property name="boxlayout">notitle_noframe</property>
- <property name="box_group">portal_session</property>
- <property name="macroless">False</property>
- <property name="box_title_i18n">False</property>
-</object>
Index: eUP_SRP/trunk/profiles/default/themes/WAeUP_Alpha/Frontpage/133318311/1972792851.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/themes/WAeUP_Alpha/Frontpage/133318311/1972792851.xml	(revision 407)
+++ 	(revision )
@@ -1,14 +1,0 @@
-<?xml version="1.0"?>
-<object name="1972792851" meta_type="Cell Block">
- <property name="title">Welcome</property>
- <property name="xpos">1</property>
- <property name="height"></property>
- <property name="maxcols">2</property>
- <property name="shape"></property>
- <property name="color">AreaColor</property>
- <property name="margin"></property>
- <object name="955899408" meta_type="Text Box Templet"/>
- <object name="318268911" meta_type="Portal Box Group Templet"/>
- <object name="1642841685" meta_type="Cell Sizer"/>
- <object name="785597289" meta_type="Cell Sizer"/>
-</object>
Index: /WAeUP_SRP/trunk/skins/waeup_default/portlet_session_info.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_default/portlet_session_info.pt	(revision 407)
+++ /WAeUP_SRP/trunk/skins/waeup_default/portlet_session_info.pt	(revision 408)
@@ -3,14 +3,44 @@
            isAnon mtool/isAnonymousUser;
            roles member/getRoles;
-           backend python:'Manager' in roles or 'SectionManager' in roles;
+           backend python:'UniversityManager' in roles or 'StudentManager' in roles;
            frontend python:'Student' in roles or isAnon;"
            >
   <tal:block condition="not:isAnon">
-       <strong> <span tal:content="python:member.getProperty('fullname',None)" /> 
-       </strong>
+    <tal:block condition="backend">
+      <em tal:content="member" /> is working in back-end mode<br />
+      <span  tal:condition="python: 1" >
+        with Basic Roles <span tal:content="member/getRoles" /><br />
+        <span tal:condition="python: 0" tal:content="python:mtool.getCPSCandidateLocalRoles(context)" />
+      </span>
+    </tal:block>
+    <tal:block condition="not:backend">
+      <em tal:content="member" /> is working in front-end mode<br />
+      <span  tal:condition="python: 1" >
+        with Basic Roles <span tal:content="member/getRoles" /><br />
+        <span tal:condition="python: 0" tal:content="python:mtool.getCPSCandidateLocalRoles(context)" />
+      </span>
+    </tal:block>
+    <tal:block condition="python: 0">
+    <br />
+    <a href="" tal:condition="python: 'Student' in member.getRoles() and not 'UniversityManager' in member.getRoles()" 
+       tal:attributes="href string:${context/portal_url}/students/${member}">
+      Go to your personal area
+    </a>
+    </tal:block>
+    <br />
+    <a href="" tal:condition="python: 0" 
+       tal:attributes="href string:${context/portal_url}/cpsdirectory_entry_view?dirname=members&id=${member}">        
+      Edit your Preferences
+    </a>
+    <br />
+    <a href="" i18n:translate=""
+       tal:attributes="href string:logout">
+      Log out
+    </a>
   </tal:block>
-
   <tal:block condition="isAnon">
-    <div>You are not logged in.</div>
+    <div>You are not logged in. </div>
+    <br />
+    <a href="" tal:attributes="href string:login_form">Log in</a>
   </tal:block>
 </tal:block>
