Index: /waeup/branches/ulif-rewrite/src/waeup/app.py
===================================================================
--- /waeup/branches/ulif-rewrite/src/waeup/app.py	(revision 3854)
+++ /waeup/branches/ulif-rewrite/src/waeup/app.py	(revision 3855)
@@ -1,10 +1,10 @@
 import grok
-from grok import index
-from zope.component import getUtility
+import re
+from zope.component import getUtility, getMultiAdapter
 from zope.interface import Interface
 
 from waeup.interfaces import (IUniversity, IStudentContainer, IHostelContainer,
                               IFacultyContainer)
-from waeup.viewlets import MainArea
+from waeup.viewlets import MainArea, LeftSidebar, Index, Manage
 
 class University(grok.Application, grok.Container):
@@ -13,5 +13,5 @@
     grok.implements(IUniversity)
 
-    def __init__(self, name=u'Unnamed', **kw):
+    def __init__(self, name=u'Sample University', **kw):
         super(University, self).__init__(**kw)
         self.name = name
@@ -22,6 +22,8 @@
         self["hostels"] = getUtility(IHostelContainer)
         self["faculties"] = getUtility(IFacultyContainer)
+
         
-class Manage(grok.EditForm):
+        
+class ManageForm(grok.EditForm):
     """Manage the basic properties of a `University` instance.
     """
@@ -41,14 +43,57 @@
 
     @grok.action('Cancel')
-    def cancel(self):
+    def cancel(self, **data):
         self.redirect(self.url(self.context))
         return
-        
+
+class ManageUniversity(grok.Viewlet):
+    """A viewlet that renders the `ManageForm`.
+    """
+    grok.viewletmanager(MainArea)
+    grok.context(IUniversity)
+    grok.view(Manage)
+    grok.require('waeup.manageUniversity')
+    
+    def update(self):
+        self.form = getMultiAdapter((self.context, self.request),
+                                    name='manageform')
+        self.form.update_form()
+        if self.request.method == 'POST':
+            #app = get_application(self.context)
+            #self.__parent__.redirect(self.__parent__.url(obj=app))
+            pass
+
+    def render(self):
+        result = self.form.render()
+        try:
+            # strip all except the form part...
+            result = re.match('^.+\(<form[^\>]+>.*</form>).+$', result,
+                              re.DOTALL).groups()[0]
+        except:
+            # except there is no such part...
+            pass
+        return result
+        return self.form.render()
+
+    
+    
 class Content(grok.Viewlet):
     grok.viewletmanager(MainArea)
     grok.context(IUniversity)
-
+    grok.view(Index)
 
 class Edit(grok.EditForm):
     grok.context(University)
     grok.AutoFields(IUniversity)
+
+class ManageLink(grok.Viewlet):
+    grok.viewletmanager(LeftSidebar)
+    grok.context(IUniversity)
+    grok.view(Index)
+    grok.order(5)
+    # This is so cool! This link is only displayed, when the user is
+    # allowed to use it!
+    grok.require('waeup.manageUniversity')
+    
+    def render(self):
+        return u'<div class="portlet"><a href="manage">Settings</a></div>'
