diff options
| author | Chris McDonough <chrism@agendaless.com> | 2009-10-09 07:55:07 +0000 |
|---|---|---|
| committer | Chris McDonough <chrism@agendaless.com> | 2009-10-09 07:55:07 +0000 |
| commit | 4e7436febec1f4dc10a5b32fcc4020bea751226d (patch) | |
| tree | fb78a97e0a5f96d6a5b913cbe14b6a50f910e330 /docs/tutorials/bfgwiki2/src | |
| parent | e8a3613bc35083acc850f206876037a735b813ed (diff) | |
| download | pyramid-4e7436febec1f4dc10a5b32fcc4020bea751226d.tar.gz pyramid-4e7436febec1f4dc10a5b32fcc4020bea751226d.tar.bz2 pyramid-4e7436febec1f4dc10a5b32fcc4020bea751226d.zip | |
route -> static directive.
Diffstat (limited to 'docs/tutorials/bfgwiki2/src')
8 files changed, 8 insertions, 24 deletions
diff --git a/docs/tutorials/bfgwiki2/src/authorization/tutorial/configure.zcml b/docs/tutorials/bfgwiki2/src/authorization/tutorial/configure.zcml index 65b29019b..001959bb1 100644 --- a/docs/tutorials/bfgwiki2/src/authorization/tutorial/configure.zcml +++ b/docs/tutorials/bfgwiki2/src/authorization/tutorial/configure.zcml @@ -6,10 +6,9 @@ <subscriber for="repoze.bfg.interfaces.INewRequest" handler=".run.handle_teardown"/> - <route - path="/static/*subpath" + <static name="static" - view=".views.static_view" + path="templates/static" /> <route diff --git a/docs/tutorials/bfgwiki2/src/authorization/tutorial/views.py b/docs/tutorials/bfgwiki2/src/authorization/tutorial/views.py index b36ad6192..cb54d0577 100644 --- a/docs/tutorials/bfgwiki2/src/authorization/tutorial/views.py +++ b/docs/tutorials/bfgwiki2/src/authorization/tutorial/views.py @@ -5,7 +5,6 @@ from docutils.core import publish_parts from webob.exc import HTTPFound from repoze.bfg.chameleon_zpt import render_template_to_response -from repoze.bfg.view import static from repoze.bfg.security import authenticated_userid from repoze.bfg.url import route_url @@ -15,8 +14,6 @@ from tutorial.models import Page # regular expression used to find WikiWords wikiwords = re.compile(r"\b([A-Z]\w+[A-Z]+\w+)") -static_view = static('templates/static') - def view_wiki(request): return HTTPFound(location = route_url('view_page', request, pagename='FrontPage')) diff --git a/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/configure.zcml b/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/configure.zcml index f6139f85e..285184c38 100644 --- a/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/configure.zcml +++ b/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/configure.zcml @@ -11,10 +11,9 @@ view=".views.my_view" /> - <route - path="/static/*subpath" + <static name="static" - view=".views.static_view" + path="templates/static" /> </configure> diff --git a/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/views.py b/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/views.py index f101b2742..a98712ad5 100644 --- a/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/views.py +++ b/docs/tutorials/bfgwiki2/src/basiclayout/tutorial/views.py @@ -1,11 +1,8 @@ from repoze.bfg.chameleon_zpt import render_template_to_response -from repoze.bfg.view import static from tutorial.models import DBSession from tutorial.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/docs/tutorials/bfgwiki2/src/models/tutorial/configure.zcml b/docs/tutorials/bfgwiki2/src/models/tutorial/configure.zcml index f6139f85e..285184c38 100644 --- a/docs/tutorials/bfgwiki2/src/models/tutorial/configure.zcml +++ b/docs/tutorials/bfgwiki2/src/models/tutorial/configure.zcml @@ -11,10 +11,9 @@ view=".views.my_view" /> - <route - path="/static/*subpath" + <static name="static" - view=".views.static_view" + path="templates/static" /> </configure> diff --git a/docs/tutorials/bfgwiki2/src/models/tutorial/views.py b/docs/tutorials/bfgwiki2/src/models/tutorial/views.py index f101b2742..a98712ad5 100644 --- a/docs/tutorials/bfgwiki2/src/models/tutorial/views.py +++ b/docs/tutorials/bfgwiki2/src/models/tutorial/views.py @@ -1,11 +1,8 @@ from repoze.bfg.chameleon_zpt import render_template_to_response -from repoze.bfg.view import static from tutorial.models import DBSession from tutorial.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/docs/tutorials/bfgwiki2/src/views/tutorial/configure.zcml b/docs/tutorials/bfgwiki2/src/views/tutorial/configure.zcml index 3a7ff7fc8..1e5207ebc 100644 --- a/docs/tutorials/bfgwiki2/src/views/tutorial/configure.zcml +++ b/docs/tutorials/bfgwiki2/src/views/tutorial/configure.zcml @@ -6,10 +6,9 @@ <subscriber for="repoze.bfg.interfaces.INewRequest" handler=".run.handle_teardown"/> - <route - path="/static/*subpath" + <static name="static" - view=".views.static_view" + path="templates/static" /> <route diff --git a/docs/tutorials/bfgwiki2/src/views/tutorial/views.py b/docs/tutorials/bfgwiki2/src/views/tutorial/views.py index f9af3d3c7..9a197bd75 100644 --- a/docs/tutorials/bfgwiki2/src/views/tutorial/views.py +++ b/docs/tutorials/bfgwiki2/src/views/tutorial/views.py @@ -5,7 +5,6 @@ from docutils.core import publish_parts from webob.exc import HTTPFound from repoze.bfg.chameleon_zpt import render_template_to_response -from repoze.bfg.view import static from repoze.bfg.url import route_url from tutorial.models import DBSession @@ -14,8 +13,6 @@ from tutorial.models import Page # regular expression used to find WikiWords wikiwords = re.compile(r"\b([A-Z]\w+[A-Z]+\w+)") -static_view = static('templates/static') - def view_wiki(request): return HTTPFound(location = route_url('view_page', request, pagename='FrontPage')) |