Index: /main/waeup.sirp/branches/henrik-experimental-layout/src/waeup/sirp/browser/templates/login.pt
===================================================================
--- /main/waeup.sirp/branches/henrik-experimental-layout/src/waeup/sirp/browser/templates/login.pt	(revision 5353)
+++ /main/waeup.sirp/branches/henrik-experimental-layout/src/waeup/sirp/browser/templates/login.pt	(revision 5354)
@@ -1,13 +1,20 @@
 <div class="portlet" 
      tal:condition="python: request.principal.id == 'zope.anybody'">
+    
+    
+    <form method="post" tal:condition='python:False'>
     <h3>Login</h3>
-    <form method="post">
-      User<br /><input type="text" name="form.login" size="20" /><br />
-      Password<br /><input type="password" name="form.password" size="20" />
+      User<br /><input type="text" name="form.login" size="15" /><br />
+      Password<br /><input type="password" name="form.password" size="15" />
       <br />
       <input type="submit" name="SUBMIT" value="Login" />
     </form>
+    
     <a href="@@loginstaff">
       <img tal:attributes="src static/login.png" /> Staff Login
     </a>
+    <br />
+    <a href="@@loginstudent">
+      <img tal:attributes="src static/login.png" /> Student Login
+    </a>
 </div>
Index: /main/waeup.sirp/branches/henrik-experimental-layout/src/waeup/sirp/browser/viewlets.py
===================================================================
--- /main/waeup.sirp/branches/henrik-experimental-layout/src/waeup/sirp/browser/viewlets.py	(revision 5353)
+++ /main/waeup.sirp/branches/henrik-experimental-layout/src/waeup/sirp/browser/viewlets.py	(revision 5354)
@@ -216,6 +216,6 @@
     """
     grok.viewletmanager(LeftSidebar)
-    grok.context(IUniversity)
-    grok.view(UniversityPage)
+    #grok.context(IUniversity)
+    #grok.view(UniversityPage)
     grok.order(2)
 
@@ -274,4 +274,27 @@
         return u'<div class="portlet"><a href="%s">Data Center</a></div>' % (
             self.view.application_url('datacenter'))  
+            
+class Logout(grok.Viewlet):
+    grok.viewletmanager(LeftSidebar)
+    #grok.context(IUniversity)
+    #grok.view(UniversityPage)
+    grok.order(7)
+        
+    def isAuthenticated(self):
+        """Is the calling user authenticated?
+        """
+        return self.request.principal.id != 'zope.anybody'     
+        
+    def render(self):
+        if self.isAuthenticated():
+            return u'<div class="portlet"><a href="%s">Logout</a></div>' % (
+                self.view.application_url('@@logout'))    
+        else:
+            return ''    
+        
+                
+
+
+            
 
 #
