Allow accessing all pages via SSL

diff --git a/templates/base.html b/templates/base.html
index 9d1cf7b93ce34687d3219e46b786cc8af0f803fa..e8fc60562c3c793ab1a0e68fb7290a8e40f5c042 100644 (file)
--- a/templates/base.html
+++ b/templates/base.html
@@ -15,7 +15,7 @@
                <link rel="stylesheet" type="text/css" href="{{ static_url("css/bootstrap.min.css") }}" />
                <link rel="stylesheet" type="text/css" href="{{ static_url("css/font-awesome.min.css") }}" />
                <link rel="stylesheet" type="text/css" href="{{ static_url("css/style.css") }}" />
-               <link href="http://fonts.googleapis.com/css?family=Ubuntu" rel="stylesheet" type="text/css">
+               <link href="//fonts.googleapis.com/css?family=Ubuntu" rel="stylesheet" type="text/css">
                <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
                {% if rss_url %}

diff --git a/webapp/handlers_base.py b/webapp/handlers_base.py
index a52aacf9da2646b39e852d1c01be163fc9c99962..765bbef348e7eaf419a7b84e849a11b7bc4153c3 100644 (file)
--- a/webapp/handlers_base.py
+++ b/webapp/handlers_base.py
@@ -73,11 +73,8 @@ class BaseHandler(tornado.web.RequestHandler):
                if self.settings.get("debug", False):
                        return ret
 
-               elif self.request.host == "admin.ipfire.org":
-                       return ret
-
-               elif static:
-                       return "http://static.ipfire.org%s" % ret
+               if static:
+                       return "//static.ipfire.org%s" % ret
 
                return ret