Changeset 619:79973dee60bd in documentViewer for zpt

Timestamp:

Nov 24, 2014, 1:40:00 PM (9 years ago)

Author:

casties

Branch:

default

Message:

revert layer_text_annotator to old version and fix layer_image_annotator for current version.

Location:

zpt/viewer

Files:

• layer_image_annotator.zpt (modified) (1 diff)
• layer_text_annotator.zpt (modified) (5 diffs)

zpt/viewer/layer_image_annotator.zpt

@@ -23 +23 @@
     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'}},

zpt/viewer/layer_text_annotator.zpt

@@ -5 +5 @@
 <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>
@@ -19 +15 @@
   <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>
@@ -32 +25 @@
   <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> -->
 
@@ -59 +45 @@
             $(document).ready(function() {
                 // annotator
-              
-
-                jQuery.i18n.load(i18n_dict);
                 var elem = $('div.pageContent').get(0);
                 var uri = annotatorPageUrl;
@@ -96 +79 @@
                         'uri' : uri
                     }
-                }).addPlugin('Tags').addPlugin('Markdown').addPlugin('AnnotatorViewer');
-                
-                $('#anotacions-uoc-panel').slimscroll({height: '100%'});
+                }).addPlugin('Tags').addPlugin('Markdown');
             });
         // -->