Mercurial > hg > documentViewer

changeset 633:5d1534bd19b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Dirk Wintergruen <dwinter@mpiwg-berlin.mpg.de>
date Thu, 02 Jul 2015 10:31:13 +0200
parents 4a75a760def2 (current diff) 25295ceb11b1 (diff)
children 618b600c805a
files
diffstat 2 files changed, 12 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/zpt/viewer/layer_image_annotator.zpt	Thu Jul 02 10:29:50 2015 +0200
+++ b/zpt/viewer/layer_image_annotator.zpt	Thu Jul 02 10:31:13 2015 +0200
@@ -6,6 +6,7 @@
   <!--  annotator 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.vector.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"/>
 
@@ -22,7 +23,7 @@
     dlOpts.annotationServerUrl='$annServerUrl/annotator';
     dlOpts.annotationTokenUrl='$annTokenUrl';
     dlOpts.annotationUser='$annUser';
-    dlOpts.annotatorPlugins=['Auth','Permissions','Store','Markdown'];
+    dlOpts.annotatorPlugins=['Auth','GroupPermissions','Markdown','DigilibIntegrator','Store'];
     dlOpts.annotationPageUri='$annUrl';
     dlOpts.annotatorPluginSettings={'Store':{'annotationData':{'uri':'$annUrl','resource':'$resUrl'},'loadFromSearch':{'uri':'$annUrl'}},
         'Permissions':{'read':[],'update':['$permUser'],'delete':['$permUser'],'admin':['$permUser']}};
@@ -50,8 +51,14 @@
         <li><a href="javascript:$digilib.digilib('setAnnotationMark')"> <img tal:condition="exists:here/template/annotation-mark.png"
             tal:attributes="src here/template/annotation-mark.png/absolute_url" /> annotate point
         </a></li>
-        <li><a href="javascript:$digilib.digilib('setAnnotationRegion')"> <img tal:condition="exists:here/template/annotation-region.png"
-            tal:attributes="src here/template/annotation-region.png/absolute_url" /> annotate region
+        <li><a href="javascript:$digilib.digilib('setAnnotationRect')"> <img tal:condition="exists:here/template/annotation-region.png"
+            tal:attributes="src here/template/annotation-region.png/absolute_url" /> annotate rectangle
+        </a></li>
+        <li><a href="javascript:$digilib.digilib('setAnnotationPolygon')"> <img tal:condition="exists:here/template/annotation-polygon.png"
+            tal:attributes="src here/template/annotation-polygon.png/absolute_url" /> annotate polygon
+        </a></li>
+        <li><a href="javascript:$digilib.digilib('setAnnotationPolyline')"> <img tal:condition="exists:here/template/annotation-polyline.png"
+            tal:attributes="src here/template/annotation-polyline.png/absolute_url" /> annotate polyline
         </a></li>
       </ul>
       <p>
--- a/zpt/viewer/layer_image_search.zpt	Thu Jul 02 10:29:50 2015 +0200
+++ b/zpt/viewer/layer_image_search.zpt	Thu Jul 02 10:31:13 2015 +0200
@@ -7,6 +7,7 @@
   <!--  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.vector.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"/>
 
@@ -21,7 +22,7 @@
     dlOpts.digilibFrontendPath='/jquery/digilib-mpiwg.html';
     dlOpts.annotationServerUrl='$annServerUrl/annotator';
     dlOpts.annotationsReadOnly=true;
-    dlOpts.annotatorPlugins=['Store','Markdown','DigilibIntegrator'];
+    dlOpts.annotatorPlugins=['Markdown','DigilibIntegrator','Store'];
     dlOpts.annotatorPluginSettings={'Store':{'loadFromSearch':{'$uriParam':'$uri','$otherParam':null,'pf':'$pf','query':'$query'}}};
     "></script>
 </metal:block>