From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 17 Oct 2013 08:40:06 +0000 (+0200)
Subject: Deliver static content from same domain if accessing admin.ipfire.org.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ec4605e641893a745fd85ab6634291cf96e74aa;p=ipfire.org.git

Deliver static content from same domain if accessing admin.ipfire.org.
---

diff --git a/webapp/handlers_base.py b/webapp/handlers_base.py
index 9ff886aa..e44d203a 100644
--- a/webapp/handlers_base.py
+++ b/webapp/handlers_base.py
@@ -98,7 +98,10 @@ class BaseHandler(tornado.web.RequestHandler):
 		if self.settings.get("debug", False):
 			return ret
 
-		if static:
+		elif self.request.host == "admin.ipfire.org":
+			return ret
+
+		elif static:
 			return "http://static.ipfire.org%s" % ret
 
 		return ret