diff options
| author | Chris McDonough <chrism@agendaless.com> | 2009-09-06 03:36:59 +0000 |
|---|---|---|
| committer | Chris McDonough <chrism@agendaless.com> | 2009-09-06 03:36:59 +0000 |
| commit | d66bfb5d1f1aef5cce4941b49740dbd136c95605 (patch) | |
| tree | 0204e233befdb8ad99332e498308468015f3558e /repoze/bfg/paster_templates | |
| parent | 50df953770409dc9c9558c77bd5c0bbb17ac54f6 (diff) | |
| download | pyramid-d66bfb5d1f1aef5cce4941b49740dbd136c95605.tar.gz pyramid-d66bfb5d1f1aef5cce4941b49740dbd136c95605.tar.bz2 pyramid-d66bfb5d1f1aef5cce4941b49740dbd136c95605.zip | |
Merge multiview2 branch to HEAD.
Diffstat (limited to 'repoze/bfg/paster_templates')
6 files changed, 9 insertions, 21 deletions
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 @@ -9,16 +9,15 @@ /> <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', |