Index: /waeup/branches/ulif-rewrite/src/waeup/university/faculty.py
===================================================================
--- /waeup/branches/ulif-rewrite/src/waeup/university/faculty.py	(revision 4037)
+++ /waeup/branches/ulif-rewrite/src/waeup/university/faculty.py	(revision 4038)
@@ -1,5 +1,5 @@
 import grok
 from waeup.interfaces import IFaculty
-from waeup.viewlets import MainArea, LeftSidebar, Index, FormWrapMixin
+from waeup.viewlets import MainArea, LeftSidebar, Index, FormWrapMixin, Manage
 
 class Faculty(grok.Container):
@@ -26,2 +26,52 @@
 
 grok.global_utility(Faculty, provides=IFaculty)
+
+
+class ManageForm(grok.EditForm):
+    """Manage the basic properties of a `Faculty` instance.
+    """
+
+    form_fields = grok.AutoFields(IFaculty)
+
+    @property
+    def label(self):
+        # Set faculty name as form label
+        return self.form_fields['name'].field.get(self.context)
+    
+    @grok.action('Save')
+    def save(self, **data):
+        self.applyData(self.context, **data)
+        return
+    
+    @grok.action('Save and return')
+    def saveAndReturn(self, **data):
+        self.applyData(self.context, **data)
+        self.redirect(self.url(self.context))
+        return
+
+    @grok.action('Cancel')
+    def cancel(self, **data):
+        self.redirect(self.url(self.context))
+        return
+
+class ManageFaculty(FormWrapMixin, grok.Viewlet):
+    """A viewlet that renders the `ManageForm`.
+    """
+    grok.viewletmanager(MainArea)
+    grok.context(IFaculty)
+    grok.view(Manage)
+    grok.require('waeup.manageUniversity')
+    
+    formview_name = 'manageform' # The name of the formview we want to
+                                 # be rendered in this viewlet.
+
+class ManageLink(grok.Viewlet):
+    grok.viewletmanager(LeftSidebar)
+    grok.context(IFaculty)
+    grok.view(Index)
+    grok.order(5)
+    # This link is only displayed, if 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>'
