--- documentViewer/zpt/viewer_main.zpt	2010/03/19 11:42:40	1.11
+++ documentViewer/zpt/viewer_main.zpt	2010/05/25 14:36:24	1.14
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
- tal:define="docinfo options/docinfo; pageinfo options/pageinfo; viewMode options/viewMode">
+ tal:define="docinfo options/docinfo; pageinfo options/pageinfo; viewMode pageinfo/viewMode; tocMode pageinfo/tocMode">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <link rel="stylesheet" href="template/docuviewer_css" type="text/css">
@@ -12,11 +12,10 @@
 <table border="0" width="100%" height="100%">
   <tr>
     <td width="300px" valign="top">
-      <tal:block tal:replace="structure python:here.template.thumbs_main(docinfo=docinfo,pageinfo=pageinfo)" /> 
+      <tal:block tal:replace="structure python:getattr(here.template, 'toc_%s'%tocMode)(docinfo=docinfo,pageinfo=pageinfo)"/> 
     </td>
     <td width="100%" valign="top">
-      <tal:block tal:condition="python:viewMode=='images'" tal:content="structure python:here.template.page_main_images(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode,mk=options['mk'])" />
-      <tal:block tal:condition="python:viewMode.startswith('text')" tal:content="structure python:here.template.page_main_text(docinfo=docinfo,pageinfo=pageinfo,viewMode=viewMode,mk=options['mk'])" />
+      <tal:block tal:content="structure python:getattr(here.template, 'page_main_%s'%viewMode)(docinfo=docinfo,pageinfo=pageinfo,mk=options['mk'])"/>
     </td>
   </tr>
 </table>
