--- documentViewer/zpt/toc_thumbs.zpt	2010/04/09 18:33:53	1.2
+++ documentViewer/zpt/toc_thumbs.zpt	2011/08/15 19:09:07	1.3.2.1
@@ -1,42 +1,70 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 </head>
 <body>
   <!-- block used for main content area -->
-  <metal:block metal:define-macro="main">
-    <div tal:define="start pageinfo/start; end pageinfo/end; rows pageinfo/rows; cols pageinfo/cols;
-  current pageinfo/current; grpsize pageinfo/groupsize">
+  <div class="toc" metal:define-macro="main"
+    tal:define="start pageinfo/start;
+                grpsize pageinfo/groupsize;
+                numgroups pageinfo/numgroups;
+                pageBatch pageinfo/pageBatch; pageZero pageinfo/pageZero;
+                left python:test(flowLtr,pageBatch['prevStart'],pageBatch['nextStart']);
+                right python:test(flowLtr,pageBatch['nextStart'],pageBatch['prevStart']);">
+    <ul class="toctype">
+      <li class="sel">
+        <a tal:attributes="href python:here.getLink('tocMode','thumbs')">Thumbnails</a>
+      </li>
+      <li tal:condition="python:docinfo.get('numTocEntries', None)">
+        <a tal:attributes="href python:here.getLink('tocMode','text')">Content</a>
+      </li>
+      <li tal:condition="python:docinfo.get('numFigureEntries', None)">
+        <a tal:attributes="href python:here.getLink('tocMode','figures')">Figures</a>
+      </li>
+      <li>
+        <a tal:attributes="href python:here.getLink('tocMode','none')">None</a>
+      </li>
+    </ul>
 
-<div class="thumbruler">
-  <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=\''+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)"/>
-  </select>
-  <span tal:condition="python:(start+grpsize<int(docinfo['numPages']))">
-    <a tal:attributes="href python:here.getLink(param='start',val=start+grpsize)">&gt;</a>
-  </span>
-</div>
-<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)"
-		  	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 string:${docinfo/imageURL}&pn=$idx&dw=100&dh=100"/>
-		  <div class="thumbcap" tal:content="idx"/>
-		</a>
-	  </td>
-    </tal:block>
-  </tr>
-</table>
-</div>
-  </metal:block>
+    <div class="content">
+      <div class="ruler">
+        <form class="autosubmit" tal:attributes="action viewerUrl">
+          <input type="hidden" tal:define="params python:here.getParams('start',None)"
+            tal:repeat="param params"
+            tal:attributes="name param; value python:params[param]" /> 
+          <a tal:condition="left" tal:attributes="href python:here.getLink('start',left)">&lt;</a>
+          <span tal:condition="not:left">&lt;</span>
+          <select class="autosubmit" name="start"
+            tal:define="ofs python:test(pageinfo['pageZero'],0,1)">
+            <tal:block tal:repeat="grp python:range(numgroups)">
+              <option tal:define="idx python:max(grp*grpsize+ofs,1)"
+                tal:attributes="selected python:start==idx; value idx;"
+                tal:content="python:'%s - %s'%(idx,min((grp+1)*grpsize+ofs-1,numPages))" />
+            </tal:block>
+          </select>
+          <input type="submit" value="Go" /> 
+          <a tal:condition="right" tal:attributes="href python:here.getLink('start',right)">&gt;</a>
+          <span tal:condition="not:right">&gt;</span>
+        </form>
+      </div>
+
+      <table class="thumbs">
+        <tr tal:repeat="row pageBatch/pages">
+          <td tal:repeat="thumb row"
+            tal:attributes="class python:here.getStyle(thumb['idx'],pn,'thumb')">
+            <a tal:define="idx thumb/idx" tal:condition="idx"
+              tal:attributes="href python:here.getLink('pn',idx)">
+              <img
+                tal:attributes="src python:test(docinfo['imageURL'],here.getScalerUrl(pn=idx,dw=100,dh=100,docinfo=docinfo),'images/pic');
+                                alt idx" /><br/>
+              <span tal:content="idx" />
+            </a>
+          </td>
+        </tr>
+      </table>
+    </div> <!-- content -->
+  </div> <!-- toc -->
 </body>
 </html>
\ No newline at end of file
