Mercurial > hg > documentViewer
changeset 76:47d76f050883
minorCVS: ----------------------------------------------------------------------
author | dwinter |
---|---|
date | Tue, 04 Nov 2008 23:03:56 +0100 |
parents | 9673218e155b |
children | d41833613619 |
files | zpt/image_main.zpt zpt/thumbs_main.zpt zpt/viewer_main.zpt |
diffstat | 3 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/zpt/image_main.zpt Tue Nov 04 23:03:56 2008 +0100 +++ b/zpt/image_main.zpt Tue Nov 04 23:03:56 2008 +0100 @@ -1,4 +1,4 @@ <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}${options/marks}"/> + <iframe tal:condition="python:mode=='images'" height="100%" width="100%" tal:attributes="src string:${here/imageViewerUrl}fn=${docinfo/imagePath}&pn=${pageinfo/current}&${options/mk}"/> <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>
--- a/zpt/thumbs_main.zpt Tue Nov 04 23:03:56 2008 +0100 +++ b/zpt/thumbs_main.zpt Tue Nov 04 23:03:56 2008 +0100 @@ -1,6 +1,7 @@ <div tal:define="docinfo options/docinfo; pageinfo options/pageinfo; start pageinfo/start; end pageinfo/end; rows pageinfo/rows; cols pageinfo/cols; current pageinfo/current; grpsize pageinfo/groupsize"> + <div class="thumbruler"> <span tal:condition="python:(start>1)"> <a tal:attributes="href python:here.getLink(param='start',val=max(start-grpsize,1))"><</a>
--- a/zpt/viewer_main.zpt Tue Nov 04 23:03:56 2008 +0100 +++ b/zpt/viewer_main.zpt Tue Nov 04 23:03:56 2008 +0100 @@ -12,7 +12,7 @@ <tal:block replace="structure python:here.template.thumbs_main(docinfo=docinfo,pageinfo=pageinfo)" /> </td> <td width="100%" valign="top"> - <tal:block tal:content="structure python:here.template.image_main(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode,mk=mk)" /> + <tal:block tal:content="structure python:here.template.image_main(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode,mk=options['mk'])" /> </td> </tr> </table>