Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/layout.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/layout.py	(revision 6029)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/layout.py	(revision 6030)
@@ -1,5 +1,7 @@
 """Basic layout components.
 """
+import os
 import grok
+import grokcore.view
 from hurry.resource import mode
 from megrok.layout import Page, Layout, EditForm, DisplayForm, AddForm
@@ -18,4 +20,12 @@
 
 grok.templatedir('templates')
+default_waeup_display_template = grokcore.view.PageTemplateFile(
+    os.path.join('templates', 'default_waeup_display_form.pt'))
+default_waeup_display_template.__grok_name__ = 'default_waeup_display_form'
+
+default_waeup_edit_template = grokcore.view.PageTemplateFile(
+    os.path.join('templates', 'default_waeup_edit_form.pt'))
+default_waeup_edit_template.__grok_name__ = 'default_waeup_edit_form'
+
 
 def NullValidator(*args, **kw):
@@ -84,5 +94,5 @@
     """
     grok.baseclass()
-    grok.template('default_waeup_display_form')
+    template = default_waeup_display_template
 
 class WAeUPEditFormPage(EditForm, UtilityView):
@@ -90,5 +100,5 @@
     """
     grok.baseclass()
-    grok.template('default_waeup_edit_form')
+    template = default_waeup_edit_template
     
     def setUpWidgets(self,ignore_request=False):
