Index: /waeup/branches/ulif-rewrite/src/waeup/users.py
===================================================================
--- /waeup/branches/ulif-rewrite/src/waeup/users.py	(revision 4112)
+++ /waeup/branches/ulif-rewrite/src/waeup/users.py	(revision 4113)
@@ -3,7 +3,8 @@
 import grok
 from hurry import yui
+from zope.exceptions import DuplicationError
 from waeup.authentication import Account
 from waeup.interfaces import IUserContainer, IUserAccount
-from waeup.viewlets import LeftSidebar, MainArea, Index, Manage, FormWrapMixin
+from waeup.viewlets import LeftSidebar, MainArea, Index, Add, FormWrapMixin
 
 class UserContainer(grok.Container):
@@ -43,5 +44,38 @@
     def render(self, *args, **kw):
         return super(UserContainerView, self).render(*args, **kw)
-    
+
+class AddUserForm(grok.AddForm):
+    grok.require('waeup.manageUsers')
+    grok.context(UserContainer)
+    form_fields = grok.AutoFields(IUserAccount)
+    label = 'Add user'
+
+    @grok.action('Add user')
+    def addFaculty(self, **data):
+        #user = Account(**data)
+        name = data['name']
+        title = data['title']
+        description = data['description']
+        password = data['password']
+        try:
+            self.context.addUser(name, password, title=title,
+                                 description=description)
+        except DuplicationError:
+            self.status = Invalid('The userid chosen already exists '
+                                  'in the database')
+            return
+        self.redirect(self.url(self.context))
+
+class AddUser(FormWrapMixin, grok.Viewlet):
+    """A viewlet that wraps the `AddUserForm`.
+    """
+    grok.viewletmanager(MainArea)
+    grok.context(UserContainer)
+    grok.view(Add)
+    grok.require('waeup.manageUsers')
+
+    formview_name = 'adduserform' # The name of the formview we want
+                                  # to be rendered in this viewlet.
+
 class UserContainerMain(grok.Viewlet):
     grok.require('waeup.manageUsers')
