changeset 53:f4e0af8c281d

NEW - # 44: ECHO - vollst?ndige bibliographische Angabe https://itgroup.mpiwg-berlin.mpg.de:8080/tracs/vision/ticket/44 minor bug
author dwinter
date Fri, 20 Apr 2007 16:46:05 +0200
parents 92047eaa6272
children f87b6844503b
files documentViewer.py zpt/head_main.zpt
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/documentViewer.py	Wed Jan 24 17:12:26 2007 +0100
+++ b/documentViewer.py	Fri Apr 20 16:46:05 2007 +0200
@@ -610,7 +610,9 @@
 
     self._setObject(id, DocumentViewerTemplate(id))
     ob = getattr(self, id)
-    ob.pt_edit(open(os.path.join(package_home(globals()),'zpt/viewer_main.zpt')).read(),None)
+    txt=file(os.path.join(package_home(globals()),'zpt/viewer_main.zpt'),'r').read()
+    logging.info("txt %s:"%txt)
+    ob.pt_edit(txt,"text/html")
     if title:
         ob.pt_setTitle(title)
     try:
--- a/zpt/head_main.zpt	Wed Jan 24 17:12:26 2007 +0100
+++ b/zpt/head_main.zpt	Fri Apr 20 16:46:05 2007 +0200
@@ -5,5 +5,6 @@
   </tal:y>
   <tal:x tal:condition="python:viewMode=='text'">
   <a target="_blank" tal:attributes="href string:${here/imageViewerUrl}fn=${docinfo/imagePath}&pn=${pageinfo/current}">view image</a>
+  <a target="_blank" tal:attributes="href string:${here/textViewerUrl}/getPage?fn=${docinfo/imagePath}&_pn=${pageinfo/current}">show xml</a>
   </tal:x>
 </tal:block>