Mercurial > hg > documentViewer

changeset 592:d6bfaea5bdf9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ocrsearch gets new server url and is hidden when no query.
author casties
date Fri, 16 Nov 2012 16:29:32 +0100
parents 5850689ecfac
children eb46138db658
files zpt/layer_image_ocrsearch.zpt
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/zpt/layer_image_ocrsearch.zpt	Fri Nov 16 13:41:02 2012 +0100
+++ b/zpt/layer_image_ocrsearch.zpt	Fri Nov 16 16:29:32 2012 +0100
@@ -2,7 +2,8 @@
           "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:condition="python:'ocrsearch' in viewLayers">
+<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>
@@ -10,8 +11,7 @@
   <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://tuxserve03.mpiwg-berlin.mpg.de/AnnotationManager;
-    global query pageinfo/query | nothing;
+    tal:define="global annServerUrl string:http://md.mpiwg-berlin.mpg.de/searchLines;
     annUri docinfo/documentPath;
     annPf pageinfo/pf | nothing;"
     tal:content="structure string:
@@ -29,14 +29,14 @@
   <div class="col buttons">
     <!-- LAYER DISPLAY OPTION  -->
     <ul>
-      <li metal:define-macro="layer_select_li">
+      <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">
+  <metal:block metal:define-macro="options_box" tal:condition="python:('ocrsearch' in viewLayers) and query">
     <!-- BEGIN OCRSEARCH -->
     <div class="options">
       <h4>OCR Search</h4>