--- documentViewer/zpt/toc_figures.zpt	2010/04/09 18:33:53	1.2
+++ documentViewer/zpt/toc_figures.zpt	2011/08/16 10:01:59	1.3.2.1
@@ -1,25 +1,54 @@
 <!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">
-    <tal:block tal:define="pn python:int(pageinfo['tocPN']); tocsize python:int(docinfo['tocSize_figures']); grpsize python:int(pageinfo['tocPageSize']);
-      maxpn python:int(tocsize/grpsize);">
-      <div class="thumbruler">
-        <span tal:condition="python:(pn>1)">
-          <a tal:attributes="href python:here.getLink(param='tocPN',val=pn-1)">&lt;</a>
-        </span>
-        <span tal:content="string:$pn of $maxpn"/>
-        <span>
-          <a tal:attributes="href python:here.getLink(param='tocPN',val=pn+1)">&gt;</a>
-        </span>
-      </div>
-      <div tal:content="structure python:here.getTocPage(mode='figures',pageinfo=pageinfo,docinfo=docinfo)"/>
-    </tal:block>
-  </metal:block>
+  <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)));">
+    <ul class="switcher">
+      <li><a
+        tal:attributes="href python:here.getLink('tocMode','thumbs')">Thumbnails</a>
+      </li>
+      <li
+        tal:condition="python:docpath and docinfo.get('numTocEntries', None)">
+        <a tal:attributes="href python:here.getLink('tocMode','text')">Content</a>
+      </li>
+      <li
+        tal:condition="python:docpath and 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="ruler">
+      <form class="autosubmit" tal:attributes="action viewerUrl">
+        <input type="hidden"
+          tal:define="params python:here.getParams('tocPN', 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)" />
+        </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> 
+      </form>
+    </div>
+    <div class="content"
+      tal:content="structure python:here.getTocPage(mode='figures',pageinfo=pageinfo,docinfo=docinfo)" />
+  </div>
+  <!-- toc -->
 </body>
 </html>
