Index: /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py	(revision 5981)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser.py	(revision 5982)
@@ -35,5 +35,5 @@
 from waeup.sirp.browser.pages import LoginPage
 from waeup.sirp.interfaces import IWAeUPObject
-from waeup.sirp.browser.resources import datepicker
+from waeup.sirp.browser.resources import datepicker, tabs
 from waeup.sirp.browser.viewlets import (
     AddActionButton, ManageActionButton, PrimaryNavTab,
@@ -249,4 +249,5 @@
     grok.context(IApplicantsContainer)
     grok.name('manage')
+    grok.template('form_manage_applicants_container')
     form_fields = grok.AutoFields(IApplicantsContainer)
     # Use friendlier date widget...
@@ -267,4 +268,5 @@
     def update(self):
         datepicker.need() # Enable jQuery datepicker in date fields.
+        tabs.need()
         return super(ManageApplicantsContainer, self).update()
 
@@ -360,5 +362,7 @@
     pnav = 3
 
-class EditApplicant(WAeUPEditFormPage):
+class EditApplicantStudent(WAeUPEditFormPage):
+    """An applicant-centered edit view for applicant data.
+    """
     grok.context(IApplicant)
     grok.name('edit')
@@ -379,5 +383,5 @@
             self.emitLockMessage()
             return
-        super(EditApplicant, self).update()
+        super(EditApplicantStudent, self).update()
         return
 
@@ -423,2 +427,39 @@
             return False
         return True
+
+class EditApplicantFull(WAeUPEditFormPage):
+    """A full edit view for applicant data.
+
+    This one is meant to be used by officers only.
+    """
+    grok.context(IApplicant)
+    grok.name('edit_full')
+    grok.require('waeup.editFullApplication')
+    form_fields = grok.AutoFields(IApplicantPDEEditData).omit('locked')
+    form_fields['passport'].custom_widget = EncodingImageFileWidget
+    grok.template('form_edit_full')
+
+    def update(self):
+        if self.context.locked:
+            self.emitLockMessage()
+            return
+        super(EditApplicantFull, self).update()
+        return
+
+    def filteredWidgets(self):
+        for widget in self.widgets:
+            if widget.name == 'form.confirm_passport':
+                continue
+            yield widget
+
+    @property
+    def label(self):
+        return 'Application for %s' % self.context.access_code
+    title = 'Edit Application'
+    pnav = 3
+
+    @grok.action('Save')
+    def save(self, **data):
+        self.applyData(self.context, **data)
+        self.context._p_changed = True
+        return
