Mercurial > hg > documentViewer
comparison zpt/viewer/layer_text_annotator.zpt @ 620:a71ae589d342
use https for annotations and fix bug when logging httplib errors.
author | casties |
---|---|
date | Thu, 11 Dec 2014 17:19:45 +0100 |
parents | 79973dee60bd |
children | bc68ca0d2c0a |
comparison
equal
deleted
inserted
replaced
619:79973dee60bd | 620:a71ae589d342 |
---|---|
25 <script type="text/javascript" tal:attributes="src string:$rootUrl/template/annotator_files/lib/plugin/markdown.js"></script> | 25 <script type="text/javascript" tal:attributes="src string:$rootUrl/template/annotator_files/lib/plugin/markdown.js"></script> |
26 <script type="text/javascript" tal:attributes="src string:$rootUrl/template/annotator_files/lib/plugin/unsupported.js"></script> | 26 <script type="text/javascript" tal:attributes="src string:$rootUrl/template/annotator_files/lib/plugin/unsupported.js"></script> |
27 <!-- <script tal:attributes="src string:$rootUrl/template/annotator_files/lib/plugin/filter.js"></script> --> | 27 <!-- <script tal:attributes="src string:$rootUrl/template/annotator_files/lib/plugin/filter.js"></script> --> |
28 | 28 |
29 <script type="text/javascript" | 29 <script type="text/javascript" |
30 tal:define="global annServerUrl string:http://tuxserve03.mpiwg-berlin.mpg.de/AnnotationManager; | 30 tal:define="global annServerUrl string:https://tuxserve03.mpiwg-berlin.mpg.de/AnnotationManager; |
31 annUrl python:'http://echo.mpiwg-berlin.mpg.de/documents%s?pn=%s'%(docinfo['documentPath'],pageinfo['pn']); | 31 annUrl python:'http://echo.mpiwg-berlin.mpg.de/documents%s?pn=%s'%(docinfo['documentPath'],pageinfo['pn']); |
32 resUrl python:'http://echo.mpiwg-berlin.mpg.de/documents%s'%(docinfo['documentPath']); | 32 resUrl python:'http://echo.mpiwg-berlin.mpg.de/documents%s'%(docinfo['documentPath']); |
33 global annUser python:here.getAuthenticatedUser(anon='anonymous'); | 33 global annUser python:here.getAuthenticatedUser(anon='anonymous'); |
34 global annGroup python:request.get('annotator_group', None); | 34 global annGroup python:request.get('annotator_group', None); |
35 permUser python:test(annGroup, 'group:%s'%annGroup, annUser);" | 35 permUser python:test(annGroup, 'group:%s'%annGroup, annUser);" |