From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 13 Jun 2015 12:45:37 +0000 (+0200)
Subject: Allow accessing all pages via SSL
X-Git-Url: http://git.ipfire.org/?p=people%2Fshoehn%2Fipfire.org.git;a=commitdiff_plain;h=4fc4823e8c78314784499739f02966c747b0e614

Allow accessing all pages via SSL
---

diff --git a/templates/base.html b/templates/base.html
index 9d1cf7b..e8fc605 100644
--- 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 a52aacf..765bbef 100644
--- 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