Json is now loaded with Ajax.

[philipp/winterrodeln/wradmin.git] / wradmin / template_helper.py

diff --git a/wradmin/template_helper.py b/wradmin/template_helper.py
index 446c315fcc11253c8ee7862b5e96c15efa6fa0f2..f7fc01c8eccd86b69afef85a824fe5efd222f892 100644 (file)
--- a/wradmin/template_helper.py
+++ b/wradmin/template_helper.py
@@ -1,4 +1,4 @@
-from flask import url_for
+from flask import url_for, current_app
 import wrpylib.wrvalidators
 
 
@@ -16,17 +16,17 @@ class PylonsHelper:
         """Creates a link to the specified page in the www.winterrodeln.org wiki"""
         if page_title is None:
             page_title = 'Hauptseite'
-        return 'http://www.winterrodeln.org/wiki/' + page_title
+        return current_app.config['MEDIAWIKI_WIKI'] + '/' + page_title
 
     def forum(self, forum=None):
         """Creates a link to the specified forum. If no id is given, a general link is created."""
         if forum is None:
-            return 'http://winterrodeln-forum.org/'
-        return 'http://winterrodeln-forum.org/viewforum.php?f={}'.format(forum)
+            return 'https://winterrodeln-forum.org/'
+        return 'https://winterrodeln-forum.org/viewforum.php?f={}'.format(forum)
 
     def google_maps(self, latitude, longitude):
         """Builds an URL like http://maps.google.at/maps?q=47.200607,11.260007"""
-        return "http://maps.google.at/maps?q=%.6f,%.6f" % (latitude, longitude)
+        return "https://maps.google.at/maps?q=%.6f,%.6f" % (latitude, longitude)
 
     def bool(self, value):
         """Takes a bool value and creates a German representation"""