Index: main/kofacustom.nigeria/branches/henrik-diazo-themed/buildout.cfg
===================================================================
--- main/kofacustom.nigeria/branches/henrik-diazo-themed/buildout.cfg	(revision 11089)
+++ main/kofacustom.nigeria/branches/henrik-diazo-themed/buildout.cfg	(revision 11090)
@@ -16,6 +16,8 @@
     site_zcml
     zdaemon_conf
-    deploy_ini
-    debug_ini
+    raw_deploy_ini
+    raw_debug_ini
+    themed_deploy_ini
+    themed_debug_ini
     profile_ini
 # waeupdocs
@@ -24,4 +26,6 @@
 # kofactl creation must be _after_ app!
     kofactl
+    lxml
+    diazo
 # For backward compatibility, telling buildout not to throw away
 # the data and log subdirectories from the parts directory.
@@ -34,4 +38,5 @@
 update-versions-file = versions.cfg
 
+
 # eggs will be installed in the default buildout location
 # (see .buildout/default.cfg in your home directory)
@@ -39,6 +44,5 @@
 
 [sources]
-waeup.kofa = svn https://svn.waeup.org/repos/main/waeup.kofa/trunk
-
+waeup.kofa = svn https://svn.waeup.org/repos/main/waeup.kofa/branches/uli-diazo-themed
 [kofa_params]
 ## Basic parameters for deployment.
@@ -64,5 +68,5 @@
 # This creates all scripts in bin/. The kofactl created here is 'faulty'.
 recipe = zc.recipe.egg
-eggs = kofacustom.nigeria [beaker]
+eggs = kofacustom.nigeria [beaker, diazo]
        z3c.evalexception>=2.0
        Paste
@@ -78,5 +82,5 @@
 # fixed path to zdaemon.conf as argument.
 recipe = zc.recipe.egg
-eggs = kofacustom.nigeria [beaker]
+eggs = kofacustom.nigeria [beaker, diazo]
        waeup.kofa
 arguments = "${buildout:parts-directory}/etc/zdaemon.conf"
@@ -151,13 +155,23 @@
 output = ${buildout:parts-directory}/etc/zdaemon.conf
 
-[deploy_ini]
-recipe = collective.recipe.template
-input = etc/deploy.ini.in
-output = ${buildout:parts-directory}/etc/deploy.ini
-
-[debug_ini]
-recipe = collective.recipe.template
-input = etc/debug.ini.in
-output = ${buildout:parts-directory}/etc/debug.ini
+[raw_debug_ini]
+recipe = collective.recipe.template
+input = etc/raw/debug.ini.in
+output = ${buildout:parts-directory}/etc/raw-debug.ini
+
+[raw_deploy_ini]
+recipe = collective.recipe.template
+input = etc/raw/deploy.ini.in
+output = ${buildout:parts-directory}/etc/raw-deploy.ini
+
+[themed_debug_ini]
+recipe = collective.recipe.template
+input = etc/themed/debug.ini.in
+output = ${buildout:parts-directory}/etc/themed-debug.ini
+
+[themed_deploy_ini]
+recipe = collective.recipe.template
+input = etc/themed/deploy.ini.in
+output = ${buildout:parts-directory}/etc/themed-deploy.ini
 
 [profile_ini]
@@ -191,2 +205,13 @@
 scripts = coveragereport
 arguments = ('${buildout:parts-directory}/coverage-detect/working-directory/coverage', '${buildout:directory}/coverage-report')
+
+[lxml]
+recipe = z3c.recipe.staticlxml
+egg = lxml
+
+[diazo]
+recipe = zc.recipe.egg
+eggs =
+    diazo [wsgi]
+    PasteScript
+    kofacustom.nigeria [beaker,diazo]
Index: main/kofacustom.nigeria/branches/henrik-diazo-themed/setup.py
===================================================================
--- main/kofacustom.nigeria/branches/henrik-diazo-themed/setup.py	(revision 11089)
+++ main/kofacustom.nigeria/branches/henrik-diazo-themed/setup.py	(revision 11090)
@@ -33,4 +33,9 @@
     'roman',
     'repoze.sphinx.autointerface',
+    ]
+
+diazo_require = [
+    'diazo',
+    'webob',
     ]
 
@@ -81,4 +86,5 @@
         docs = docs_require,
         beaker = beaker_require,
+        diazo = diazo_require,
         ),
       entry_points="""
Index: main/kofacustom.nigeria/branches/henrik-diazo-themed/src/kofacustom/nigeria/students/tests/test_browser.py
===================================================================
--- main/kofacustom.nigeria/branches/henrik-diazo-themed/src/kofacustom/nigeria/students/tests/test_browser.py	(revision 11089)
+++ main/kofacustom.nigeria/branches/henrik-diazo-themed/src/kofacustom/nigeria/students/tests/test_browser.py	(revision 11090)
@@ -287,5 +287,5 @@
             name='upload_acceptanceletterupload').click()
         self.assertTrue(
-            '<a target="image" href="acc_let">'
+            'http://localhost/app/students/K1000000/acc_let'
             in self.browser.contents)
         self.browser.getControl(
Index: main/kofacustom.nigeria/branches/henrik-diazo-themed/versions.cfg
===================================================================
--- main/kofacustom.nigeria/branches/henrik-diazo-themed/versions.cfg	(revision 11089)
+++ main/kofacustom.nigeria/branches/henrik-diazo-themed/versions.cfg	(revision 11090)
@@ -128,2 +128,21 @@
 # zc.recipe.testrunner==2.0.0
 zope.testrunner = 4.3.3
+
+# Added by buildout at 2014-02-13 08:26:53.898100
+WebOb = 1.3.1
+diazo = 1.0.5
+repoze.xmliter = 0.5
+z3c.recipe.staticlxml = 0.10
+
+# Required by:
+# diazo==1.0.5
+experimental.cssselect = 0.3
+
+# Required by:
+# diazo==1.0.5
+# experimental.cssselect==0.3
+lxml = 3.3.1
+
+# Required by:
+# z3c.recipe.staticlxml==0.10
+zc.recipe.cmmi = 1.3.5
