reorganized content

aadabi · Nov 24, 2011 · 3ac41c0 · 3ac41c0
1 parent 2b48e7b
commit 3ac41c0
Show file tree

Hide file tree

Showing 22 changed files with 40 additions and 17 deletions.
diff --git a/index.rst b/index.rst
@@ -1,19 +1,18 @@
 Pyramid Tutorials
 =================
 
-This site contains tutorial-like content for the Pyramid web framework.
+This is the home of tutorial and patterns content for the Pyramid web framework.
 
-Contents:
+Contents
+---------
 
 .. toctree::
-   :maxdepth: 2
-
-   wiki2_auth/index
-   zeo/index
-   catalog/index
-   cmf/index
-   glossary
+   :maxdepth: 1
 
+   quick_tutorial/quick_tutorial
+   wiki_tutorials
+   patterns/index
+
 Indices and tables
 ==================
 

diff --git a/catalog/index.rst → patterns/catalog/index.rst b/catalog/index.rst → patterns/catalog/index.rst
diff --git a/cmf/actions.rst → patterns/cmf/actions.rst b/cmf/actions.rst → patterns/cmf/actions.rst
diff --git a/cmf/catalog.rst → patterns/cmf/catalog.rst b/cmf/catalog.rst → patterns/cmf/catalog.rst
diff --git a/cmf/content.rst → patterns/cmf/content.rst b/cmf/content.rst → patterns/cmf/content.rst
diff --git a/cmf/index.rst → patterns/cmf/index.rst b/cmf/index.rst → patterns/cmf/index.rst
diff --git a/cmf/missing.rst → patterns/cmf/missing.rst b/cmf/missing.rst → patterns/cmf/missing.rst
diff --git a/cmf/skins.rst → patterns/cmf/skins.rst b/cmf/skins.rst → patterns/cmf/skins.rst
diff --git a/cmf/workflow.rst → patterns/cmf/workflow.rst b/cmf/workflow.rst → patterns/cmf/workflow.rst
diff --git a/patterns/index.rst b/patterns/index.rst
@@ -0,0 +1,15 @@
+Pyramid Tutorial-Like Patterns
+==============================
+
+This section contains tutorial-like patterns for the Pyramid web framework.
+
+Contents:
+
+.. toctree::
+   :maxdepth: 2
+
+   wiki2_auth/index
+   zeo/index
+   catalog/index
+   cmf/index
+   glossary
diff --git a/wiki2_auth/index.rst → patterns/wiki2_auth/index.rst b/wiki2_auth/index.rst → patterns/wiki2_auth/index.rst
diff --git a/zeo/index.rst → patterns/zeo/index.rst b/zeo/index.rst → patterns/zeo/index.rst
diff --git a/pyramid_quick_tutorial.png → quick_tutorial/quick_tutorial.png b/pyramid_quick_tutorial.png → quick_tutorial/quick_tutorial.png
diff --git a/pyramid_quick_tutorial.rst → quick_tutorial/quick_tutorial.rst b/pyramid_quick_tutorial.rst → quick_tutorial/quick_tutorial.rst
@@ -20,15 +20,15 @@ At the end of the tutorial, you'll have a minimal application which:
 
 Here's a screenshot of the final application:
 
-.. image:: pyramid_quick_tutorial.png
+.. image:: quick_tutorial.png
 
 Step 1 - Organizing The Project
 -------------------------------
 
 .. note::
 
     For help getting Pyramid set up, try the `install guide
-    <pyramid_install.html>`_.
+    <http://docs.pylonsproject.org/en/latest/docs/pyramid_install.html>`_.
 
 Before getting started, we will create the directory hierarchy needed for
 our application layout. Create the following directory layout on your
@@ -327,7 +327,7 @@ messages sent by the application and another block to display the content of
 the page inheriting this master layout by using the mako directive
 ``${next.body()}``.
 
-.. literalinclude:: pyramid_quick_tutorial/templates/layout.mako
+.. literalinclude:: src/templates/layout.mako
    :language: html+mako
 
 list.mako
