# HG changeset patch
# User casties
# Date 1314004362 -7200
# Node ID 1e51d440f08b678cb6ac60ddedf219c2b10c20ea
# Parent  26bb915c1f07c1076a7605f57086ed921ebd6a64
more new templates

diff -r 26bb915c1f07 -r 1e51d440f08b css/docuviewer.css
--- a/css/docuviewer.css	Fri Aug 19 16:41:55 2011 +0200
+++ b/css/docuviewer.css	Mon Aug 22 11:12:42 2011 +0200
@@ -1,39 +1,39 @@
 
-div.page_body {
+div.page-body {
     display: table-row;
 }
-div.col_left {
+div.col-left {
     display: table-cell;
     vertical-align: top;
 }
-div.col_main {
+div.col-main {
     display: table-cell;
     vertical-align: top;
 }
-div.col_right {
+div.col-right {
     display: table-cell;
     vertical-align: top;
 }
 
-div.col_left {
+div.col-left {
     max-width: 20em;
 }
 
-div.col_left .thumb {
+div.col-left .thumb {
     padding: 3px;
 }
-div.col_left .thumbsel {
+div.col-left .thumbsel {
     padding: 2px;
     border: 1px solid blue;
 }
-div.col_left .thumbcap {
+div.col-left .thumbcap {
     color: black;
 }
 
-div.col_left .toc {
+div.col-left .toc {
     float:left;
     clear:right; 
 }
-div.col_left .toc.float.right {
+div.col-left .toc.float.right {
     float:right;
-}
\ No newline at end of file
+}
diff -r 26bb915c1f07 -r 1e51d440f08b zpt/viewer_images.zpt
--- a/zpt/viewer_images.zpt	Fri Aug 19 16:41:55 2011 +0200
+++ b/zpt/viewer_images.zpt	Mon Aug 22 11:12:42 2011 +0200
@@ -50,12 +50,12 @@
               first python:test(pn>1,1,None); last python:test(pn<numPages,numPages,None);
               left python:test(flowLtr,prev,next); right python:test(flowLtr,next,prev);
               leftest python:test(flowLtr,first,last); rightest python:test(flowLtr,last,first);">
-    <div class="page_head" metal:use-macro="here/template/head_main/macros/main" />
-    <div class="page_body" tal:condition="python:here.isAccessible(docinfo)">
+    <div class="page-head" metal:use-macro="here/template/head_main/macros/main" />
+    <div class="page-body" tal:condition="python:here.isAccessible(docinfo)">
       <!--table of contents-->
-      <div class="col_left" metal:use-macro="python:path('here/template/toc_%s/macros/main'%tocMode)" />
+      <div class="col-left" metal:use-macro="python:path('here/template/toc_%s/macros/main'%tocMode)" />
       <!-- text page -->
-      <div class="col_main">
+      <div class="col-main">
         <div class="ruler">
           <form class="autosubmit" tal:attributes="action viewerUrl">
             <input type="hidden" tal:define="params python:here.getParams('pn', None)" tal:repeat="param params"
@@ -85,12 +85,12 @@
             <img tal:attributes="src string:${docinfo/imageURL}&pn=${pageinfo/pn}&dw=500&dh=500" />
           </div>
         </div> <!-- content -->
-      </div> <!-- col_main -->
-      <div class="col_right">
+      </div> <!-- col-main -->
+      <div class="col-right">
         BUTTONS
       </div>
-    </div> <!-- page_body -->
-    <div class="page_body" tal:condition="python:not here.isAccessible(docinfo)">
+    </div> <!-- page-body -->
+    <div class="page-body" tal:condition="python:not here.isAccessible(docinfo)">
       <div class="errortext">Sorry, access to this document is restricted.</div>
     </div>
   </tal:block>
diff -r 26bb915c1f07 -r 1e51d440f08b zpt/viewer_text.zpt
--- a/zpt/viewer_text.zpt	Fri Aug 19 16:41:55 2011 +0200
+++ b/zpt/viewer_text.zpt	Mon Aug 22 11:12:42 2011 +0200
@@ -18,13 +18,14 @@
               left python:test(flowLtr,prev,next); right python:test(flowLtr,next,prev);
               leftest python:test(flowLtr,first,last); rightest python:test(flowLtr,last,first);
               textPage python:here.getTextPage(mode=viewType, pn=pn, docinfo=docinfo, pageinfo=pageinfo);">
-  <div class="page_head" metal:use-macro="here/template/head_main/macros/main" />
-  <div class="page_body" tal:condition="python:here.isAccessible(docinfo)">
+  <div class="page-head" metal:use-macro="here/template/head_main/macros/main" />
+  <div class="page-body" tal:condition="python:here.isAccessible(docinfo)">
     <!--table of contents-->
-    <div class="col_left"
+    <div class="col-left"
       metal:use-macro="python:path('here/template/toc_%s/macros/main'%tocMode)" />
+
     <!-- text page -->
-    <div class="col_main">
+    <div class="col-main">
       <div class="ruler">
         <form class="autosubmit" tal:attributes="action viewerUrl">
           <input type="hidden" tal:define="params python:here.getParams('pn', None)"
@@ -58,8 +59,85 @@
         <div class="pageHeaderTitle" tal:condition="exists:pageinfo/pageHeaderTitle" tal:content="structure pageinfo/pageHeaderTitle"/>
         <tal:block tal:replace="structure textPage"/>
       </div>
-    </div>
-  </div>
+    </div> <!-- col-main -->
+    
+    <!-- right-side options -->
+    <div class="col-right">
+        <!--"BEGIN TEXT DISPLAY"  -->
+        <div class="options">
+        <h3>Text display</h3>
+        <form tal:attributes="action viewerUrl" class="autosubmit">
+              <input type="hidden" tal:define="params python:here.getParams(params={'viewType':None})" tal:repeat="param params" tal:attributes="name param; value python:params[param]"/>
+          <input class="autosubmit" type="radio" name="viewType" value="" tal:attributes="checked python:viewType!='xml'"/> Text<br/>
+              <span class="optionsText" tal:condition="python:viewType!='xml'">
+                &nbsp;&nbsp;<input type="checkbox" class="autosubmit" name="viewType" value="dict" tal:attributes="checked python:viewType=='dict'"/> Dictionary<br/>
+              </span>
+              <span class="optionsText" tal:condition="python:viewType!='xml' and docinfo.get('numPlaces',0)">
+                &nbsp;&nbsp;<input type="checkbox" class="autosubmit" name="viewType" value="gis" tal:attributes="checked python:viewType=='gis'"/> Places<br/>
+              </span> <input type="radio" class="autosubmit" name="viewType" tal:attributes="value string:xml; checked python:viewType=='xml'"/> XML<br/>
+              <input type="submit" value="Go!"/>
+        </form>
+      </div>
+      <!--"END TEXT DISPLAY"-->
+      
+      <!--"BEGIN TEXT SIZE"-->
+      <div class="options">
+        <h4>Text size</h4>
+        <div class="fsizer">
+          &nbsp;
+          <a href="javascript:fontSize(12);" class="fs_sml">A</a>
+          <a href="javascript:fontSize(14);" class="fs_med">A</a>
+          <a href="javascript:fontSize(16);" class="fs_lrg">A</a>
+        </div>
+      </div>
+      <!--"END TEXT SIZE"-->    
+      
+      <!--"BEGIN DICTIONARY OVERVIEW"-->
+      <div class="options" tal:condition="python:viewType=='dict'">
+        <h4>Dictionary view</h4>
+        <form name="f3" action="">
+          <input type="radio" name="r3"/>Tab<br/>
+          <input type="radio" name="r3"/>Window<br/>
+        </form>
+      </div>
+      <!--"END DICTIONARY OVERVIEW"-->
+      
+      <!--"BEGIN TEXT NORMALIZATION"-->
+      <div class="options" tal:condition="python:viewType!='xml'">
+        <h4>Text normalization</h4>
+        <form tal:attributes="action viewerUrl" class="autosubmit" 
+                  tal:define="norm python:pageinfo.get('characterNormalization','regPlusNorm');">
+              <input type="hidden" tal:define="params python:here.getParams('characterNormalization',None)" tal:repeat="param params" tal:attributes="name param; value python:params[param]"/>
+          <input type="radio" class="autosubmit" name="characterNormalization" value="orig" tal:attributes="checked python:norm=='orig'"/> Original<br/>
+          <input type="radio" class="autosubmit" name="characterNormalization" value="reg" tal:attributes="checked python:norm=='reg'"/> Regularized<br/>
+          <input type="radio" class="autosubmit" name="characterNormalization" value="regPlusNorm" tal:attributes="checked python:norm=='regPlusNorm'"/> Normalized<br/>
+              <input type="submit" value="Go!"/>
+        </form>
+      </div>
+         <!--"END TEXT NORMALIZATION"-->
+          
+          <!--"BEGIN PLACES"-->
+          <div class="options" tal:condition="python:viewType=='gis'">  
+            <tal:block tal:define="gisPlaces python:here.getGisPlaces(docinfo=docinfo, pageinfo=pageinfo); gisAllPlaces python:here.getAllGisPlaces(docinfo=docinfo, pageinfo=pageinfo);">
+              <span><b>Places</b></span><BR/>(Link to extern:)<BR/>
+              <span>Page</span>
+          <span style="float:right">
+        <a tal:attributes="href python:'http://chinagis.mpiwg-berlin.mpg.de/chinagis/REST/db/mpdl/%s?id=%s&format=%s'%(name,gisPlaces,'gis')" target="_blank">
+          <img src="images/arrow.png" alt=""/>
+        </a>
+          </span><BR/>
+              <span>Book</span>
+              <span style="float:right">
+            <a tal:attributes="href python:'http://chinagis.mpiwg-berlin.mpg.de/chinagis/REST/db/mpdl/%s?format=%s'%(name,'gis')" target="_blank">
+          <img src="images/arrow.png" alt=""/>
+            </a>
+          </span><BR/>
+          </tal:block>
+        </div>
+          <!--"END PLACES"-->   
+    </div> <!-- col-right -->
+    
+  </div> <!-- page-body -->
   <div class="page_body" tal:condition="python:not here.isAccessible(docinfo)">
     <div class="errortext">Sorry, access to this document is restricted.</div>
   </div>