Mercurial > hg > documentViewer

changeset 619:79973dee60bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revert layer_text_annotator to old version and fix layer_image_annotator for current version.
author casties
date Mon, 24 Nov 2014 14:40:00 +0100
parents 54d3498a6e78
children a71ae589d342
files zpt/viewer/layer_image_annotator.zpt zpt/viewer/layer_text_annotator.zpt
diffstat 2 files changed, 2 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/zpt/viewer/layer_image_annotator.zpt	Wed Jul 23 17:51:15 2014 +0200
+++ b/zpt/viewer/layer_image_annotator.zpt	Mon Nov 24 14:40:00 2014 +0100
@@ -22,7 +22,7 @@
     dlOpts.annotationServerUrl='$annServerUrl/annotator';
     dlOpts.annotationTokenUrl='$annTokenUrl';
     dlOpts.annotationUser='$annUser';
-    dlOpts.annotatorPlugins=['Auth','Permissions','Store','Markdown','DigilibIntegrator'];
+    dlOpts.annotatorPlugins=['Auth','Permissions','Store','Markdown'];
     dlOpts.annotationPageUri='$annUrl';
     dlOpts.annotatorPluginSettings={'Store':{'annotationData':{'uri':'$annUrl','resource':'$resUrl'},'loadFromSearch':{'uri':'$annUrl'}},
         'Permissions':{'read':[],'update':['$permUser'],'delete':['$permUser'],'admin':['$permUser']}};
--- a/zpt/viewer/layer_text_annotator.zpt	Wed Jul 23 17:51:15 2014 +0200
+++ b/zpt/viewer/layer_text_annotator.zpt	Mon Nov 24 14:40:00 2014 +0100
@@ -4,13 +4,9 @@
 <head>
 <metal:block metal:define-macro="html_head" tal:condition="python:'annotator' in viewLayers">
   <!--  annotator -->
- <link rel="stylesheet" type="text/css"
-    tal:attributes="href string:$rootUrl/template/annotator_files/css/style.css" />
-
   <link rel="stylesheet" type="text/css"
     tal:attributes="href string:$rootUrl/template/annotator_files/css/annotator.css" />
 
-
   <script type="text/javascript" tal:attributes="src string:$rootUrl/template/annotator_files/lib/vendor/json2.js"></script>
   <script type="text/javascript" tal:attributes="src string:$rootUrl/template/annotator_files/lib/vendor/showdown.js"></script>
   <script type="text/javascript" tal:attributes="src string:$rootUrl/template/annotator_files/lib/extensions.js"></script>
@@ -18,9 +14,6 @@
   <script type="text/javascript" tal:attributes="src string:$rootUrl/template/annotator_files/lib/class.js"></script>
   <script type="text/javascript" tal:attributes="src string:$rootUrl/template/annotator_files/lib/range.js"></script>
   <script type="text/javascript" tal:attributes="src string:$rootUrl/template/annotator_files/lib/annotator.js"></script>
-  <script type="text/javascript" tal:attributes="src string:$rootUrl/template/annotator_files/lib/locale/en/annotator.js"></script>
-  
-  
   <script type="text/javascript" tal:attributes="src string:$rootUrl/template/annotator_files/lib/widget.js"></script>
   <script type="text/javascript" tal:attributes="src string:$rootUrl/template/annotator_files/lib/editor.js"></script>
   <script type="text/javascript" tal:attributes="src string:$rootUrl/template/annotator_files/lib/viewer.js"></script>
@@ -31,13 +24,6 @@
   <script type="text/javascript" tal:attributes="src string:$rootUrl/template/annotator_files/lib/plugin/tags.js"></script>
   <script type="text/javascript" tal:attributes="src string:$rootUrl/template/annotator_files/lib/plugin/markdown.js"></script>
   <script type="text/javascript" tal:attributes="src string:$rootUrl/template/annotator_files/lib/plugin/unsupported.js"></script>
-  
-  <script type="text/javascript" tal:attributes="src string:$rootUrl/template/annotator_files/lib/jquery.dateFormat.js"></script>
-  <script type="text/javascript" tal:attributes="src string:$rootUrl/template/annotator_files/lib/jquery.slimscroll.js"></script>
-  <script type="text/javascript" tal:attributes="src string:$rootUrl/template/annotator_files/lib/jquery-i18n-master/jquery.i18n.min.js"></script>
-  <script type="text/javascript" tal:attributes="src string:$rootUrl/template/annotator_files/lib/plugin/view_annotator.js"></script>
-   
-  
   <!-- <script tal:attributes="src string:$rootUrl/template/annotator_files/lib/plugin/filter.js"></script> -->
 
   <script type="text/javascript" 
@@ -58,9 +44,6 @@
             // <!--
             $(document).ready(function() {
                 // annotator
-              
-
-                jQuery.i18n.load(i18n_dict);
                 var elem = $('div.pageContent').get(0);
                 var uri = annotatorPageUrl;
                 var devAnnotator = new Annotator(elem).addPlugin('Auth', {
@@ -95,9 +78,7 @@
                         'limit' : 20,
                         'uri' : uri
                     }
-                }).addPlugin('Tags').addPlugin('Markdown').addPlugin('AnnotatorViewer');
-                
-                $('#anotacions-uoc-panel').slimscroll({height: '100%'});
+                }).addPlugin('Tags').addPlugin('Markdown');
             });
         // -->
         </script>