Merging end-of-term changes from the UW PCE version of the course

cewing · cewing · commit ec5f3ecfe22f · 2014-12-30T18:12:00.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -31,4 +31,10 @@ svn-commit.tmp
 bin
 build
 include
-lib
+lib
+cast-offs
+develop-eggs
+development
+*.db
+*.sublime-project
+*.sublime-workspace
diff --git a/resources/session09/base.pt b/resources/session09/base.pt
@@ -0,0 +1,62 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      xmlns:metal="http://xml.zope.org/namespaces/metal">
+<head>
+  <title>Pyramid Wiki</title>
+  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
+  <meta name="keywords" content="python web application" />
+  <meta name="description" content="pyramid web application" />
+  <link rel="shortcut icon"
+        href="/static/favicon.ico" />
+  <link rel="stylesheet"
+        href="/static/pylons.css"
+        type="text/css" media="screen" charset="utf-8" />
+  <!--[if lte IE 6]>
+  <link rel="stylesheet"
+        href="/static/ie6.css"
+        type="text/css" media="screen" charset="utf-8" />
+  <![endif]-->
+</head>
+<body>
+  <div id="wrap">
+    <div id="top-small">
+      <div class="top-small align-center">
+        <div>
+          <img width="220" height="50" alt="pyramid"
+        src="/static/pyramid-small.png" />
+        </div>
+      </div>
+    </div>
+    <div id="middle">
+      <div class="middle align-right">
+        <div id="left" class="app-welcome align-left">
+          <metal:pagename define-slot="page-name">
+          Viewing <b><span tal:replace="page.__name__">Page Name Goes
+          Here</span></b>
+          </metal:pagename>
+          <br />
+          You can return to the
+          <a href="${request.application_url}">FrontPage</a>.
+        </div>
+        <div id="right" class="app-welcome align-right">
+          <metal:login define-slot="login">
+          <span tal:condition="logged_in">
+            <a href="${request.application_url}/logout">Logout</a>
+          </span>
+          </metal:login>
+        </div>
+      </div>
+    </div>
+    <div id="bottom">
+      <div class="bottom">
+        <metal:bottom define-slot="main-content"/>
+      </div>
+    </div>
+  </div>
+  <div id="footer">
+    <div class="footer">Some page footer stuff</div>
+  </div>
+</body>
+</html>
diff --git a/resources/session10/base.pt b/resources/session10/base.pt
@@ -59,4 +59,4 @@
     <div class="footer">Some page footer stuff</div>
   </div>
 </body>
-</html>
+</html>
diff --git a/resources/session10/wikitutorial/wikitutorial/templates/edit.pt b/resources/session10/wikitutorial/wikitutorial/templates/edit.pt
@@ -12,4 +12,4 @@
       <input type="submit" name="form.submitted" value="Save"/>
     </form>
   </metal:content>
-</metal:main>
+</metal:main>
diff --git a/source/presentations/session07.rst b/source/presentations/session07.rst
@@ -783,7 +783,7 @@ Full Urlconf
 Testing Views
 -------------
 
-Before we begin writin real views, we need to add some tests for the views we
+Before we begin writing real views, we need to add some tests for the views we
 are about to create.
 
 .. class:: incremental
diff --git a/source/presentations/session09.rst b/source/presentations/session09.rst
@@ -924,7 +924,7 @@ Instances of these classes are able to know when they've been changed.
 
 .. class:: incremental
 
-When a ZODB transaction is committed, all changes objects are saved.
+When a ZODB transaction is committed, all changed objects are saved.
 
 
 Persistent Base Classes
@@ -1235,7 +1235,7 @@ We are ready to add views now. We'll need:
 * A view of the Wiki itself, which redirects to the front page.
 * A view of an existing Page
 * A view that allows us to *add* a new Page
-* A view that allows us to *edit* and existing Page
+* A view that allows us to *edit* an existing Page
 
 .. class:: incremental
 
@@ -1545,7 +1545,7 @@ Update ``view_page``:
 
     def view_page(context, request):
         #...
