Index: /waeup/branches/ulif-rewrite/src/waeup/users.py
===================================================================
--- /waeup/branches/ulif-rewrite/src/waeup/users.py	(revision 4110)
+++ /waeup/branches/ulif-rewrite/src/waeup/users.py	(revision 4111)
@@ -1,9 +1,9 @@
-"""Users (principal) for the WAeUP portal.
+"""Users (principals) for the WAeUP portal.
 """
 import grok
 from hurry import yui
 from waeup.authentication import Account
-from waeup.interfaces import IUserContainer
-from waeup.viewlets import LeftSidebar, MainArea, Index
+from waeup.interfaces import IUserContainer, IUserAccount
+from waeup.viewlets import LeftSidebar, MainArea, Index, Manage, FormWrapMixin
 
 class UserContainer(grok.Container):
@@ -34,7 +34,10 @@
     grok.name('index')
     
-    def update(self):
+    def update(self, userid=None, adduser=None, edit=None, delete=None):
         yui.sam.need()
         yui.datatable.need()
+
+        if edit is not None and userid is not None:
+            self.redirect(self.url(userid))
         
     def render(self, *args, **kw):
@@ -47,2 +50,37 @@
     grok.view(UserContainerView)
 
+
+class UserEditForm(grok.EditForm):
+    grok.context(IUserAccount)
+    form_fields = grok.AutoFields(IUserAccount)
+    grok.require('waeup.manageUsers')    
+
+    @grok.action('Save')
+    def save(self, **data):
+        self.applyData(self.context, **data)
+        self.flash('User was modified.')
+        return
+    
+    @grok.action('Save and return')
+    def saveAndReturn(self, **data):
+        self.applyData(self.context, **data)
+        self.flash('User was modified.')
+        self.redirect(self.url(self.context.__parent__))
+        return
+
+    @grok.action('Cancel')
+    def cancel(self, **data):
+        self.redirect(self.url(self.context.__parent__))
+        return
+
+
+class UserEditMain(FormWrapMixin, grok.Viewlet):
+    """A viewlet that renders the `UserEditForm`.
+    """
+    grok.viewletmanager(MainArea)
+    grok.context(IUserAccount)
+    grok.view(Index)
+    grok.require('waeup.manageUsers')
+    
+    formview_name = 'usereditform' # The name of the formview we want to
+                                   # be rendered in this viewlet.
