[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Content/Image/Views/Browser - ImageData.py:1.1.2.2.4.1 ImageEdit.py:1.1.2.1.4.1 __init__.py:1.1.2.1.4.1 edit.pt:1.1.2.1.4.1

[Gary Poster]

Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Content/Image/Views/Browser
In directory cvs.zope.org:/tmp/cvs-serv22457/lib/python/Zope/App/OFS/Content/Image/Views/Browser

Modified Files:
      Tag: gary-pre_create_views-branch
	ImageData.py ImageEdit.py __init__.py edit.pt 
Log Message:
license check; merge with current Zope-3x branch; small updates


=== Zope3/lib/python/Zope/App/OFS/Content/Image/Views/Browser/ImageData.py 1.1.2.2 => 1.1.2.2.4.1 ===
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors. 
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
 # 
 # This software is subject to the provisions of the Zope Public License,
@@ -8,7 +8,7 @@
 # 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
+# FOR A PARTICULAR PURPOSE.
 # 
 ##############################################################################
 """ Define view component for naive file editing.


=== Zope3/lib/python/Zope/App/OFS/Content/Image/Views/Browser/ImageEdit.py 1.1.2.1 => 1.1.2.1.4.1 ===
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors. 
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
 # 
 # This software is subject to the provisions of the Zope Public License,
@@ -8,7 +8,7 @@
 # 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
+# FOR A PARTICULAR PURPOSE.
 # 
 ##############################################################################
 """


=== Zope3/lib/python/Zope/App/OFS/Content/Image/Views/Browser/__init__.py 1.1.2.1 => 1.1.2.1.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.
-# 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.
-##############################################################################
+##############################################################################
+#
+# 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.
+# 
+##############################################################################
 """
 
 $Id$


=== Zope3/lib/python/Zope/App/OFS/Content/Image/Views/Browser/edit.pt 1.1.2.1 => 1.1.2.1.4.1 ===
       </p>
 
-      <p tal:content="container/description">
+      <p tal:content="view/description">
         Description of the Form.
       </p>
 
@@ -41,11 +41,11 @@
 	    <tr>
 	      <th class="EditAttributeName">Size</th>
 	      <td class="EditAttributeValue"
-          	  tal:content="here/getImageSize">
+          	  tal:content="context/getImageSize">
               </td>
 	    </tr>
   
-	    <tr tal:repeat="fieldView python:container.getFieldViews(request)">
+	    <tr tal:repeat="fieldView python:view.getFieldViews(request)">
 	      <th class="EditAttributeName"
                 tal:content="python: fieldView.getContext().getValue('title')">
                 Title</th>