@@ -340,7 +340,7 @@ tasks. The loop uses the passed ``tasks`` dictionary sent from the
 ``request.route_url`` function to generate a url based on a route name and
 its arguments instead of statically defining the url path.
 
-.. literalinclude:: pyramid_quick_tutorial/templates/list.mako
+.. literalinclude:: src/templates/list.mako
    :language: html+mako
 
 new.mako
@@ -350,7 +350,7 @@ This template is used by the ``new_view`` view function.  The template
 extends the master ``layout.mako`` template by providing a basic form to add
 new tasks.
 
-.. literalinclude:: pyramid_quick_tutorial/templates/new.mako
+.. literalinclude:: src/templates/new.mako
    :language: html+mako
 
 notfound.mako
@@ -359,7 +359,7 @@ notfound.mako
 This template extends the master ``layout.mako`` template.  We use it as the
 template for our custom ``NotFound`` view.
 
-.. literalinclude:: pyramid_quick_tutorial/templates/notfound.mako
+.. literalinclude:: src/templates/notfound.mako
    :language: html+mako
 
 Configuring Template Locations
@@ -382,7 +382,7 @@ It's now time to add some styling to the application templates by adding a
 **CSS** file named ``style.css`` to the ``static`` directory with the
 following content:
 
-.. literalinclude:: pyramid_quick_tutorial/static/style.css
+.. literalinclude:: src/static/style.css
    :language: css
 
 To cause this static file to be served by the application, we must add a
@@ -401,7 +401,7 @@ We have now completed all steps needed to run the application in its final
 version. Before running it, here's the complete main code for ``tasks.py`` for
 review:
 
-.. literalinclude:: pyramid_quick_tutorial/tasks.py
+.. literalinclude:: src/tasks.py
    :language: python
 
 And now let's run ``tasks.py``:

diff --git a/pyramid_quick_tutorial/schema.sql → quick_tutorial/src/schema.sql b/pyramid_quick_tutorial/schema.sql → quick_tutorial/src/schema.sql
diff --git a/pyramid_quick_tutorial/static/style.css → quick_tutorial/src/static/style.css b/pyramid_quick_tutorial/static/style.css → quick_tutorial/src/static/style.css
diff --git a/pyramid_quick_tutorial/tasks.py → quick_tutorial/src/tasks.py b/pyramid_quick_tutorial/tasks.py → quick_tutorial/src/tasks.py
diff --git a/pyramid_quick_tutorial/templates/layout.mako → quick_tutorial/src/templates/layout.mako b/pyramid_quick_tutorial/templates/layout.mako → quick_tutorial/src/templates/layout.mako
diff --git a/pyramid_quick_tutorial/templates/list.mako → quick_tutorial/src/templates/list.mako b/pyramid_quick_tutorial/templates/list.mako → quick_tutorial/src/templates/list.mako
diff --git a/pyramid_quick_tutorial/templates/new.mako → quick_tutorial/src/templates/new.mako b/pyramid_quick_tutorial/templates/new.mako → quick_tutorial/src/templates/new.mako
diff --git a/...id_quick_tutorial/templates/notfound.mako → quick_tutorial/src/templates/notfound.mako b/...id_quick_tutorial/templates/notfound.mako → quick_tutorial/src/templates/notfound.mako
diff --git a/wiki_tutorials.rst b/wiki_tutorials.rst
@@ -0,0 +1,9 @@
+Wiki Tutorials
+==============
+
+Detailed tutorials explaining how to use Pyramid to build various types of 
+applications and how to deploy Pyramid applications to various platforms.
+
+* `SQLAlchemy + URL Dispatch Wiki Tutorial <http://docs.pylonsproject.org/projects/pyramid/en/1.2-branch/tutorials/wiki2/index.html>`_
+
+* `ZODB + Traversal Wiki Tutorial <http://docs.pylonsproject.org/projects/pyramid/en/1.2-branch/tutorials/wiki/index.html>`_