summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/MyProject/myproject/__init__.py2
-rw-r--r--docs/narr/MyProject/myproject/static/favicon.ico (renamed from docs/narr/MyProject/myproject/templates/static/favicon.ico)bin1406 -> 1406 bytes
-rw-r--r--docs/narr/MyProject/myproject/static/logo.png (renamed from docs/narr/MyProject/myproject/templates/static/logo.png)bin6641 -> 6641 bytes
-rw-r--r--docs/narr/MyProject/myproject/static/pylons.css (renamed from docs/narr/MyProject/myproject/templates/static/pylons.css)0
-rw-r--r--docs/narr/project.rst51
-rw-r--r--docs/tutorials/wiki/basiclayout.rst2
-rw-r--r--docs/tutorials/wiki/definingviews.rst11
-rw-r--r--docs/tutorials/wiki/src/authorization/tutorial/configure.zcml2
-rw-r--r--docs/tutorials/wiki/src/authorization/tutorial/static/favicon.ico (renamed from docs/tutorials/wiki/src/authorization/tutorial/templates/static/favicon.ico)bin1406 -> 1406 bytes
-rw-r--r--docs/tutorials/wiki/src/authorization/tutorial/static/logo.png (renamed from docs/tutorials/wiki/src/authorization/tutorial/templates/static/logo.png)bin6641 -> 6641 bytes
-rw-r--r--docs/tutorials/wiki/src/authorization/tutorial/static/pylons.css (renamed from docs/tutorials/wiki/src/authorization/tutorial/templates/static/pylons.css)0
-rw-r--r--docs/tutorials/wiki/src/basiclayout/tutorial/configure.zcml2
-rw-r--r--docs/tutorials/wiki/src/basiclayout/tutorial/static/favicon.ico (renamed from docs/tutorials/wiki/src/basiclayout/tutorial/templates/static/favicon.ico)bin1406 -> 1406 bytes
-rw-r--r--docs/tutorials/wiki/src/basiclayout/tutorial/static/logo.png (renamed from docs/tutorials/wiki/src/basiclayout/tutorial/templates/static/logo.png)bin6641 -> 6641 bytes
-rw-r--r--docs/tutorials/wiki/src/basiclayout/tutorial/static/pylons.css (renamed from docs/tutorials/wiki/src/basiclayout/tutorial/templates/static/pylons.css)0
-rw-r--r--docs/tutorials/wiki/src/models/tutorial/configure.zcml2
-rw-r--r--docs/tutorials/wiki/src/models/tutorial/static/favicon.ico (renamed from docs/tutorials/wiki/src/models/tutorial/templates/static/favicon.ico)bin1406 -> 1406 bytes
-rw-r--r--docs/tutorials/wiki/src/models/tutorial/static/logo.png (renamed from docs/tutorials/wiki/src/models/tutorial/templates/static/logo.png)bin6641 -> 6641 bytes
-rw-r--r--docs/tutorials/wiki/src/models/tutorial/static/pylons.css (renamed from docs/tutorials/wiki/src/models/tutorial/templates/static/pylons.css)0
-rw-r--r--docs/tutorials/wiki/src/viewdecorators/tutorial/configure.zcml2
-rw-r--r--docs/tutorials/wiki/src/viewdecorators/tutorial/static/favicon.ico (renamed from docs/tutorials/wiki/src/viewdecorators/tutorial/templates/static/favicon.ico)bin1406 -> 1406 bytes
-rw-r--r--docs/tutorials/wiki/src/viewdecorators/tutorial/static/logo.png (renamed from docs/tutorials/wiki/src/viewdecorators/tutorial/templates/static/logo.png)bin6641 -> 6641 bytes
-rw-r--r--docs/tutorials/wiki/src/viewdecorators/tutorial/static/pylons.css (renamed from docs/tutorials/wiki/src/viewdecorators/tutorial/templates/static/pylons.css)0
-rw-r--r--docs/tutorials/wiki/src/views/tutorial/configure.zcml2
-rw-r--r--docs/tutorials/wiki/src/views/tutorial/static/favicon.ico (renamed from docs/tutorials/wiki/src/views/tutorial/templates/static/favicon.ico)bin1406 -> 1406 bytes
-rw-r--r--docs/tutorials/wiki/src/views/tutorial/static/logo.png (renamed from docs/tutorials/wiki/src/views/tutorial/templates/static/logo.png)bin6641 -> 6641 bytes
-rw-r--r--docs/tutorials/wiki/src/views/tutorial/static/pylons.css (renamed from docs/tutorials/wiki/src/views/tutorial/templates/static/pylons.css)0
-rw-r--r--docs/tutorials/wiki2/basiclayout.rst4
-rw-r--r--docs/tutorials/wiki2/definingviews.rst11
-rw-r--r--docs/tutorials/wiki2/src/authorization/tutorial/__init__.py2
-rw-r--r--docs/tutorials/wiki2/src/authorization/tutorial/static/favicon.ico (renamed from docs/tutorials/wiki2/src/authorization/tutorial/templates/static/favicon.ico)bin1406 -> 1406 bytes
-rw-r--r--docs/tutorials/wiki2/src/authorization/tutorial/static/logo.png (renamed from docs/tutorials/wiki2/src/authorization/tutorial/templates/static/logo.png)bin6641 -> 6641 bytes
-rw-r--r--docs/tutorials/wiki2/src/authorization/tutorial/static/pylons.css (renamed from docs/tutorials/wiki2/src/authorization/tutorial/templates/static/pylons.css)0
-rw-r--r--docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py2
-rw-r--r--docs/tutorials/wiki2/src/basiclayout/tutorial/static/favicon.ico (renamed from docs/tutorials/wiki2/src/basiclayout/tutorial/templates/static/favicon.ico)bin1406 -> 1406 bytes
-rw-r--r--docs/tutorials/wiki2/src/basiclayout/tutorial/static/logo.png (renamed from docs/tutorials/wiki2/src/basiclayout/tutorial/templates/static/logo.png)bin6641 -> 6641 bytes
-rw-r--r--docs/tutorials/wiki2/src/basiclayout/tutorial/static/pylons.css (renamed from docs/tutorials/wiki2/src/basiclayout/tutorial/templates/static/pylons.css)0
-rw-r--r--docs/tutorials/wiki2/src/models/tutorial/__init__.py2
-rw-r--r--docs/tutorials/wiki2/src/models/tutorial/static/favicon.ico (renamed from docs/tutorials/wiki2/src/models/tutorial/templates/static/favicon.ico)bin1406 -> 1406 bytes
-rw-r--r--docs/tutorials/wiki2/src/models/tutorial/static/logo.png (renamed from docs/tutorials/wiki2/src/models/tutorial/templates/static/logo.png)bin6641 -> 6641 bytes
-rw-r--r--docs/tutorials/wiki2/src/models/tutorial/static/pylons.css (renamed from docs/tutorials/wiki2/src/models/tutorial/templates/static/pylons.css)0
-rw-r--r--docs/tutorials/wiki2/src/views/tutorial/__init__.py2
-rw-r--r--docs/tutorials/wiki2/src/views/tutorial/static/favicon.ico (renamed from docs/tutorials/wiki2/src/views/tutorial/templates/static/favicon.ico)bin1406 -> 1406 bytes
-rw-r--r--docs/tutorials/wiki2/src/views/tutorial/static/logo.png (renamed from docs/tutorials/wiki2/src/views/tutorial/templates/static/logo.png)bin6641 -> 6641 bytes
-rw-r--r--docs/tutorials/wiki2/src/views/tutorial/static/pylons.css (renamed from docs/tutorials/wiki2/src/views/tutorial/templates/static/pylons.css)0
45 files changed, 48 insertions, 51 deletions
diff --git a/docs/narr/MyProject/myproject/__init__.py b/docs/narr/MyProject/myproject/__init__.py
index 2dbaf0a88..ac6ece3c1 100644
--- a/docs/narr/MyProject/myproject/__init__.py
+++ b/docs/narr/MyProject/myproject/__init__.py
@@ -12,7 +12,7 @@ def app(global_config, **settings):
config.add_view('myproject.views.my_view',
context='myproject.models.MyModel',
renderer='myproject:templates/mytemplate.pt')
- config.add_static_view('static', 'myproject:templates/static')
+ config.add_static_view('static', 'myproject:static')
config.end()
return config.make_wsgi_app()
diff --git a/docs/narr/MyProject/myproject/templates/static/favicon.ico b/docs/narr/MyProject/myproject/static/favicon.ico
index 71f837c9e..71f837c9e 100644
--- a/docs/narr/MyProject/myproject/templates/static/favicon.ico
+++ b/docs/narr/MyProject/myproject/static/favicon.ico
Binary files differ
diff --git a/docs/narr/MyProject/myproject/templates/static/logo.png b/docs/narr/MyProject/myproject/static/logo.png
index 88f5d9865..88f5d9865 100644
--- a/docs/narr/MyProject/myproject/templates/static/logo.png
+++ b/docs/narr/MyProject/myproject/static/logo.png
Binary files differ
diff --git a/docs/narr/MyProject/myproject/templates/static/pylons.css b/docs/narr/MyProject/myproject/static/pylons.css
index a9c5c55c2..a9c5c55c2 100644
--- a/docs/narr/MyProject/myproject/templates/static/pylons.css
+++ b/docs/narr/MyProject/myproject/static/pylons.css
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index 25e607174..15b9bfde5 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -437,18 +437,18 @@ share a similar structure.
The ``MyProject`` project we've generated has the following directory
structure::
- MyProject
+ MyProject/
|-- CHANGES.txt
|-- development.ini
|-- myproject
| |-- __init__.py
| |-- models.py
+ | |-- static
+ | | |-- favicon.ico
+ | | |-- logo.png
+ | | `-- pylons.css
| |-- templates
- | | |-- mytemplate.pt
- | | `-- static
- | | |-- favicon.ico
- | | |-- logo.png
- | | `-- pylons.css
+ | | `-- mytemplate.pt
| |-- tests.py
| `-- views.py
|-- README.txt
@@ -668,15 +668,14 @@ tarball to other people who want to use your application.
.. warning::
- By default, ``setup.py sdist`` does not place non-Python-source
- files in generated tarballs. This means, in this case, that the
- ``templates/mytemplate.pt`` file and the files in the
- ``templates/static`` directory are not packaged in the tarball. To
- allow this to happen, check all the files that you'd like to be
- distributed along with your application's Python files into a
- version control system such as Subversion. After you do this, when
- you rerun ``setup.py sdist``, all files checked into the version
- control system will be included in the tarball.
+ By default, ``setup.py sdist`` does not place non-Python-source files in
+ generated tarballs. This means, in this case, that the
+ ``templates/mytemplate.pt`` file and the files in the ``static`` directory
+ are not packaged in the tarball. To allow this to happen, check all the
+ files that you'd like to be distributed along with your application's
+ Python files into a version control system such as Subversion. After you
+ do this, when you rerun ``setup.py sdist``, all files checked into the
+ version control system will be included in the tarball.
``setup.cfg``
~~~~~~~~~~~~~
@@ -764,8 +763,8 @@ also informs Python that the directory which contains it is a *package*.
it actually points to is a :term:`Chameleon` ZPT template file.
Line 15 registers a static view, which will serve up the files from the
- ``mypackage:templates/static`` :term:`resource specification` (the
- ``templates/static`` directory of the ``mypackage`` package).
+ ``mypackage:static`` :term:`resource specification` (the ``static``
+ directory of the ``mypackage`` package).
Line 17 returns a :term:`WSGI` application to the caller of the function
(Paste).
@@ -844,6 +843,15 @@ make any assumption about which sort of datastore you'll want to use,
so the sample application uses an instance of
:class:`myproject.models.MyModel` to represent the root.
+``static``
+~~~~~~~~~~~~~~~~~~~~
+
+This directory contains static resources which support the
+``mytemplate.pt`` template. It includes CSS and images.
+
+.. index::
+ single: tests.py
+
``templates/mytemplate.pt``
~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -857,15 +865,6 @@ Templates are accessed and used by view configurations and sometimes
by view functions themselves. See :ref:`templates_used_directly` and
:ref:`templates_used_as_renderers`.
-``templates/static``
-~~~~~~~~~~~~~~~~~~~~
-
-This directory contains static resources which support the
-``mytemplate.pt`` template. It includes CSS and images.
-
-.. index::
- single: tests.py
-
``tests.py``
~~~~~~~~~~~~
diff --git a/docs/tutorials/wiki/basiclayout.rst b/docs/tutorials/wiki/basiclayout.rst
index a03529e21..d129ff7ec 100644
--- a/docs/tutorials/wiki/basiclayout.rst
+++ b/docs/tutorials/wiki/basiclayout.rst
@@ -95,7 +95,7 @@ following:
static resources for us, in this case, at
``http://localhost:6543/static/`` and below. The ``path`` element
of this tag is a relative directory name, so it finds the resources
- it should serve within the ``templates/static`` directory inside
+ it should serve within the ``static`` directory inside
the ``tutorial`` package.
Content Models with ``models.py``
diff --git a/docs/tutorials/wiki/definingviews.rst b/docs/tutorials/wiki/definingviews.rst
index 05ce2fbcd..44543cb33 100644
--- a/docs/tutorials/wiki/definingviews.rst
+++ b/docs/tutorials/wiki/definingviews.rst
@@ -234,12 +234,11 @@ the below:
Static Resources
----------------
-Our templates name a single static resource named ``style.css``. We
-need to create this and place it in a file named ``style.css`` within
-our package's ``templates/static`` directory. This file is a little
-too long to replicate within the body of this guide, however it is
-available `online
-<http://github.com/Pylons/pyramid/blob/master/docs/tutorials/wiki/src/views/tutorial/templates/static/default.css>`_.
+Our templates name a single static resource named ``style.css``. We need to
+create this and place it in a file named ``style.css`` within our package's
+``static`` directory. This file is a little too long to replicate within the
+body of this guide, however it is available `online
+<http://github.com/Pylons/pyramid/blob/master/docs/tutorials/wiki/src/views/tutorial/static/default.css>`_.
This CSS file will be accessed via
e.g. ``http://localhost:6543/static/style.css`` by virtue of the
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/configure.zcml b/docs/tutorials/wiki/src/authorization/tutorial/configure.zcml
index e8603d7c4..d0e65516e 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/configure.zcml
+++ b/docs/tutorials/wiki/src/authorization/tutorial/configure.zcml
@@ -19,7 +19,7 @@
<static
name="static"
- path="templates/static"
+ path="static"
/>
</configure>
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/static/favicon.ico b/docs/tutorials/wiki/src/authorization/tutorial/static/favicon.ico
index 71f837c9e..71f837c9e 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/static/favicon.ico
+++ b/docs/tutorials/wiki/src/authorization/tutorial/static/favicon.ico
Binary files differ
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/static/logo.png b/docs/tutorials/wiki/src/authorization/tutorial/static/logo.png
index 88f5d9865..88f5d9865 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/static/logo.png
+++ b/docs/tutorials/wiki/src/authorization/tutorial/static/logo.png
Binary files differ
diff --git a/docs/tutorials/wiki/src/authorization/tutorial/templates/static/pylons.css b/docs/tutorials/wiki/src/authorization/tutorial/static/pylons.css
index a9c5c55c2..a9c5c55c2 100644
--- a/docs/tutorials/wiki/src/authorization/tutorial/templates/static/pylons.css
+++ b/docs/tutorials/wiki/src/authorization/tutorial/static/pylons.css
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/configure.zcml b/docs/tutorials/wiki/src/basiclayout/tutorial/configure.zcml
index 4e83227bb..ab7fd6fbe 100644
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/configure.zcml
+++ b/docs/tutorials/wiki/src/basiclayout/tutorial/configure.zcml
@@ -11,7 +11,7 @@
<static
name="static"
- path="templates/static"
+ path="static"
/>
</configure>
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/static/favicon.ico b/docs/tutorials/wiki/src/basiclayout/tutorial/static/favicon.ico
index 71f837c9e..71f837c9e 100644
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/static/favicon.ico
+++ b/docs/tutorials/wiki/src/basiclayout/tutorial/static/favicon.ico
Binary files differ
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/static/logo.png b/docs/tutorials/wiki/src/basiclayout/tutorial/static/logo.png
index 88f5d9865..88f5d9865 100644
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/static/logo.png
+++ b/docs/tutorials/wiki/src/basiclayout/tutorial/static/logo.png
Binary files differ
diff --git a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/static/pylons.css b/docs/tutorials/wiki/src/basiclayout/tutorial/static/pylons.css
index a9c5c55c2..a9c5c55c2 100644
--- a/docs/tutorials/wiki/src/basiclayout/tutorial/templates/static/pylons.css
+++ b/docs/tutorials/wiki/src/basiclayout/tutorial/static/pylons.css
diff --git a/docs/tutorials/wiki/src/models/tutorial/configure.zcml b/docs/tutorials/wiki/src/models/tutorial/configure.zcml
index 6db3bd158..38675eb13 100644
--- a/docs/tutorials/wiki/src/models/tutorial/configure.zcml
+++ b/docs/tutorials/wiki/src/models/tutorial/configure.zcml
@@ -11,7 +11,7 @@
<static
name="static"
- path="templates/static"
+ path="static"
/>
</configure>
diff --git a/docs/tutorials/wiki/src/models/tutorial/templates/static/favicon.ico b/docs/tutorials/wiki/src/models/tutorial/static/favicon.ico
index 71f837c9e..71f837c9e 100644
--- a/docs/tutorials/wiki/src/models/tutorial/templates/static/favicon.ico
+++ b/docs/tutorials/wiki/src/models/tutorial/static/favicon.ico
Binary files differ
diff --git a/docs/tutorials/wiki/src/models/tutorial/templates/static/logo.png b/docs/tutorials/wiki/src/models/tutorial/static/logo.png
index 88f5d9865..88f5d9865 100644
--- a/docs/tutorials/wiki/src/models/tutorial/templates/static/logo.png
+++ b/docs/tutorials/wiki/src/models/tutorial/static/logo.png
Binary files differ
diff --git a/docs/tutorials/wiki/src/models/tutorial/templates/static/pylons.css b/docs/tutorials/wiki/src/models/tutorial/static/pylons.css
index a9c5c55c2..a9c5c55c2 100644
--- a/docs/tutorials/wiki/src/models/tutorial/templates/static/pylons.css
+++ b/docs/tutorials/wiki/src/models/tutorial/static/pylons.css
diff --git a/docs/tutorials/wiki/src/viewdecorators/tutorial/configure.zcml b/docs/tutorials/wiki/src/viewdecorators/tutorial/configure.zcml
index 220160f73..be5b84c43 100644
--- a/docs/tutorials/wiki/src/viewdecorators/tutorial/configure.zcml
+++ b/docs/tutorials/wiki/src/viewdecorators/tutorial/configure.zcml
@@ -7,7 +7,7 @@
<static
name="static"
- path="templates/static"
+ path="static"
/>
</configure>
diff --git a/docs/tutorials/wiki/src/viewdecorators/tutorial/templates/static/favicon.ico b/docs/tutorials/wiki/src/viewdecorators/tutorial/static/favicon.ico
index 71f837c9e..71f837c9e 100644
--- a/docs/tutorials/wiki/src/viewdecorators/tutorial/templates/static/favicon.ico
+++ b/docs/tutorials/wiki/src/viewdecorators/tutorial/static/favicon.ico
Binary files differ
diff --git a/docs/tutorials/wiki/src/viewdecorators/tutorial/templates/static/logo.png b/docs/tutorials/wiki/src/viewdecorators/tutorial/static/logo.png
index 88f5d9865..88f5d9865 100644
--- a/docs/tutorials/wiki/src/viewdecorators/tutorial/templates/static/logo.png
+++ b/docs/tutorials/wiki/src/viewdecorators/tutorial/static/logo.png
Binary files differ
diff --git a/docs/tutorials/wiki/src/viewdecorators/tutorial/templates/static/pylons.css b/docs/tutorials/wiki/src/viewdecorators/tutorial/static/pylons.css
index a9c5c55c2..a9c5c55c2 100644
--- a/docs/tutorials/wiki/src/viewdecorators/tutorial/templates/static/pylons.css
+++ b/docs/tutorials/wiki/src/viewdecorators/tutorial/static/pylons.css
diff --git a/docs/tutorials/wiki/src/views/tutorial/configure.zcml b/docs/tutorials/wiki/src/views/tutorial/configure.zcml
index 27bbd8cb1..c1b1d6ce8 100644
--- a/docs/tutorials/wiki/src/views/tutorial/configure.zcml
+++ b/docs/tutorials/wiki/src/views/tutorial/configure.zcml
@@ -5,7 +5,7 @@
<static
name="static"
- path="templates/static"
+ path="static"
/>
<view
diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/static/favicon.ico b/docs/tutorials/wiki/src/views/tutorial/static/favicon.ico
index 71f837c9e..71f837c9e 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/static/favicon.ico
+++ b/docs/tutorials/wiki/src/views/tutorial/static/favicon.ico
Binary files differ
diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/static/logo.png b/docs/tutorials/wiki/src/views/tutorial/static/logo.png
index 88f5d9865..88f5d9865 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/static/logo.png
+++ b/docs/tutorials/wiki/src/views/tutorial/static/logo.png
Binary files differ
diff --git a/docs/tutorials/wiki/src/views/tutorial/templates/static/pylons.css b/docs/tutorials/wiki/src/views/tutorial/static/pylons.css
index a9c5c55c2..a9c5c55c2 100644
--- a/docs/tutorials/wiki/src/views/tutorial/templates/static/pylons.css
+++ b/docs/tutorials/wiki/src/views/tutorial/static/pylons.css
diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst
index bd5a04ef5..7448563c7 100644
--- a/docs/tutorials/wiki2/basiclayout.rst
+++ b/docs/tutorials/wiki2/basiclayout.rst
@@ -57,10 +57,10 @@ entry point happens to be the ``app`` function within the file named
#. *Line 19*. We call
:meth:`pyramid.configuration.Configurator.add_static_view` with the
- arguments ``static`` (the name), and ``tutorial:templates/static``. This
+ arguments ``static`` (the name), and ``tutorial:static`` (the path). This
registers a static resource view which will match any URL that starts with
``/static/``. This will serve up static resources for us from within the
- ``templates/static`` directory of our ``tutorial`` package, in this case,
+ ``static`` directory of our ``tutorial`` package, in this case,
via ``http://localhost:6543/static/`` and below. With this declaration,
we're saying that any URL that starts with ``/static`` should go to the
static view; any remainder of its path (e.g. the ``/foo`` in
diff --git a/docs/tutorials/wiki2/definingviews.rst b/docs/tutorials/wiki2/definingviews.rst
index a10e8b9ca..ea4ca3bab 100644
--- a/docs/tutorials/wiki2/definingviews.rst
+++ b/docs/tutorials/wiki2/definingviews.rst
@@ -248,12 +248,11 @@ the below:
Static Resources
----------------
-Our templates name a single static resource named ``style.css``. We
-need to create this and place it in a file named ``style.css`` within
-our package's ``templates/static`` directory. This file is a little
-too long to replicate within the body of this guide, however it is
-available `online
-<http://github.com/Pylons/pyramid/blob/master/docs/tutorials/wiki2/src/views/tutorial/templates/static/style.css>`_.
+Our templates name a single static resource named ``style.css``. We need to
+create this and place it in a file named ``style.css`` within our package's
+``static`` directory. This file is a little too long to replicate within the
+body of this guide, however it is available `online
+<http://github.com/Pylons/pyramid/blob/master/docs/tutorials/wiki2/src/views/tutorial/static/style.css>`_.
This CSS file will be accessed via
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py b/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py
index a47b6dc32..fba1d706b 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py
@@ -26,7 +26,7 @@ def app(global_config, **settings):
authentication_policy=authn_policy,
authorization_policy=authz_policy)
config.begin()
- config.add_static_view('static', 'templates/static')
+ config.add_static_view('static', 'tutorial:static')
config.add_route('view_wiki', '/', view='tutorial.views.view_wiki')
config.add_route('login', '/login',
view='tutorial.login.login',
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/templates/static/favicon.ico b/docs/tutorials/wiki2/src/authorization/tutorial/static/favicon.ico
index 71f837c9e..71f837c9e 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/templates/static/favicon.ico
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/static/favicon.ico
Binary files differ
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/templates/static/logo.png b/docs/tutorials/wiki2/src/authorization/tutorial/static/logo.png
index 88f5d9865..88f5d9865 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/templates/static/logo.png
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/static/logo.png
Binary files differ
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/templates/static/pylons.css b/docs/tutorials/wiki2/src/authorization/tutorial/static/pylons.css
index a9c5c55c2..a9c5c55c2 100644
--- a/docs/tutorials/wiki2/src/authorization/tutorial/templates/static/pylons.css
+++ b/docs/tutorials/wiki2/src/authorization/tutorial/static/pylons.css
diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py b/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py
index e1ef485f7..7a947f1e1 100644
--- a/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py
+++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py
@@ -16,7 +16,7 @@ def app(global_config, **settings):
initialize_sql(db_string, asbool(db_echo))
config = Configurator(settings=settings)
config.begin()
- config.add_static_view('static', 'templates/static')
+ config.add_static_view('static', 'tutorial:static')
config.add_route('home', '/', view='tutorial.views.my_view',
view_renderer='templates/mytemplate.pt')
config.end()
diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/static/favicon.ico b/docs/tutorials/wiki2/src/basiclayout/tutorial/static/favicon.ico
index 71f837c9e..71f837c9e 100644
--- a/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/static/favicon.ico
+++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/static/favicon.ico
Binary files differ
diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/static/logo.png b/docs/tutorials/wiki2/src/basiclayout/tutorial/static/logo.png
index 88f5d9865..88f5d9865 100644
--- a/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/static/logo.png
+++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/static/logo.png
Binary files differ
diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/static/pylons.css b/docs/tutorials/wiki2/src/basiclayout/tutorial/static/pylons.css
index a9c5c55c2..a9c5c55c2 100644
--- a/docs/tutorials/wiki2/src/basiclayout/tutorial/templates/static/pylons.css
+++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/static/pylons.css
diff --git a/docs/tutorials/wiki2/src/models/tutorial/__init__.py b/docs/tutorials/wiki2/src/models/tutorial/__init__.py
index e1ef485f7..7a947f1e1 100644
--- a/docs/tutorials/wiki2/src/models/tutorial/__init__.py
+++ b/docs/tutorials/wiki2/src/models/tutorial/__init__.py
@@ -16,7 +16,7 @@ def app(global_config, **settings):
initialize_sql(db_string, asbool(db_echo))
config = Configurator(settings=settings)
config.begin()
- config.add_static_view('static', 'templates/static')
+ config.add_static_view('static', 'tutorial:static')
config.add_route('home', '/', view='tutorial.views.my_view',
view_renderer='templates/mytemplate.pt')
config.end()
diff --git a/docs/tutorials/wiki2/src/models/tutorial/templates/static/favicon.ico b/docs/tutorials/wiki2/src/models/tutorial/static/favicon.ico
index 71f837c9e..71f837c9e 100644
--- a/docs/tutorials/wiki2/src/models/tutorial/templates/static/favicon.ico
+++ b/docs/tutorials/wiki2/src/models/tutorial/static/favicon.ico
Binary files differ
diff --git a/docs/tutorials/wiki2/src/models/tutorial/templates/static/logo.png b/docs/tutorials/wiki2/src/models/tutorial/static/logo.png
index 88f5d9865..88f5d9865 100644
--- a/docs/tutorials/wiki2/src/models/tutorial/templates/static/logo.png
+++ b/docs/tutorials/wiki2/src/models/tutorial/static/logo.png
Binary files differ
diff --git a/docs/tutorials/wiki2/src/models/tutorial/templates/static/pylons.css b/docs/tutorials/wiki2/src/models/tutorial/static/pylons.css
index a9c5c55c2..a9c5c55c2 100644
--- a/docs/tutorials/wiki2/src/models/tutorial/templates/static/pylons.css
+++ b/docs/tutorials/wiki2/src/models/tutorial/static/pylons.css
diff --git a/docs/tutorials/wiki2/src/views/tutorial/__init__.py b/docs/tutorials/wiki2/src/views/tutorial/__init__.py
index 2d00cccc2..39ec17735 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/__init__.py
+++ b/docs/tutorials/wiki2/src/views/tutorial/__init__.py
@@ -16,7 +16,7 @@ def app(global_config, **settings):
initialize_sql(db_string, asbool(db_echo))
config = Configurator(settings=settings)
config.begin()
- config.add_static_view('static', 'templates/static')
+ config.add_static_view('static', 'tutorial:static')
config.add_route('home', '/', view='tutorial.views.view_wiki')
config.add_route('view_page', '/:pagename',
view='tutorial.views.view_page',
diff --git a/docs/tutorials/wiki2/src/views/tutorial/templates/static/favicon.ico b/docs/tutorials/wiki2/src/views/tutorial/static/favicon.ico
index 71f837c9e..71f837c9e 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/templates/static/favicon.ico
+++ b/docs/tutorials/wiki2/src/views/tutorial/static/favicon.ico
Binary files differ
diff --git a/docs/tutorials/wiki2/src/views/tutorial/templates/static/logo.png b/docs/tutorials/wiki2/src/views/tutorial/static/logo.png
index 88f5d9865..88f5d9865 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/templates/static/logo.png
+++ b/docs/tutorials/wiki2/src/views/tutorial/static/logo.png
Binary files differ
diff --git a/docs/tutorials/wiki2/src/views/tutorial/templates/static/pylons.css b/docs/tutorials/wiki2/src/views/tutorial/static/pylons.css
index a9c5c55c2..a9c5c55c2 100644
--- a/docs/tutorials/wiki2/src/views/tutorial/templates/static/pylons.css
+++ b/docs/tutorials/wiki2/src/views/tutorial/static/pylons.css