changeset 36:0bf5aac0ff41

version 0.2.4 * minor improvements * tries more than one time to read info from digilib
author casties
date Wed, 12 Apr 2006 19:47:53 +0200
parents 2d9261aea8f3
children ead830ce45d6
files version.txt zpt/thumbs_main.zpt zpt/viewer_main.zpt
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/version.txt	Wed Apr 12 19:47:53 2006 +0200
+++ b/version.txt	Wed Apr 12 19:47:53 2006 +0200
@@ -1,1 +1,1 @@
-DocumentViewer 0.2.3
\ No newline at end of file
+DocumentViewer 0.2.4
\ No newline at end of file
--- a/zpt/thumbs_main.zpt	Wed Apr 12 19:47:53 2006 +0200
+++ b/zpt/thumbs_main.zpt	Wed Apr 12 19:47:53 2006 +0200
@@ -5,7 +5,7 @@
   <span tal:condition="python:(start>1)">
     <a tal:attributes="href python:here.getLink(param='start',val=max(start-grpsize,1))">&lt;</a>
   </span>
-  <select tal:attributes="onChange python:'location.href=\'%s&start=\'+this.options[this.selectedIndex].value'%here.getLink(param='start',val=None)">
+  <select tal:attributes="onChange python:'location.href=\''+here.getLink(param='start',val=None)+'&start=\'+this.options[this.selectedIndex].value'">
     <option tal:repeat="grp python:range(pageinfo['numgroups'])" 
       tal:attributes="selected python:(start==grp*grpsize+1); value python:(grp*grpsize+1)"
       tal:content="python:(grp*grpsize+1)"/>
@@ -17,10 +17,10 @@
 <table>
   <tr tal:repeat="row python:range(rows)">
     <tal:block tal:repeat="idx python:range(start+row*cols,start+(row+1)*cols)">
-      <td align="center" tal:condition="python:(idx <= end)"
+      <td align="center" tal:condition="python:(idx<=end)"
 		  	tal:attributes="class python:here.getStyle(idx,current,'thumb')">
 		<a tal:attributes="href python:here.getLink(param='pn',val=idx)">
-		  <img class="thumbimg" border="0" tal:attributes="src python:'%s&pn=%d&dw=100&dh=100'%(docinfo['imageURL'],idx)"/>
+		  <img class="thumbimg" border="0" tal:attributes="src string:${docinfo/imageURL}&pn=$idx&dw=100&dh=100"/>
 		  <div class="thumbcap" tal:content="idx"/>
 		</a>
 	  </td>
--- a/zpt/viewer_main.zpt	Wed Apr 12 19:47:53 2006 +0200
+++ b/zpt/viewer_main.zpt	Wed Apr 12 19:47:53 2006 +0200
@@ -4,7 +4,7 @@
 </head>
 <body tal:condition="docinfo/numPages">
 <div tal:replace="structure python:here.template.head_main(docinfo=docinfo)"/>
-<tal:block tal:condition="python:here.accessOK(docinfo)">
+<tal:block tal:condition="python:here.isAccessible(docinfo)">
 <table border="0" width="100%" height="100%">
   <tr>
     <td width="300px" valign="top">
@@ -16,7 +16,7 @@
   </tr>
 </table>
 </tal:block>
-<tal:block tal:condition="not:python:here.accessOK(docinfo)">
+<tal:block tal:condition="not:python:here.isAccessible(docinfo)">
 <div class="errortext">Sorry, access to this document is restricted.</div>
 </tal:block>
 </body>