Updated the Zope Tutorial to use ZPT in place of DTML.

lib/python/Products/ZopeTutorial/CHANGES.txt

+Zope Tutorial 1.1
+
+  Features
+
+    * Updates lessions to use ZPT in place of DTML. This required
+      extensive reworking in some lessons.
+
+    * Update the examples .zexp file.
+
+    * Updated likes to the Zope book to refer to the current online
+      version.
+
+    * Updated the glossary.
+
+    * Added a ZPT reference link feature for the glossary.
+
 Zope Tutorial 1.0a6
 
   Bug Fixes

lib/python/Products/ZopeTutorial/TutorialTopic.py

@@ -18,8 +18,6 @@ import DocumentTemplate
 import StructuredText
 import  re
 
-from zExceptions import BadRequest
-
 
 pre_pat=re.compile(r'<PRE>(.+?)</PRE>', re.IGNORECASE|re.DOTALL)
 tutorialExamplesFile='ZopeTutorialExamples.zexp'
@@ -132,7 +130,7 @@ class GlossaryTopic(TutorialTopic):
         Returns the URL to a API documentation for a given class.
         """
         names=klass.split('.')
-        url="%s/Control_Panel/Products/%s/Help/%s.py#%s" % (REQUEST['BASEPATH1'],
+        url="%s/Control_Panel/Products/%s/Help/%s.py#%s" % (REQUEST['SCRIPT_NAME'],
                 names[0], names[1], names[2])
         return '<a href="%s">API Documentation</a>' % url
 
@@ -140,9 +138,17 @@ class GlossaryTopic(TutorialTopic):
         """
         Returns the URL to a DTML Reference page for a given tag.
         """
-        url="%s/Control_Panel/Products/OFSP/Help/dtml-%s.stx" % (REQUEST['BASEPATH1'], tag)
+        url="%s/Control_Panel/Products/OFSP/Help/dtml-%s.stx" % (REQUEST['SCRIPT_NAME'], tag)
         return '<a href="%s">DTML Reference</a>' % url
 
+    def zptLink(self, tag, REQUEST):
+        """
+        Returns the URL to a ZPT Reference page for a given topic.
+        """
+        url="%s/Control_Panel/Products/PageTemplates/Help/%s.stx" % (REQUEST['SCRIPT_NAME'], tag)
+        return '<a href="%s">ZPT Reference</a>' % url
+
+
 
 addTutorialForm=DTMLFile('dtml/tutorialAdd', globals())
 
@@ -162,7 +168,7 @@ def addTutorial(self, id, REQUEST=None, RESPONSE=None):
         from Products.ZGadflyDA.DA import data_sources
         data_sources()
     except:
-        raise BadRequest, 'The ZGadflyDA product must be installed!'
+        raise 'Bad Request', 'The ZGadflyDA product must be installed!'
 
     # work around old Zope bug in importing
     try:

lib/python/Products/ZopeTutorial/dtml/lessonView.dtml

@@ -34,10 +34,6 @@ PRE {
 <hr>
 <dtml-var tutorialNavigation>
 
-<p class="feedback">Comments on this lesson?
-<a href="mailto:zdp@zope.org?subject=&dtml.url_quote_plus-title;">Email feedback</a>.
-</p>
-
 <dtml-var standard_html_footer>
 
 

lib/python/Products/ZopeTutorial/glossary.stx

 Glossary
 
-  <!-- XXX fix this -->
-  For general information about Zope <a
-  href="http://www.zope.org/SiteIndex/searchForm"
+  For general information about Zope <a href="http://www.zope.org/"
   target="_blank">search</a> Zope.org.
 
   For Zope documentation try the <a href="http://zdp.zope.org"
@@ -100,6 +98,13 @@ Glossary
 
     <dtml-var "dtmlLink('sendmail', REQUEST)">
   
+  [File] -- A Zope object that contains binary or textual data. Files
+  don't contain dynamic data.
+
+    For more information on Folders see the <a
+    href="http://zope.org/Documentation/Books/ZopeBook/2_6Edition/BasicObject.stx"
+    target="_blank">Basic Objects chapter</a> of The Zope Book.
+  
   [Folder] -- A Zope object that contains other Zope objects. You can
   move objects between Folders by cutting and pasting them. You can
   add new objects to Folders with the product add list.
@@ -136,6 +141,29 @@ Glossary
 
     <dtml-var "apiLink('MailHost.MailHost.MailHost', REQUEST)">
 
+  [Page Template] -- A dynamic web page object.
+
+    For more information on ZPT see the <a
+    href="http://zope.org/Documentation/Books/ZopeBook/2_6Edition/ZPT.stx"
+    target="_blank">Page Templates chapter</a> of The Zope Book.
+
+  [Page Template Macro] -- A device for sharing presentation between
+  page templates.
+
+    For more information on macros see the <a
+    href="http://zope.org/Documentation/Books/ZopeBook/2_6Edition/AdvZPT.stx"
+    target="_blank">Page Templates chapter</a> of The Zope Book.
+
+  [Page Template Statements] -- Special attributes that connect
+  templates to other components and dynamically tailor the HTML of the
+  template.
+
+    For more information on ZPT see the <a
+    href="http://zope.org/Documentation/Books/ZopeBook/2_6Edition/ZPT.stx"
+    target="_blank">Page Templates chapter</a> of The Zope Book.
+
+    <dtml-var "zptLink('tal', REQUEST)">
+  
   [Paste] -- Insert the objects from the clipboard into the current Folder.
   
   [product add list] -- The list of addable objects. Select an object
@@ -156,6 +184,60 @@ Glossary
   [standard_html_footer] -- The standard Zope footer object. By
   convention this object displays an HTML footer.
   
+  [standard_template.pt] -- The standard Zope macro template. By
+  convention this object defines a whole page macro and a number of
+  slots. Other templates then use the macro and fill one or more
+  slots.
+
+  [tal:attributes] -- A ZTP statement that sets one or more tag
+  attributes.
+
+    For more information on ZPT see the <a
+    href="http://zope.org/Documentation/Books/ZopeBook/2_6Edition/ZPT.stx"
+    target="_blank">Page Templates chapter</a> of The Zope Book.
+
+  [tal:condition] -- A ZTP statement that conditionally includes a tag.
+
+    For more information on ZPT see the <a
+    href="http://zope.org/Documentation/Books/ZopeBook/2_6Edition/ZPT.stx"
+    target="_blank">Page Templates chapter</a> of The Zope Book.
+
+    <dtml-var "zptLink('tal-condition', REQUEST)">
+
+  [tal:content] -- A ZPT statement that replaces the content of a tag.
+
+    For more information on ZPT see the <a
+    href="http://zope.org/Documentation/Books/ZopeBook/2_6Edition/ZPT.stx"
+    target="_blank">Page Templates chapter</a> of The Zope Book.
+
+    <dtml-var "zptLink('tal-content', REQUEST)">
+
+  [tal:define] -- A ZPT statement that defines one or more variables.
+
+    For more information on ZPT see the <a
+    href="http://zope.org/Documentation/Books/ZopeBook/2_6Edition/ZPT.stx"
+    target="_blank">Page Templates chapter</a> of The Zope Book.
+
+    <dtml-var "zptLink('tal-define', REQUEST)">
+
+  [tal:repeat] -- A ZPT statement that loops over a list of objects
+  inserting a copy of the statement element for each item in the list.
+
+    For more information on ZPT see the <a
+    href="http://zope.org/Documentation/Books/ZopeBook/2_6Edition/ZPT.stx"
+    target="_blank">Page Templates chapter</a> of The Zope Book.
+
+    <dtml-var "zptLink('tal-repeat', REQUEST)">
+
+  [tal:replace] -- A ZPT statement that replaces a tag and its
+  contents entirely.
+
+    For more information on ZPT see the <a
+    href="http://zope.org/Documentation/Books/ZopeBook/2_6Edition/ZPT.stx"
+    target="_blank">Page Templates chapter</a> of The Zope Book.
+
+    <dtml-var "zptLink('tal-replace', REQUEST)">
+
   [title] -- Most Zope objects can have titles. Titles are optional
   one line descriptions.
   

lib/python/Products/ZopeTutorial/version.txt

-Zope Tutorial 1.0
+Zope Tutorial 1.1