Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/studentsitelayout.pt
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/studentsitelayout.pt	(revision 6692)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/studentsitelayout.pt	(revision 6693)
@@ -29,9 +29,9 @@
             </span> </h1>
           <div id="navigation" class="yui-navset" style="text-align:right;">
-            <ul id="primary-navigation" tal:condition="not: layout/isStudent">
+            <ul id="primary-navigation" tal:condition="layout/isAuthenticated">
+              <tal:primary_nav content="structure provider:primary_nav_student" />
+            </ul>
+            <ul id="primary-navigation" tal:condition="not: layout/isAuthenticated">
               <tal:primary_nav content="structure provider:primary_nav" />
-            </ul>
-            <ul id="primary-navigation" tal:condition="layout/isStudent">
-              <tal:primary_nav content="structure provider:primary_nav_student" />
             </ul>
             <ul id="user-navigation">
@@ -56,27 +56,6 @@
       </div>
       <div id="bd" role="main">
-        <span tal:condition="python: layout.isAuthenticated() and not layout.isStudent()"
-              tal:content="structure provider:breadcrumbs" />
 
-        <div class="yui-b" tal:condition="not: layout/isStudent">
-          <div class="block" tal:condition="layout/getStudentName">
-            <div class="hd">
-              <h2 tal:content="layout/getStudentName">Student name</h2>
-            </div>
-            <div class="bd">
-              <tal:left content="structure provider:left_studentmanage" />
-            </div>
-          </div>
-          <div class="block" tal:condition="layout/isAuthenticated">
-            <div class="hd">
-              <h2 tal:content="layout/getUserTitle">Username</h2>
-            </div>
-            <div class="bd">
-              <tal:left content="structure provider:left" />
-            </div>
-          </div>
-        </div>
-
-        <div class="yui-b" tal:condition="layout/isStudent">
+        <div class="yui-b">
           <div class="block" tal:condition="layout/getStudentName">
             <div class="studentmenu">
@@ -90,12 +69,4 @@
             <div class="yui-g">
               <div class="block">
-                <div class="hd" tal:condition="python: not layout.isStudent() and layout.isAuthenticated()">
-                  <span tal:content="view/title"> THE CONTENT TITLE </span>
-                  <span tal:condition="layout/getStudentName" class="wfstatus">
-                  Sudent Id: <span tal:content="python:context.getStudent().student_id">Student Id</span>
-                  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                  Registration State: <span tal:content="python:context.getStudent().state">State</span>
-                  </span>
-                </div>
                 <div class="bd">
                   <div class="actionbar">
