Mercurial > hg > documentViewer

changeset 593:eb46138db658

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changed layer image_ocrsearch to image_search.
author casties
date Fri, 16 Nov 2012 16:40:29 +0100
parents d6bfaea5bdf9
children da7daa783df4
files documentViewer.py zpt/layer_image_ocrsearch.zpt zpt/layer_image_search.zpt
diffstat 3 files changed, 53 insertions(+), 53 deletions(-) [+]
line wrap: on
line diff
--- a/documentViewer.py	Fri Nov 16 16:29:32 2012 +0100
+++ b/documentViewer.py	Fri Nov 16 16:40:29 2012 +0100
@@ -112,7 +112,7 @@
     layer_text_gis = PageTemplateFile('zpt/layer_text_gis', globals())
     layer_text_pundit = PageTemplateFile('zpt/layer_text_pundit', globals())
     layer_image_annotator = PageTemplateFile('zpt/layer_image_annotator', globals())
-    layer_image_ocrsearch = PageTemplateFile('zpt/layer_image_ocrsearch', globals())
+    layer_image_search = PageTemplateFile('zpt/layer_image_search', globals())
     layer_index_extended = PageTemplateFile('zpt/layer_index_extended', globals())
     # toc templates
     toc_thumbs = PageTemplateFile('zpt/toc_thumbs', globals())
--- a/zpt/layer_image_ocrsearch.zpt	Fri Nov 16 16:29:32 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-<!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">
-<head>
-<metal:block metal:define-macro="html_head" tal:define="global query pageinfo/query | nothing;" 
-  tal:condition="python:('ocrsearch' in viewLayers) and query">
-  <!--  ocrsearch for digilib -->
-  <script type="text/javascript" tal:attributes="src string:$dlBaseUrl/jquery/showdown.js"></script>
-  <script type="text/javascript" tal:attributes="src string:$dlBaseUrl/jquery/annotator-dl.js"></script>
-  <script type="text/javascript" tal:attributes="src string:$dlBaseUrl/jquery/jquery.digilib.annotator.js"></script>
-  <link rel="stylesheet" type="text/css" tal:attributes="href string:$dlBaseUrl/jquery/annotator.min.css"/>
-
-  <script type="text/javascript" 
-    tal:define="global annServerUrl string:http://md.mpiwg-berlin.mpg.de/searchLines;
-    annUri docinfo/documentPath;
-    annPf pageinfo/pf | nothing;"
-    tal:content="structure string:
-    dlOpts.digilibFrontendPath='/jquery/digilib-ann.html';
-    dlOpts.annotationServerUrl='$annServerUrl/annotator';
-    dlOpts.annotationsReadOnly=true;
-    dlOpts.annotatorPlugins=['Store','Markdown','DigilibIntegrator'];
-    dlOpts.annotatorPluginSettings={'Store':{'loadFromSearch':{'uri':'$annUri','pf':'$annPf','query':'$query'}}};
-    "></script>
-</metal:block>
-
-</head>
-<body>
-  <!-- right-side options -->
-  <div class="col buttons">
-    <!-- LAYER DISPLAY OPTION  -->
-    <ul>
-      <li metal:define-macro="layer_select_li" tal:condition="query">
-        <input type="checkbox" class="autosubmit" name="viewLayer" value="ocrsearch"
-          tal:attributes="checked python:'ocrsearch' in viewLayers" /> Search results
-      </li>
-    </ul>
-  </div>
-
-  <metal:block metal:define-macro="options_box" tal:condition="python:('ocrsearch' in viewLayers) and query">
-    <!-- BEGIN OCRSEARCH -->
-    <div class="options">
-      <h4>OCR Search</h4>
-      <p>
-        Query: "<span tal:replace="query"/>".
-      </p>
-    </div>
-    <!-- END OCRSEARCH -->
-  </metal:block>
-
-</body>
-
-</html>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/zpt/layer_image_search.zpt	Fri Nov 16 16:40:29 2012 +0100
@@ -0,0 +1,52 @@
+<!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">
+<head>
+<metal:block metal:define-macro="html_head" tal:define="global query pageinfo/query | nothing;" 
+  tal:condition="python:('search' in viewLayers) and query">
+  <!--  search for digilib -->
+  <script type="text/javascript" tal:attributes="src string:$dlBaseUrl/jquery/showdown.js"></script>
+  <script type="text/javascript" tal:attributes="src string:$dlBaseUrl/jquery/annotator-dl.js"></script>
+  <script type="text/javascript" tal:attributes="src string:$dlBaseUrl/jquery/jquery.digilib.annotator.js"></script>
+  <link rel="stylesheet" type="text/css" tal:attributes="href string:$dlBaseUrl/jquery/annotator.min.css"/>
+
+  <script type="text/javascript" 
+    tal:define="global annServerUrl string:http://md.mpiwg-berlin.mpg.de/searchLines;
+    annUri docinfo/documentPath;
+    annPf pageinfo/pf | nothing;"
+    tal:content="structure string:
+    dlOpts.digilibFrontendPath='/jquery/digilib-ann.html';
+    dlOpts.annotationServerUrl='$annServerUrl/annotator';
+    dlOpts.annotationsReadOnly=true;
+    dlOpts.annotatorPlugins=['Store','Markdown','DigilibIntegrator'];
+    dlOpts.annotatorPluginSettings={'Store':{'loadFromSearch':{'uri':'$annUri','pf':'$annPf','query':'$query'}}};
+    "></script>
+</metal:block>
+
+</head>
+<body>
+  <!-- right-side options -->
+  <div class="col buttons">
+    <!-- LAYER DISPLAY OPTION  -->
+    <ul>
+      <li metal:define-macro="layer_select_li" tal:condition="query">
+        <input type="checkbox" class="autosubmit" name="viewLayer" value="search"
+          tal:attributes="checked python:'search' in viewLayers" /> Search results
+      </li>
+    </ul>
+  </div>
+
+  <metal:block metal:define-macro="options_box" tal:condition="python:('search' in viewLayers) and query">
+    <!-- BEGIN OCRSEARCH -->
+    <div class="options">
+      <h4>OCR Search</h4>
+      <p>
+        Query: "<span tal:replace="query"/>".
+      </p>
+    </div>
+    <!-- END OCRSEARCH -->
+  </metal:block>
+
+</body>
+
+</html>