provide raw rendering of target object via render.html

git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@3244 fd906abe-77d9-0310-91a1-e0d9ade77398

browser/configure.zcml

@@ -644,21 +644,16 @@
 
   <!-- render file or image assigned to a node as target -->
 
-  <page
+  <pages for="loops.interfaces.INode"
-      name="view"
+         class=".node.NodeView"
-      for="loops.interfaces.INode"
+         permission="zope.View">
-      class=".node.NodeView"
+    <page name="view"
-      attribute="targetDefaultView"
+          attribute="targetDefaultView" />
-      permission="zope.View"
+    <page name="download.html"
-      />
+          attribute="targetDownload" />
-
+    <page name="render.html"
-  <page
+          attribute="targetRender" />
-      name="download.html"
+  </pages>
-      for="loops.interfaces.INode"
-      class=".node.NodeView"
-      attribute="targetDownload"
-      permission="zope.View"
-      />
 
   <!-- vocabulary, traversing, and other stuff -->
 

browser/node.py

@@ -364,6 +364,9 @@ class NodeView(BaseView):
     def targetDownload(self):
         return self.targetView('download.html', 'download')
 
+    def targetRender(self):
+        return self.targetView('download.html', 'show')
+
     @Lazy
     def virtualTarget(self):
         obj = self.virtualTargetObject

browser/resource.py

@@ -165,8 +165,6 @@ class ResourceView(BaseView):
             context = ti(context)
         data = context.data
         response = self.request.response
-        response.setHeader('Content-Type', context.contentType)
-        response.setHeader('Content-Length', len(data))
         ct = context.contentType
         #if useAttachment or (not ct.startswith('image/') and ct != 'application/pdf'):
         if useAttachment:
@@ -175,6 +173,11 @@ class ResourceView(BaseView):
             filename = NameChooser(getParent(self.context)).normalizeName(filename)
             response.setHeader('Content-Disposition',
                                'attachment; filename=%s' % filename)
+        response.setHeader('Content-Length', len(data))
+        if ct.startswith('text/'):
+            response.setHeader('Content-Type', 'text/html')
+            return self.renderText(data, ct)
+        response.setHeader('Content-Type', ct)
         return data
 
     def download(self):

common.py

@@ -165,6 +165,7 @@ class ResourceAdapterBase(AdapterBase):
 
     storageName = None
     storageParams = None
+    localFilename = None
 
     def getChildren(self):
         return []