-        content = wikiwords.sub(check, content) #<- already there
+        content = WIKIWORDS.sub(check, content) #<- already there
         edit_url = request.resource_url(context, 'edit_page') #<- add
         return dict(page=context,
                     content=content,
@@ -1560,6 +1560,130 @@ Update ``view_page``:
     OK
 
 
+What's in the ZODB?
+-------------------
+
+We can inspect the database directly.
+
+.. class:: incremental
+
+Start an interactive session with:
+
+::
+
+    (pyramidenv)$ pshell development.ini
+    ...
+    >>> root
+    {'FrontPage': <wikitutorial.models.Page object at 0x1029795f0>}
+
+.. class:: incremental small
+
+::
+
+    >>> root['FrontPage'].data
+    'This is the front page'
+    
+.. class:: incremental small
+
+::
+
+    >>> root['FrontPage'].__dict__
+    {'__name__': 'FrontPage', 'data': 'This is the front page', '__parent__': {'FrontPage': <wikitutorial.models.Page object at 0x1029795f0>}}
+
+
+
+
+Adding Templates
+----------------
+
+What is the page template name for ``view_page``?
+
+.. class:: incremental
+
+Create ``view.pt`` in your ``templates`` directory.
+
+.. class:: incremental
+
+Also copy the file ``base.pt`` from the class resources.
+
+.. class:: incremental
+
+Pyramid can use a number of different templating engines.
+
+.. class:: incremental
+
+We'll be using Chameleon, which also supports extending other templates.
+
+
+The view.pt Template
+--------------------
+
+Type this code into your ``view.pt`` file:
+
+.. code-block:: xml
+
+    <metal:main use-macro="load: base.pt">
+     <metal:login metal:fill-slot="login"></metal:login>
+     <metal:content metal:fill-slot="main-content">
+      <div tal:replace="structure:content">
+        Page text goes here.
+      </div>
+      <p>
+        <a tal:attributes="href edit_url" href="">
+          Edit this page
+        </a>
+      </p>
+     </metal:content>
+    </metal:main>
+
+
+View Your Work
+--------------
+
+We've created the following:
+
+.. class:: incremental small
+
+* A wiki view that redirects to the automatically-created FrontPage page
+* A page view that will render the ``data`` from a page, along with a url for
+  editing that page
+* A page template to show a wiki page.
+
+.. class:: incremental
+
+That's all we need to be able to see our work.  Start Pyramid:
+
+.. class:: incremental small
+
+::
+
+    (pyramidenv)$ pserve development.ini
+    Starting server in PID 43925.
+    serving on http://0.0.0.0:6543
+
+.. class:: incremental
+
+Load http://localhost:6543/
+
+
+What You Should See
+-------------------
+
+.. image:: img/wiki_frontpage.png
+    :align: center
+    :width: 95%
+
+
+Page Editing
+------------
+
+You'll notice that the page has a link to ``Edit This Page``
+
+.. class:: incremental
+
+If you click it, you get a 404.  We haven't created that view yet.
+
+
 Next Steps
 ----------
 
diff --git a/source/presentations/session10.rst b/source/presentations/session10.rst
@@ -13,28 +13,6 @@ Session 10: A Pyramid Application
 | Totally not built by aliens.
 
 
-Adding Templates
-----------------
-
-What is the page template name for ``view_page``?
-
-.. class:: incremental
-
-Create ``view.pt`` in your ``templates`` directory.
-
-.. class:: incremental
-
-Also copy the file ``base.pt`` from the class resources.
-
-.. class:: incremental
-
-Pyramid can use a number of different templating engines.
-
-.. class:: incremental
-
-We'll be using Chameleon, which also supports extending other templates.
-
-
 Chameleon Templates
 -------------------
 
@@ -152,30 +130,13 @@ METAL provides operators related to creating and using template macros:
 Much of this will become clearer as we actually create our templates.
 
 
-The view.pt Template
---------------------
-
-Type this code into your ``view.pt`` file:
-
-.. code-block:: xml
-
-    <metal:main use-macro="load: base.pt">
-     <metal:content metal:fill-slot="main-content">
-      <div tal:replace="structure:content">
-        Page text goes here.
-      </div>
-      <p>
-        <a tal:attributes="href edit_url" href="">
-          Edit this page
-        </a>
-      </p>
-     </metal:content>
-    </metal:main>
-
-
 A Few Notes
 -----------
 
+Take a look at our ``view.pt`` template again.
+
+.. class:: incremental
+
 ``<metal>`` and ``<tal>`` tags are processed and removed by the engine.
 
 .. class:: incremental
@@ -212,43 +173,6 @@ The ``structure`` expression ensures that the HTML is not escaped.
     our anchor to the value passed into our template as ``edit_url``.
 
 
-View Your Work
---------------
-
-We've created the following:
-
-.. class:: incremental small
-
-* A wiki view that redirects to the automatically-created FrontPage page
-* A page view that will render the ``data`` from a page, along with a url for
-  editing that page
-* A page template to show a wiki page.
-
-.. class:: incremental
-
-That's all we need to be able to see our work.  Start Pyramid:
-
-.. class:: incremental small
-
-::
-
-    (pyramidenv)$ pserve development.ini
-    Starting server in PID 43925.
-    serving on http://0.0.0.0:6543
-
-.. class:: incremental
-
-Load http://localhost:6543/
-
-
-What You Should See
--------------------
-
-.. image:: img/wiki_frontpage.png
-    :align: center
-    :width: 95%
-
-
 Page Editing
 ------------
 

-Original file line number
+Diff line change
     <div class="footer">Some page footer stuff</div>
   </div>
 </body>
 -</html>
 +</html>