Mercurial > hg > documentViewer
changeset 80:8ec7b049a49c
fixed a problem with image_main when options/mk is not present
| author | casties |
|---|---|
| date | Wed, 21 Oct 2009 18:41:50 +0200 |
| parents | df6952ac93e9 |
| children | fae97f071724 |
| files | version.txt zpt/image_main.zpt |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/version.txt Mon Mar 09 09:37:19 2009 +0100 +++ b/version.txt Wed Oct 21 18:41:50 2009 +0200 @@ -1,1 +1,1 @@ -DocumentViewer 0.2.11 \ No newline at end of file +DocumentViewer 0.2.12 \ No newline at end of file
--- a/zpt/image_main.zpt Mon Mar 09 09:37:19 2009 +0100 +++ b/zpt/image_main.zpt Wed Oct 21 18:41:50 2009 +0200 @@ -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/mk}"/> +<tal:block tal:define="docinfo options/docinfo; pageinfo options/pageinfo; mode python:options.get('viewMode','images'); mk python:options.get('mk','')"> + <iframe tal:condition="python:mode=='images'" height="100%" width="100%" tal:attributes="src string:${here/imageViewerUrl}fn=${docinfo/imagePath}&pn=${pageinfo/current}&$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>