[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Image/Views/Browser - ImageData.py:1.1.2.2 browser.zcml:1.1.2.2 edit.pt:1.1.2.2

[Stephan Richter]

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

Modified Files:
      Tag: srichter-OFS_Formulator-branch
	ImageData.py browser.zcml edit.pt 
Log Message:
- Tweaks for new Publisher and ZPT security


=== Zope3/lib/python/Zope/App/OFS/Image/Views/Browser/ImageData.py 1.1.2.1 => 1.1.2.2 ===
         image = self.getContext()
         if REQUEST is not None:
-            REQUEST['RESPONSE'].setHeader('content-type',
+            REQUEST.getResponse().setHeader('content-type',
                                           image.getContentType()) 
         return image.getData()
 


=== Zope3/lib/python/Zope/App/OFS/Image/Views/Browser/browser.zcml 1.1.2.1 => 1.1.2.2 ===
 
   <browser:defaultView name="view"
-    for="Zope.App.OFS.Image.Image.IImage."
-    factory="Zope.App.OFS.Image.Views.Browser.ImageData." />
+    for="Zope.App.OFS.Content.Image.Image.IImage."
+    factory=".ImageData." />
 
   <browser:view name="data"
-    for="Zope.App.OFS.Image.Image.IImage."
-    factory="Zope.App.OFS.Image.Views.Browser.ImageData." />
+    for="Zope.App.OFS.Content.Image.Image.IImage."
+    factory=".ImageData." />
 
   <security:protectClass 
-     name="Zope.App.OFS.Image.Views.Browser.ImageData."
+     name=".ImageData."
      permission_id="Zope.View" methods="index, tag" />
 
   <browser:view name="edit"
-    for="Zope.App.OFS.Image.Image.IImage."
-    factory="Zope.App.OFS.Image.Views.Browser.ImageEdit." />
+    for="Zope.App.OFS.Content.Image.Image.IImage."
+    factory=".ImageEdit." />
 
   <security:protectClass 
-     name="Zope.App.OFS.Image.Views.Browser.ImageEdit."
-     permission_id="Zope.View" methods="index, action" />
+     name=".ImageEdit."
+     permission_id="Zope.View" 
+     methods="index, action" />
 
 
   <!-- Formulator directives -->
 
   <browser:view name="DataFieldView"
-    for="Zope.App.OFS.Image.Image.IImage."
-    factory="Zope.App.OFS.Image.ImageFields.DataField. Zope.App.Formulator.Widgets.Browser.FileWidget." />
+    for="Zope.App.OFS.Content.Image.Image.IImage."
+    factory="Zope.App.OFS.Content.Image.ImageFields.DataField. 
+             Zope.App.Formulator.Widgets.Browser.FileWidget." />
 
   <browser:view name="ContentTypeFieldView"
-    for="Zope.App.OFS.Image.Image.IImage."
-    factory="Zope.App.OFS.Image.ImageFields.ContentTypeField. Zope.App.Formulator.Widgets.Browser.TextWidget." />
+    for="Zope.App.OFS.Content.Image.Image.IImage."
+    factory="Zope.App.OFS.Content.Image.ImageFields.ContentTypeField. 
+             Zope.App.Formulator.Widgets.Browser.TextWidget." />
 
 </zopeConfigure>


=== Zope3/lib/python/Zope/App/OFS/Image/Views/Browser/edit.pt 1.1.2.1 => 1.1.2.2 ===
 
 
-      <div tal:condition="python: options.has_key('errors') and options['errors']">
+      <div tal:condition="python: options.has_key('errors') 
+                                  and options['errors']">
         Errors:
         <div tal:repeat="error options/errors | nothing"
              tal:content="error">Foo </div>
       </div>
 
-      <form action="editAction" method="post" enctype="multipart/form-data">
+      <form action="action" method="post" enctype="multipart/form-data">
 
         <table class="EditTable">      
 	  <tbody>   
@@ -46,7 +47,8 @@
   
 	    <tr tal:repeat="fieldView python:container.getFieldViews(request)">
 	      <th class="EditAttributeName"
-                  tal:content="python: fieldView.getContext().getValue('title')">Title</th>
+                tal:content="python: fieldView.getContext().getValue('title')">
+                Title</th>
 	      <td class="EditAttributeValue"
 	          tal:content="structure fieldView/render"><input />
               </td>