Mercurial > hg > documentViewer

changeset 550:a35ec08c782d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
small fixes.
author casties
date Fri, 07 Sep 2012 18:14:12 +0200
parents 7bff5a6b0be5
children f558624d3f73
files zpt/layer_text_annotator.zpt zpt/viewer_index.zpt
diffstat 2 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/zpt/layer_text_annotator.zpt	Tue Sep 04 20:05:19 2012 +0200
+++ b/zpt/layer_text_annotator.zpt	Fri Sep 07 18:14:12 2012 +0200
@@ -46,6 +46,12 @@
                 var devAnnotator = new Annotator(elem).addPlugin('Auth', {
                     tokenUrl : 'template/token?user='+annotatorUser
                 }).addPlugin('Permissions', {
+                    permissions: {
+                        'read':   [],
+                        'update': [permissionUser],
+                        'delete': [permissionUser],
+                        'admin':  [permissionUser]
+                    },
                     user : permissionUser,
                     userString : function(user) {
                         if (user && user.name) {
@@ -60,8 +66,8 @@
                         return user;
                     }
                 }).addPlugin('Store', {
-                    prefix: 'http://tuxserve03.mpiwg-berlin.mpg.de/AnnotationManager/annotator',
-                    //prefix: 'http://r583-1.mpiwg-berlin.mpg.de:18080/AnnotationManager/annotator',
+                    //prefix: 'http://tuxserve03.mpiwg-berlin.mpg.de/AnnotationManager/annotator',
+                    prefix: 'http://r583-1.mpiwg-berlin.mpg.de:18080/AnnotationManager/annotator',
                     annotationData : {
                         'uri' : uri
                     },
@@ -113,7 +119,7 @@
       </form>
       <p tal:define="std modules/Products.PythonScripts.standard">
         <a class="button" tal:attributes="href python:'%s/login/login?came_from=%s'%(viewerUrl,std.url_quote(here.getLink()))">log in</a>
-        <a class="button" tal:attributes="href python:'%s/login/logout?came_from=%s'%(viewerUrl,std.url_quote(here.getLink()))">log out</a>
+        <!--  <a class="button" tal:attributes="href python:'%s/login/logout?came_from=%s'%(viewerUrl,std.url_quote(here.getLink()))">log out</a> -->
       </p>
     </div>
     <!-- END ANNOTATIONS -->
--- a/zpt/viewer_index.zpt	Tue Sep 04 20:05:19 2012 +0200
+++ b/zpt/viewer_index.zpt	Fri Sep 07 18:14:12 2012 +0200
@@ -30,7 +30,7 @@
 
     <div class="col main">
       <div class="index-info">
-        <h2>Bibliographical information</h2>
+        <h2>Bibliographic information</h2>
         <table border="0"
           tal:define="formattedData python:here.metadata.getBibFormattedMetaDataExtended(bibdata=docinfo.get('bib', None),bibxdata=docinfo.get('bibx', None))">
           <tal:x condition="python:formattedData">