summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2
diff options
context:
space:
mode:
authorPatricio Paez <pp@pp.com.mx>2012-03-14 12:26:00 -0700
committerPatricio Paez <pp@pp.com.mx>2012-03-14 12:26:00 -0700
commit95e70fb95b0783d380885d6c35d3925043f82531 (patch)
tree851a94b76936f630bc369d1122dbcfa0e4d61131 /docs/tutorials/wiki2
parentc946fc7b717359cf26dab45a9b84f06f6c1bc466 (diff)
downloadpyramid-95e70fb95b0783d380885d6c35d3925043f82531.tar.gz
pyramid-95e70fb95b0783d380885d6c35d3925043f82531.tar.bz2
pyramid-95e70fb95b0783d380885d6c35d3925043f82531.zip
Simplify the summary table
- Removed the Context column - Swapped Action and View columns
Diffstat (limited to 'docs/tutorials/wiki2')
-rw-r--r--docs/tutorials/wiki2/design.rst110
1 files changed, 55 insertions, 55 deletions
diff --git a/docs/tutorials/wiki2/design.rst b/docs/tutorials/wiki2/design.rst
index ade40ab18..36c4f19bc 100644
--- a/docs/tutorials/wiki2/design.rst
+++ b/docs/tutorials/wiki2/design.rst
@@ -65,63 +65,63 @@ Security
Summary
-------
-The URL, context, actions, template and permission associated to each view are
+The URL, actions, template and permission associated to each view are
listed in the following table:
-+----------------------+-------------+-----------------+-----------------------+------------+------------+
-| URL | View | Context | Action | Template | Permission |
-| | | | | | |
-+======================+=============+=================+=======================+============+============+
-| / | view_wiki | Wiki | Redirect to | | |
-| | | | /FrontPage | | |
-+----------------------+-------------+-----------------+-----------------------+------------+------------+
-| /PageName | view_page | Page | Display existing | view.pt | view |
-| | [1]_ | | page [2]_ | | |
-| | | | | | |
-| | | | | | |
-| | | | | | |
-+----------------------+-------------+-----------------+-----------------------+------------+------------+
-| /edit_page/PageName | edit_page | Page | Display edit form | edit.pt | edit |
-| | | | with existing | | |
-| | | | content. | | |
-| | | | | | |
-| | | | If the form was | | |
-| | | | submitted, redirect | | |
-| | | | to /PageName | | |
-+----------------------+-------------+-----------------+-----------------------+------------+------------+
-| /add_page/PageName | add_page | Wiki | Create the page | edit.pt | edit |
-| | | | *PageName* in | | |
-| | | | storage, display | | |
-| | | | the edit form | | |
-| | | | without content. | | |
-| | | | | | |
-| | | | If the form was | | |
-| | | | submitted, | | |
-| | | | redirect to | | |
-| | | | /PageName | | |
-+----------------------+-------------+-----------------+-----------------------+------------+------------+
-| /login | login | Wiki, | Display login form. | login.pt | |
-| | | Forbidden [3]_ | | | |
-| | | | If the form was | | |
-| | | | submitted, | | |
-| | | | authenticate. | | |
-| | | | | | |
-| | | | - If authentication | | |
-| | | | successful, | | |
-| | | | redirect to the | | |
-| | | | page that we | | |
-| | | | came from. | | |
-| | | | | | |
-| | | | - If authentication | | |
-| | | | fails, display | | |
-| | | | login form with | | |
-| | | | "login failed" | | |
-| | | | message. | | |
-| | | | | | |
-+----------------------+-------------+-----------------+-----------------------+------------+------------+
-| /logout | logout | Wiki | Redirect to | | |
-| | | | /FrontPage | | |
-+----------------------+-------------+-----------------+-----------------------+------------+------------+
++----------------------+-----------------------+-------------+------------+------------+
+| URL | Action | View | Template | Permission |
+| | | | | |
++======================+=======================+=============+============+============+
+| / | Redirect to | view_wiki | | |
+| | /FrontPage | | | |
++----------------------+-----------------------+-------------+------------+------------+
+| /PageName | Display existing | view_page | view.pt | view |
+| | page [2]_ | [1]_ | | |
+| | | | | |
+| | | | | |
+| | | | | |
++----------------------+-----------------------+-------------+------------+------------+
+| /edit_page/PageName | Display edit form | edit_page | edit.pt | edit |
+| | with existing | | | |
+| | content. | | | |
+| | | | | |
+| | If the form was | | | |
+| | submitted, redirect | | | |
+| | to /PageName | | | |
++----------------------+-----------------------+-------------+------------+------------+
+| /add_page/PageName | Create the page | add_page | edit.pt | edit |
+| | *PageName* in | | | |
+| | storage, display | | | |
+| | the edit form | | | |
+| | without content. | | | |
+| | | | | |
+| | If the form was | | | |
+| | submitted, | | | |
+| | redirect to | | | |
+| | /PageName | | | |
++----------------------+-----------------------+-------------+------------+------------+
+| /login | Display login form. | login | login.pt | |
+| | | | | |
+| | If the form was | | | |
+| | submitted, | | | |
+| | authenticate. | | | |
+| | | | | |
+| | - If authentication | | | |
+| | successful, | | | |
+| | redirect to the | | | |
+| | page that we | | | |
+| | came from. | | | |
+| | | | | |
+| | - If authentication | | | |
+| | fails, display | | | |
+| | login form with | | | |
+| | "login failed" | | | |
+| | message. | | | |
+| | | | | |
++----------------------+-----------------------+-------------+------------+------------+
+| /logout | Redirect to | logout | | |
+| | /FrontPage | | | |
++----------------------+-----------------------+-------------+------------+------------+
.. [1] This is the default view for a Page context
when there is no view name.