Changeset 626:7dafe8283312 in documentViewer

Timestamp:

Dec 15, 2014, 4:31:08 PM (9 years ago)

Author:

casties

Branch:

default

Message:

make sslify accessible for templates.

Files:

• documentViewer.py (modified) (1 diff)
• zpt/viewer/layer_image_annotator.zpt (modified) (1 diff)

documentViewer.py

@@ -1160 +1160 @@
         return groups
     
+    def sslifyUrl(self, url, **args):
+        """returns URL with http or https"""
+        return sslifyUrl(url, **args)
 
     security.declareProtected('View management screens','changeDocumentViewerForm')    

zpt/viewer/layer_image_annotator.zpt

@@ -11 +11 @@
 
   <script type="text/javascript" 
-    tal:define="global annServerUrl string:http://tuxserve03.mpiwg-berlin.mpg.de/AnnotationManager;
+    tal:define="global annServerUrl python:here.sslifyUrl('//tuxserve03.mpiwg-berlin.mpg.de/AnnotationManager', here);
     global annTokenUrl string:$viewerUrl/template/token/getLoginToken;
     annUrl python:'http://echo.mpiwg-berlin.mpg.de/documents%s?pn=%s'%(docinfo['imagePath'],pageinfo['pn']);