--- documentViewer/zpt/toc_figures.zpt	2011/08/16 10:01:59	1.3.2.1
+++ documentViewer/zpt/toc_figures.zpt	2011/08/16 16:27:08	1.3.2.2
@@ -7,8 +7,8 @@
 <body>
   <!-- block used for main content area -->
   <div class="col_left" metal:define-macro="main"
-    tal:define="pn pageinfo/tocPN; tocsize docinfo/tocSize_figures; grpsize pageinfo/tocPageSize;
-                maxpn python:int(math.ceil(tocsize/float(grpsize)));">
+    tal:define="start pageinfo/start; tocsize docinfo/tocSize_figures; grpsize pageinfo/tocPageSize;
+                batch python:here.getBatch(start=start,size=grpsize,end=tocsize);">
     <ul class="switcher">
       <li><a
         tal:attributes="href python:here.getLink('tocMode','thumbs')">Thumbnails</a>
@@ -17,7 +17,7 @@
         tal:condition="python:docpath and docinfo.get('numTocEntries', None)">
         <a tal:attributes="href python:here.getLink('tocMode','text')">Content</a>
       </li>
-      <li
+      <li class="sel"
         tal:condition="python:docpath and docinfo.get('numFigureEntries', None)">
         <a
         tal:attributes="href python:here.getLink('tocMode','figures')">Figures</a>
@@ -29,25 +29,25 @@
     <div class="ruler">
       <form class="autosubmit" tal:attributes="action viewerUrl">
         <input type="hidden"
-          tal:define="params python:here.getParams('tocPN', None)"
+          tal:define="params python:here.getParams('start', None)"
           tal:repeat="param params"
           tal:attributes="name param; value python:params[param]" /> 
-        <a tal:condition="python:(pn>1)"
-          tal:attributes="href python:here.getLink('tocPN',pn-1)">&lt;</a>
-        <span tal:condition="python:(pn<=1)">&lt;</span> 
-        <select class="autosubmit" name="tocPN">
-          <option tal:repeat="idx python:range(maxpn)"
-            tal:attributes="selected python:(pn==idx*grpsize+1); value python:(idx*grpsize+1)"
-            tal:content="python:str(idx*grpsize+1)" />
+        <a tal:condition="batch/prevStart"
+          tal:attributes="href python:here.getLink('start',batch['prevStart'])">&lt;</a>
+        <span tal:condition="not:batch/prevStart">&lt;</span> 
+        <select class="autosubmit" name="start">
+          <option tal:repeat="grp batch/batches"
+            tal:attributes="selected python:(start==grp['start']); value grp/start"
+            tal:content="string:${grp/start} - ${grp/end}" />
         </select> 
         <input type="submit" value="Go" /> 
-        <a tal:condition="python:(pn<maxpn)"
-          tal:attributes="href python:here.getLink('tocPN',pn+1)">&gt;</a>
-        <span tal:condition="python:(pn>=maxpn)">&gt;</span> 
+        <a tal:condition="batch/nextStart"
+          tal:attributes="href python:here.getLink('start',batch['nextStart'])">&gt;</a>
+        <span tal:condition="not:batch/nextStart">&gt;</span> 
       </form>
     </div>
     <div class="content"
-      tal:content="structure python:here.getTocPage(mode='figures',pageinfo=pageinfo,docinfo=docinfo)" />
+      tal:content="structure python:here.getTocPage(mode='figures',start=start,pageinfo=pageinfo,docinfo=docinfo)" />
   </div>
   <!-- toc -->
 </body>
