Index: /main/waeup.kofa/trunk/src/waeup/kofa/browser/layout.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/browser/layout.py	(revision 8105)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/browser/layout.py	(revision 8106)
@@ -53,4 +53,12 @@
 default_primary_nav_template.__grok_name__ = 'default_primary_nav'
 
+default_filedisplay_template = PageTemplateFile(
+    os.path.join('templates', 'filedisplay.pt'))
+default_filedisplay_template.__grok_name__ = 'default_filedisplay'
+
+default_fileupload_template = PageTemplateFile(
+    os.path.join('templates', 'fileupload.pt'))
+default_fileupload_template.__grok_name__ = 'default_fileupload'
+
 class action(grok.action):
 
Index: /main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/filedisplay.pt
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/filedisplay.pt	(revision 8106)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/filedisplay.pt	(revision 8106)
@@ -0,0 +1,12 @@
+<tr tal:condition = "viewlet/file_exists">
+  <td class="fieldname">
+    <span tal:replace="viewlet/label">FILENAME</span>:
+  </td>
+  <td>
+    <a tal:attributes="href viewlet/download_name"
+       tal:content="viewlet/download_name"
+       target="image">
+      LINK
+    </a>
+  </td>
+</tr>
Index: /main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/fileupload.pt
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/fileupload.pt	(revision 8106)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/fileupload.pt	(revision 8106)
@@ -0,0 +1,32 @@
+<tr i18n:domain="waeup.kofa">
+  <td class="fieldname">
+    <span tal:replace="viewlet/label">FILENAME</span>:
+  </td>
+  <td>
+    <tal:file tal:condition="viewlet/file_exists">
+      <a tal:attributes="href viewlet/download_name"
+         tal:content="viewlet/title"
+         target="image">
+        LINK
+      </a>
+    </tal:file>
+    <br />
+    <input type="file" tal:attributes="name viewlet/input_name"/>
+    <br /><br />
+    <input type="submit" tal:condition="viewlet/file_exists"
+           tal:attributes="id python:('delete_%s' % viewlet.input_name);
+              name python:('delete_%s' % viewlet.input_name);
+              value viewlet/delete_button"
+           class="btn error" />
+    <input type="submit"
+             tal:attributes="id python:('upload_%s' % viewlet.input_name);
+                name python:('upload_%s' % viewlet.input_name);
+                value viewlet/upload_button"
+             class="btn primary" />
+    <span i18n:translate="">
+      Max. file size:
+    </span>
+    <span tal:replace="viewlet/max_upload_size">10 KB</span>
+    <br />
+  </td>
+</tr>
Index: in/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/filedisplay.pt
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/filedisplay.pt	(revision 8105)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<tr tal:condition = "viewlet/file_exists">
-  <td class="fieldname">
-    <span tal:replace="viewlet/label">FILENAME</span>:
-  </td>
-  <td>
-    <a tal:attributes="href viewlet/download_name"
-       tal:content="viewlet/download_name"
-       target="image">
-      LINK
-    </a>
-  </td>
-</tr>
Index: in/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/fileupload.pt
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/fileupload.pt	(revision 8105)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<tr i18n:domain="waeup.kofa">
-  <td class="fieldname">
-    <span tal:replace="viewlet/label">FILENAME</span>:
-  </td>
-  <td>
-    <tal:file tal:condition="viewlet/file_exists">
-      <a tal:attributes="href viewlet/download_name"
-         tal:content="viewlet/title"
-         target="image">
-        LINK
-      </a>
-    </tal:file>
-    <br />
-    <input type="file" tal:attributes="name viewlet/input_name"/>
-    <br /><br />
-    <input type="submit" tal:condition="viewlet/file_exists"
-           tal:attributes="id python:('delete_%s' % viewlet.input_name);
-              name python:('delete_%s' % viewlet.input_name);
-              value viewlet/delete_button"
-           class="btn error" />
-    <input type="submit"
-             tal:attributes="id python:('upload_%s' % viewlet.input_name);
-                name python:('upload_%s' % viewlet.input_name);
-                value viewlet/upload_button"
-             class="btn primary" />
-    <span i18n:translate="">
-      Max. file size:
-    </span>
-    <span tal:replace="viewlet/max_upload_size">10 KB</span>
-    <br />
-  </td>
-</tr>
Index: /main/waeup.kofa/trunk/src/waeup/kofa/students/viewlets.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/students/viewlets.py	(revision 8105)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/students/viewlets.py	(revision 8106)
@@ -28,5 +28,7 @@
 from waeup.kofa.browser.viewlets import (
     PrimaryNavTab, ManageActionButton, AddActionButton)
-from waeup.kofa.browser.layout import default_primary_nav_template
+from waeup.kofa.browser.layout import (
+    default_primary_nav_template,
+    default_filedisplay_template, default_fileupload_template)
 from waeup.kofa.students.workflow import (ADMITTED, PAID,
     CLEARANCE, REQUESTED, RETURNING, CLEARED, REGISTERED, VALIDATED)
@@ -605,5 +607,5 @@
     grok.viewletmanager(FileManager)
     grok.view(StudentClearanceDisplayFormPage)
-    grok.template('filedisplay')
+    template = default_filedisplay_template
     grok.order(1)
     grok.require('waeup.viewStudent')
@@ -628,5 +630,5 @@
     grok.viewletmanager(FileManager)
     grok.view(StudentClearanceManageFormPage)
-    grok.template('fileupload')
+    template = default_fileupload_template
     grok.require('waeup.uploadStudentFile')
     tab_redirect = '?tab2'
