Changeset 74:5c9837484085 in documentViewer

Timestamp:

Nov 4, 2008, 8:36:51 PM (16 years ago)

Author:

dwinter

Branch:

default

Message:

marks

Files:

• documentViewer.py (modified) (2 diffs)
• zpt/image_main.zpt (modified) (1 diff)
• zpt/viewer_main.zpt (modified) (1 diff)

documentViewer.py

@@ -140 +140 @@
   
     security.declareProtected('View','index_html')
-    def index_html(self,mode,url,viewMode="auto",start=None,pn=1):
+    def index_html(self,mode,url,viewMode="auto",start=None,pn=1,mk=None):
         '''
         view it
@@ -168 +168 @@
                 viewMode="images"
                
-        return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode)
+        return pt(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode,marks=self.generateMarks(mk))
   
-  
+    def generateMarks(self,mk):
+        ret=""
+        for m in mk:
+            ret+="mk=%s"%mk
+        return ret
+    
     def getLink(self,param=None,val=None):
         """link to documentviewer with parameter param set to val"""

zpt/image_main.zpt

@@ -1 +1 @@
 <tal:block tal:define="docinfo options/docinfo; pageinfo options/pageinfo; mode python:options.get('viewMode','images')">
- <iframe tal:condition="python:mode=='images'" height="100%" width="100%" tal:attributes="src string:${here/imageViewerUrl}fn=${docinfo/imagePath}&pn=${pageinfo/current}"/>
+ <iframe tal:condition="python:mode=='images'" height="100%" width="100%" tal:attributes="src string:${here/imageViewerUrl}fn=${docinfo/imagePath}&pn=${pageinfo/current}${options/marks}"/>
  <iframe tal:condition="python:mode=='text'" height="100%" width="100%" tal:attributes="src string:${here/textViewerUrl}fn=${docinfo/textURL}&pn=${pageinfo/current}&lang=${docinfo/lang}"/>
 </tal:block>

zpt/viewer_main.zpt

@@ -13 +13 @@
     </td>
     <td width="100%" valign="top">
-      <tal:block tal:content="structure python:here.template.image_main(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode)" />
+      <tal:block tal:content="structure python:here.template.image_main(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode,mk=mk)" />
     </td>
   </tr>