[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/ZPTPage - ZPTPage.py:1.1.2.4.4.1 ZPTPageEdit.py:1.1.2.1.12.1 ZPTPageEval.py:1.1.2.2.4.1 __init__.py:1.1.2.1.12.1 edit.pt:1.1.2.1.12.1

[Gary Poster]

Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/ZPTPage
In directory cvs.zope.org:/tmp/cvs-serv25583/lib/python/Zope/App/OFS/ZPTPage

Modified Files:
      Tag: gary-pre_create_views-branch
	ZPTPage.py ZPTPageEdit.py ZPTPageEval.py __init__.py edit.pt 
Log Message:
last commit bombed; trying again.

merged with Zope-3x branch (on my own branch; don't worry) to take advantage of Stephan's new code.  changed licenses with license utility (and thus five million commits).  Made a couple of presentational improvements.  Need to change job  board example to take advantage of this next.



=== Zope3/lib/python/Zope/App/OFS/ZPTPage/ZPTPage.py 1.1.2.4 => 1.1.2.4.4.1 ===
+#
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
+# 
 # This software is subject to the provisions of the Zope Public License,
-# Version 1.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS 
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-
+# 
+##############################################################################
 from Interface import Interface
 from Persistence import Persistent
 from Zope.PageTemplate.ZPT import ZPT


=== Zope3/lib/python/Zope/App/OFS/ZPTPage/ZPTPageEdit.py 1.1.2.1 => 1.1.2.1.12.1 ===
+#
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
+# 
 # This software is subject to the provisions of the Zope Public License,
-# Version 1.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS 
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-
+# 
+##############################################################################
 """
     Define view component for ZPT page editing.
 """


=== Zope3/lib/python/Zope/App/OFS/ZPTPage/ZPTPageEval.py 1.1.2.2 => 1.1.2.2.4.1 ===
+#
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
+# 
 # This software is subject to the provisions of the Zope Public License,
-# Version 1.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS 
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-
+# 
+##############################################################################
 """
     Define view component for ZPT page eval results.
 """
@@ -33,8 +39,8 @@
              'modules': SecureModuleImporter,
              }
         if inst is not None:
-            c['here'] = inst.getContext()
-            c['container'] = inst
+            c['context'] = inst.getContext()
+            c['view'] = inst
             c['views'] = ViewMapper(inst.getContext(), REQUEST)
         return c
 


=== Zope3/lib/python/Zope/App/OFS/ZPTPage/__init__.py 1.1.2.1 => 1.1.2.1.12.1 ===
+#
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
+# 
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+# 
+##############################################################################


=== Zope3/lib/python/Zope/App/OFS/ZPTPage/edit.pt 1.1.2.1 => 1.1.2.1.12.1 ===
 	      <td class="EditAttributeValue">
         	<textarea name="source" cols="80" rows="10"
-		          tal:content="here/getSource">Source</textarea>
+		          tal:content="context/getSource">Source</textarea>
               </td>
 	    </tr>