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 ---
 .../paster_templates/routesalchemy/+package+/configure.zcml   |  5 ++---
 .../paster_templates/routesalchemy/+package+/views.py_tmpl    |  3 ---
 repoze/bfg/paster_templates/zodb/+package+/configure.zcml     |  5 ++---
 repoze/bfg/paster_templates/zodb/+package+/views.py_tmpl      |  3 ---
 6 files changed, 9 insertions(+), 21 deletions(-)

(limited to 'repoze/bfg/paster_templates')

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',
diff --git a/repoze/bfg/paster_templates/routesalchemy/+package+/configure.zcml b/repoze/bfg/paster_templates/routesalchemy/+package+/configure.zcml
index 14bb95cd6..f96a73ecf 100644
--- a/repoze/bfg/paster_templates/routesalchemy/+package+/configure.zcml
+++ b/repoze/bfg/paster_templates/routesalchemy/+package+/configure.zcml
@@ -12,10 +12,9 @@
     view=".views.my_view"
     />
 
-  <route
-    path="/static/*subpath"
+  <static
     name="static"
-    view=".views.static_view"
+    path="templates/static"
     />
 
 </configure>
diff --git a/repoze/bfg/paster_templates/routesalchemy/+package+/views.py_tmpl b/repoze/bfg/paster_templates/routesalchemy/+package+/views.py_tmpl
index c95b215ff..4b862ba61 100644
--- a/repoze/bfg/paster_templates/routesalchemy/+package+/views.py_tmpl
+++ b/repoze/bfg/paster_templates/routesalchemy/+package+/views.py_tmpl
@@ -1,11 +1,8 @@
 from repoze.bfg.chameleon_zpt import render_template_to_response
-from repoze.bfg.view import static
 
 from {{package}}.models import DBSession
 from {{package}}.models import Model
 
-static_view = static('templates/static')
-
 def my_view(request):
     dbsession = DBSession()
     root = dbsession.query(Model).filter(Model.name==u'root').first()
diff --git a/repoze/bfg/paster_templates/zodb/+package+/configure.zcml b/repoze/bfg/paster_templates/zodb/+package+/configure.zcml
index 89bf74525..aa98296c5 100644
--- a/repoze/bfg/paster_templates/zodb/+package+/configure.zcml
+++ b/repoze/bfg/paster_templates/zodb/+package+/configure.zcml
@@ -8,10 +8,9 @@
      view=".views.my_view"
      />
 
-  <view
-     for=".models.MyModel"
-     view=".views.static_view"
+  <static
      name="static"
+     path="templates/static"
      />
 
 </configure>
diff --git a/repoze/bfg/paster_templates/zodb/+package+/views.py_tmpl b/repoze/bfg/paster_templates/zodb/+package+/views.py_tmpl
index 9c5fe7a67..d9f0df378 100644
--- a/repoze/bfg/paster_templates/zodb/+package+/views.py_tmpl
+++ b/repoze/bfg/paster_templates/zodb/+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 my_view(context, request):
     return render_template_to_response('templates/mytemplate.pt',
-- 
cgit v1.2.3