Index: /waeup/branches/ulif-rewrite/src/waeup/university/facultycontainer.py
===================================================================
--- /waeup/branches/ulif-rewrite/src/waeup/university/facultycontainer.py	(revision 3877)
+++ /waeup/branches/ulif-rewrite/src/waeup/university/facultycontainer.py	(revision 3878)
@@ -1,14 +1,96 @@
 import grok
+from zope.component import getUtility, getMultiAdapter
+from zope.component.interfaces import Invalid
+from zope.exceptions import DuplicationError
 from waeup.basecontainer import BaseContainer
 from waeup.interfaces import IFacultyContainer
+from waeup.viewlets import MainArea, Index, Add
 from interfaces import IFaculty
 from faculty import Faculty
 
-class FacultyContainer(BaseContainer):
+from zope.schema import ValidationError
+
+class FacultyContainer(grok.Container):
 
     grok.implements(IFacultyContainer)
     
     name = u'Faculties'
-    childClass = Faculty
 
+    def getId(self, faculty):
+        """We need a unified id for each faculty, which acts as key.
+        """
+        id = faculty.name
+        id = id.replace(' ', '')
+        return id.lower()
+    
+    def addFaculty(self, faculty):
+        if not IFaculty.providedBy(faculty):
+            raise TypeError('FacultyContainers contain only IFaculty instances')
+        id = self.getId(faculty)
+        self[id] = faculty
+
+# We register FacultyContainer as a utility. This way we can
+# call getUtility(IFacultyContainer) from anywhere in the code and
+# get an instance of FacultyContainer.
 grok.global_utility(FacultyContainer, provides=IFacultyContainer)
+
+class Content(grok.Viewlet):
+    grok.viewletmanager(MainArea)
+    grok.context(IFacultyContainer)
+    grok.view(Index)
+
+    def getFaculties(self):
+        """Convinience method to create a sorted list of faculties.
+
+        It provides a list of dicts with entries for all data needed by
+        usual list templates.
+        """
+        result = []
+        for key, val in self.context.items():
+            result.append(dict(id=key, name=val.name))
+        return result
+
+class AddFacultyForm(grok.AddForm):
+    grok.context(IFacultyContainer)
+    form_fields = grok.AutoFields(IFaculty)
+
+    @grok.action('Add faculty')
+    def addFaculty(self, **data):
+        faculty = getUtility(IFaculty)
+        self.applyData(faculty, **data)
+        try:
+            self.context.addFaculty(faculty)
+        except DuplicationError:
+            self.status = Invalid('The name chosen already exists '
+                                  'in the database')
+            return
+        self.redirect(self.url(self.context))
+
+class AddFaculty(grok.Viewlet):
+    """A viewlet that wraps the `AddFacultyForm`.
+    """
+    grok.viewletmanager(MainArea)
+    grok.context(IFacultyContainer)
+    grok.view(Add)
+    grok.require('waeup.manageUniversity')
+    
+    def update(self, **data):
+        self.form = getMultiAdapter((self.context, self.request),
+                                    name='addfacultyform')
+        result = self.form.update_form()
+        if self.request.method == 'POST':
+            #app = get_application(self.context)
+            #self.__parent__.redirect(self.__parent__.url(obj=app))
+            pass
+        return
+
+    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
