diff options
| author | Chris McDonough <chrism@thinko.(none)> | 2012-04-18 14:45:16 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@thinko.(none)> | 2012-04-18 14:45:16 -0400 |
| commit | 7ea5740e7e1de812fd95ec3156a5b3137c26a4eb (patch) | |
| tree | e1b4c4677183e4d1e66f9566cf0e877769af3b9a /docs/tutorials/wiki2/design.rst | |
| parent | c8aab32b60706f700b7f6a70d967727c353e3d54 (diff) | |
| parent | c9ec6bd5130642095d77e66e672734296c6a513e (diff) | |
| download | pyramid-7ea5740e7e1de812fd95ec3156a5b3137c26a4eb.tar.gz pyramid-7ea5740e7e1de812fd95ec3156a5b3137c26a4eb.tar.bz2 pyramid-7ea5740e7e1de812fd95ec3156a5b3137c26a4eb.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/tutorials/wiki2/design.rst')
| -rw-r--r-- | docs/tutorials/wiki2/design.rst | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/docs/tutorials/wiki2/design.rst b/docs/tutorials/wiki2/design.rst index 4481153a3..2e6fc0e77 100644 --- a/docs/tutorials/wiki2/design.rst +++ b/docs/tutorials/wiki2/design.rst @@ -36,9 +36,16 @@ page. Views ----- -There will be four views to handle the normal operations of adding and -editing wiki pages, and viewing pages and the wiki front page. Two -additional views will handle the login and logout tasks related to security. +There will be three views to handle the normal operations of adding, +editing and viewing wiki pages, plus one view for the wiki front page. +Two templates will be used, one for viewing, and one for both for adding +and editing wiki pages. + +The default templating systems in :app:`Pyramid` are +:term:`Chameleon` and :term:`Mako`. Chameleon is a variant of +:term:`ZPT`, which is an XML-based templating language. Mako is a +non-XML-based templating language. Because we had to pick one, +we chose Chameleon for this tutorial. Security -------- @@ -67,6 +74,8 @@ use to do this are below. - Permission declarations are added to the views to assert the security policies as each request is handled. +Two additional views and one template will handle the login and +logout tasks. Summary ------- |