--- documentViewer/zpt/viewer_main.zpt	2006/04/10 19:51:50	1.3
+++ documentViewer/zpt/viewer_main.zpt	2010/05/25 14:36:24	1.14
@@ -1,21 +1,30 @@
-<html>
+<!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 pageinfo/viewMode; tocMode pageinfo/tocMode">
 <head>
-<link rel="stylesheet" href="template/docuviewer_css" type="text/css">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link rel="stylesheet" href="template/docuviewer_css" type="text/css">
 </head>
-<body tal:define="docinfo options/docinfo; pageinfo options/pageinfo" tal:condition="docinfo/numPages">
-<div tal:replace="structure python:here.template.head_main(docinfo=docinfo)"/>
+<body tal:condition="docinfo/numPages">
+<div tal:replace="structure python:here.template.head_main(docinfo=docinfo,viewMode=viewMode,pageinfo=pageinfo)"/>
+<tal:block tal:condition="python:here.isAccessible(docinfo)">
 <table border="0" width="100%" height="100%">
   <tr>
     <td width="300px" valign="top">
-		<tal:block 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:content="structure python:here.template.image_main(docinfo=docinfo,pageinfo=pageinfo)" />
+      <tal:block tal:content="structure python:getattr(here.template, 'page_main_%s'%viewMode)(docinfo=docinfo,pageinfo=pageinfo,mk=options['mk'])"/>
     </td>
   </tr>
 </table>
+</tal:block>
+<tal:block tal:condition="not:python:here.isAccessible(docinfo)">
+<div class="errortext">Sorry, access to this document is restricted.</div>
+</tal:block>
 </body>
-<body tal:define="docinfo options/docinfo; pageinfo options/pageinfo" tal:condition="not:docinfo/numPages">
+<body tal:condition="not:docinfo/numPages">
 <div class="errortext">Sorry, document doesn't exist.</div>
 </body>
 </html>
