view -> static directive.

10 files changed, 20 insertions, 36 deletions

diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/configure.zcml b/docs/tutorials/bfgwiki/src/authorization/tutorial/configure.zcml
index 660181918..2fd87ba26 100644
--- a/docs/tutorials/bfgwiki/src/authorization/tutorial/configure.zcml
+++ b/docs/tutorials/bfgwiki/src/authorization/tutorial/configure.zcml
@@ -14,4 +14,9 @@
 
   <aclauthorizationpolicy/>
 
+  <static
+    name="static"
+    path="templates/static"
+    />
+
 </configure>
diff --git a/docs/tutorials/bfgwiki/src/authorization/tutorial/views.py b/docs/tutorials/bfgwiki/src/authorization/tutorial/views.py
index 59042c511..beb52e1b7 100644
--- a/docs/tutorials/bfgwiki/src/authorization/tutorial/views.py
+++ b/docs/tutorials/bfgwiki/src/authorization/tutorial/views.py
@@ -7,7 +7,6 @@ from repoze.bfg.chameleon_zpt import render_template_to_response
 
 from repoze.bfg.security import authenticated_userid
 
-from repoze.bfg.view import static
 from repoze.bfg.view import bfg_view
 
 from tutorial.models import Page
@@ -16,12 +15,6 @@ from tutorial.models import Wiki
 # regular expression used to find WikiWords
 wikiwords = re.compile(r"\b([A-Z]\w+[A-Z]+\w+)")
 
-static_app = static('templates/static')
-
-@bfg_view(for_=Wiki, name='static', permission='view')
-def static_view(context, request):
-    return static_app(context, request)
-
 @bfg_view(for_=Wiki, permission='view')
 def view_wiki(context, request):
     return HTTPFound(location = model_url(context, request, 'FrontPage'))
diff --git a/docs/tutorials/bfgwiki/src/basiclayout/tutorial/configure.zcml b/docs/tutorials/bfgwiki/src/basiclayout/tutorial/configure.zcml
index 89bf74525..f990298c5 100644
--- a/docs/tutorials/bfgwiki/src/basiclayout/tutorial/configure.zcml
+++ b/docs/tutorials/bfgwiki/src/basiclayout/tutorial/configure.zcml
@@ -8,10 +8,9 @@
      view=".views.my_view"
      />
 
-  <view
-     for=".models.MyModel"
-     view=".views.static_view"
-     name="static"
-     />
+  <static
+    name="static"
+    path="templates/static"
+    />
 
 </configure>
diff --git a/docs/tutorials/bfgwiki/src/basiclayout/tutorial/views.py b/docs/tutorials/bfgwiki/src/basiclayout/tutorial/views.py
index 13b84352f..923c1fffa 100644
--- a/docs/tutorials/bfgwiki/src/basiclayout/tutorial/views.py
+++ b/docs/tutorials/bfgwiki/src/basiclayout/tutorial/views.py
@@ -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',
diff --git a/docs/tutorials/bfgwiki/src/models/tutorial/configure.zcml b/docs/tutorials/bfgwiki/src/models/tutorial/configure.zcml
index c734bb61f..b3bb03fb1 100644
--- a/docs/tutorials/bfgwiki/src/models/tutorial/configure.zcml
+++ b/docs/tutorials/bfgwiki/src/models/tutorial/configure.zcml
@@ -8,10 +8,9 @@
      view=".views.my_view"
      />
 
-  <view
-     for=".models.Wiki"
-     view=".views.static_view"
+  <static
      name="static"
+     path="templates/static"
      />
 
 </configure>
diff --git a/docs/tutorials/bfgwiki/src/models/tutorial/views.py b/docs/tutorials/bfgwiki/src/models/tutorial/views.py
index 13b84352f..923c1fffa 100644
--- a/docs/tutorials/bfgwiki/src/models/tutorial/views.py
+++ b/docs/tutorials/bfgwiki/src/models/tutorial/views.py
@@ -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',
diff --git a/docs/tutorials/bfgwiki/src/viewdecorators/tutorial/configure.zcml b/docs/tutorials/bfgwiki/src/viewdecorators/tutorial/configure.zcml
index b1501597d..2bb0fef96 100644
--- a/docs/tutorials/bfgwiki/src/viewdecorators/tutorial/configure.zcml
+++ b/docs/tutorials/bfgwiki/src/viewdecorators/tutorial/configure.zcml
@@ -5,4 +5,9 @@
 
   <scan package="."/>
 
+  <static
+    name="static"
+    path="templates/static"
+    />
+
 </configure>
diff --git a/docs/tutorials/bfgwiki/src/viewdecorators/tutorial/views.py b/docs/tutorials/bfgwiki/src/viewdecorators/tutorial/views.py
index aae1c30ce..0725ffe28 100644
--- a/docs/tutorials/bfgwiki/src/viewdecorators/tutorial/views.py
+++ b/docs/tutorials/bfgwiki/src/viewdecorators/tutorial/views.py
@@ -4,7 +4,6 @@ import re
 from webob.exc import HTTPFound
 from repoze.bfg.url import model_url
 from repoze.bfg.chameleon_zpt import render_template_to_response
-from repoze.bfg.view import static
 from repoze.bfg.view import bfg_view
 
 from tutorial.models import Page
@@ -13,12 +12,6 @@ from tutorial.models import Wiki
 # regular expression used to find WikiWords
 wikiwords = re.compile(r"\b([A-Z]\w+[A-Z]+\w+)")
 
-static_app = static('templates/static')
-
-@bfg_view(for_=Wiki, name='static')
-def static_view(context, request):
-    return static_app(context, request)
-
 @bfg_view(for_=Wiki)
 def view_wiki(context, request):
     return HTTPFound(location = model_url(context, request, 'FrontPage'))
diff --git a/docs/tutorials/bfgwiki/src/views/tutorial/configure.zcml b/docs/tutorials/bfgwiki/src/views/tutorial/configure.zcml
index fda2ce0e8..8fa1a10c9 100644
--- a/docs/tutorials/bfgwiki/src/views/tutorial/configure.zcml
+++ b/docs/tutorials/bfgwiki/src/views/tutorial/configure.zcml
@@ -3,11 +3,10 @@
   <!-- this must be included for the view declarations to work -->
   <include package="repoze.bfg.includes" />
 
-  <view
-     for=".models.Wiki"
-     view=".views.static_view"
-     name="static"
-     />
+  <static
+    name="static"
+    path="templates/static"
+    />
 
   <view
      for=".models.Wiki"
diff --git a/docs/tutorials/bfgwiki/src/views/tutorial/views.py b/docs/tutorials/bfgwiki/src/views/tutorial/views.py
index eb1f9c0bf..e99864550 100644
--- a/docs/tutorials/bfgwiki/src/views/tutorial/views.py
+++ b/docs/tutorials/bfgwiki/src/views/tutorial/views.py
@@ -4,15 +4,12 @@ import re
 from webob.exc import HTTPFound
 from repoze.bfg.url import model_url
 from repoze.bfg.chameleon_zpt import render_template_to_response
-from repoze.bfg.view import static
 
 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(context, request):
     return HTTPFound(location = model_url(context, request, 'FrontPage'))