Index: /WAeUP_SRP/trunk/skins/waeup_default/waeup_document_view.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_default/waeup_document_view.pt	(revision 1218)
+++ /WAeUP_SRP/trunk/skins/waeup_default/waeup_document_view.pt	(revision 1219)
@@ -1,8 +1,6 @@
-<metal:html tal:define="info context/getDocumentInfo;
-                        s_name context/getStudentName;
-                        is_so context/isSectionOfficer;"
-            >
-  <metal:body use-macro="here/waeup_content_master/macros/master">
-    <metal:block fill-slot="header">
+<metal:body use-macro="here/waeup_content_master/macros/master">
+    <metal:block fill-slot="header"
+                 tal:define="s_name context/getStudentNameInContext;
+                             is_so context/isSectionOfficer;">
       <a href=""
          tal:attributes="href string:${here/academicsParent}">
@@ -17,12 +15,12 @@
       </h3>
       <br />
-      </metal:block>
-      <metal:main fill-slot="main">
-        <span tal:omit-tag=""  
-              tal:content="structure python: info['doc'].render(layout_mode='view')" />
-      
-      </metal:main>
+    </metal:block>
+    <metal:main fill-slot="main"
+                tal:define="info context/getDocumentInfo">
+      <span tal:omit-tag=""  
+            tal:content="structure python: info['doc'].render(layout_mode='view')" />
     
+    </metal:main> 
     <metal:sub fill-slot="sub"/>
-  </metal:body>
-</metal:html>
+</metal:body>
+
Index: /WAeUP_SRP/trunk/skins/waeup_student/getStudentName.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/getStudentName.py	(revision 1218)
+++ /WAeUP_SRP/trunk/skins/waeup_student/getStudentName.py	(revision 1219)
@@ -16,7 +16,4 @@
 if mtool.isAnonymousUser():
     return None
-info = {}
-#from Products.zdb import set_trace
-#set_trace()
 if not context.isStudent():
     return None
Index: /WAeUP_SRP/trunk/skins/waeup_student/getStudentNameInContext.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/getStudentNameInContext.py	(revision 1219)
+++ /WAeUP_SRP/trunk/skins/waeup_student/getStudentNameInContext.py	(revision 1219)
@@ -0,0 +1,18 @@
+## Script (Python) "getStudentNameInContext"
+##bind container=container
+##bind context=context
+##bind namespace=
+##bind script=script
+##bind subpath=traverse_subpath
+##parameters=
+##title=
+##
+# $Id: getStudentName.py 1162 2006-12-31 09:39:14Z henrik $
+"""
+return Info about the current Student in context
+"""
+id = context.getStudentId()
+res = context.students_catalog(id = id)
+if len(res) != 1:
+    return None
+return res[0].name
