From d66bfb5d1f1aef5cce4941b49740dbd136c95605 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@agendaless.com>
Date: Sun, 6 Sep 2009 03:36:59 +0000
Subject: Merge multiview2 branch to HEAD.

---
 repoze/bfg/paster_templates/alchemy/+package+/configure.zcml | 11 +++++------
 repoze/bfg/paster_templates/alchemy/+package+/views.py_tmpl  |  3 ---
 2 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'repoze/bfg/paster_templates/alchemy')

diff --git a/repoze/bfg/paster_templates/alchemy/+package+/configure.zcml b/repoze/bfg/paster_templates/alchemy/+package+/configure.zcml
index 2ce917de8..418d04419 100644
--- a/repoze/bfg/paster_templates/alchemy/+package+/configure.zcml
+++ b/repoze/bfg/paster_templates/alchemy/+package+/configure.zcml
@@ -8,17 +8,16 @@
      view=".views.view_root"
      />
 
-  <view
-     for=".models.MyApp"
-     view=".views.static_view"
-     name="static"
-     />
-
   <view
      for=".models.MyModel"
      view=".views.view_model"
      />
 
+  <static
+     name="static"
+     path="templates/static"
+     />
+
   <subscriber for="repoze.bfg.interfaces.INewRequest"
      handler=".run.handle_teardown"
      />
diff --git a/repoze/bfg/paster_templates/alchemy/+package+/views.py_tmpl b/repoze/bfg/paster_templates/alchemy/+package+/views.py_tmpl
index f34868ad1..2b176fb0d 100644
--- a/repoze/bfg/paster_templates/alchemy/+package+/views.py_tmpl
+++ b/repoze/bfg/paster_templates/alchemy/+package+/views.py_tmpl
@@ -1,7 +1,4 @@
 from repoze.bfg.chameleon_zpt import render_template_to_response
-from repoze.bfg.view import static
-
-static_view = static('templates/static')
 
 def view_root(context, request):
     return render_template_to_response('templates/root.pt',
-- 
cgit v1.2.3