Index: /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py	(revision 5821)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py	(revision 5822)
@@ -24,4 +24,5 @@
 import grok
 
+from zope.component import getUtility, getAllUtilitiesRegisteredFor
 from zope.formlib.widgets import FileWidget
 from waeup.sirp.browser import (
@@ -30,7 +31,10 @@
 from waeup.sirp.browser.pages import LoginPage
 from waeup.sirp.interfaces import IWAeUPObject
+from waeup.sirp.browser.viewlets import AddActionButton
 from waeup.sirp.applicants import get_applicant_data, ResultEntry
 from waeup.sirp.applicants.interfaces import (
-    IApplicant, IApplicantPrincipal, IApplicantPDEEditData)
+    IApplicant, IApplicantPrincipal, IApplicantPDEEditData,
+    IApplicantsRoot, IApplicantsContainer, IApplicantContainerProvider,
+    )
 from waeup.sirp.widgets.passportwidget import (
     PassportWidget, PassportDisplayWidget
@@ -62,17 +66,60 @@
     MultiListDisplayWidget, subwidget=results_display_widget)
 
-#class ApplicationsPage(WAeUPPage):
-#    grok.context(IApplicantContainer)
-#    grok.name('index')
-#    title = 'Applications'
-#    pnav = 1
-#    
-#    def getApplications(self):
-#        """Get a list of all stored applications.
-#        """
-#        for key, val in self.context.items():
-#            url = self.url(val)
-#            yield(dict(url=url, name=key))
+class ApplicationsPage(WAeUPPage):
+    grok.context(IApplicantsRoot)
+    grok.name('index')
+    title = 'Applicants'
+    pnav = 1
+    
+    def getApplications(self):
+        """Get a list of all stored applicant containers.
+        """
+        for key, val in self.context.items():
+            url = self.url(val)
+            yield(dict(url=url, name=key))
 
+class AddApplicantsContainerActionButton(AddActionButton):
+    grok.context(IApplicantsRoot)
+    grok.view(ApplicationsPage)
+    text = 'Add applicants container'
+
+class AddApplicantsContainer(WAeUPPage):
+    grok.context(IApplicantsRoot)
+    grok.name('add')
+    grok.template('addcontainer')
+    title = 'Add applicants container'
+    pnav = 1
+
+    def update(self, providername=None, name=None, ADD=None, CANCEL=None):
+        if CANCEL is not None:
+            self.redirect(self.url(self.context))
+            return
+        if ADD is None:
+            return
+        if not name:
+            self.flash('Error: you must give a name')
+            return
+        if name in self.context.keys():
+            self.flash('A container of the given name already exists')
+            return
+        # Add new applicants container...
+        provider = getUtility(IApplicantContainerProvider,
+                              name=providername)
+        container = provider.factory()
+        self.context[name] = container
+        self.flash('Added "%s".' % name)
+        self.redirect(self.url(self.context))
+        return
+        
+    def getContainerProviders(self):
+
+        providers = getAllUtilitiesRegisteredFor(IApplicantContainerProvider)
+        result = [
+            {'name': getattr(x, 'grokcore.component.directive.name'),
+             'provider': x}
+             for x in providers
+            ]
+        return result
+        
 #class AddApplicant(WAeUPAddFormPage):
 #    grok.context(IApplicantContainer)
