From 08c120166b7bef1c1f48be859fd474e1253c3fa9 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 12 Jul 2018 18:04:13 +0100
Subject: [PATCH] Remove overloading of static_url

We will retire static.ipfire.org

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 Makefile.am              | 11 ++++++++++-
 src/web/handlers_base.py | 11 -----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9c6a6294..6b5e5724 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -99,10 +99,19 @@ webdir = $(backenddir)/web
 # TODO install the base for now and add all other templates later
 
 templates_DATA = \
-	src/templates/base.html
+	src/templates/base.html \
+	src/templates/base-1.html \
+	src/templates/error.html \
+	src/templates/error-404.html \
+	src/templates/error-500.html
 
 templatesdir = $(datadir)/templates
 
+templates_modules_DATA = \
+	src/templates/modules/menu.html
+
+templates_modulesdir = $(templatesdir)/modules
+
 # ------------------------------------------------------------------------------
 
 SCSS_FILES = \
diff --git a/src/web/handlers_base.py b/src/web/handlers_base.py
index 96f81774..03d1114a 100644
--- a/src/web/handlers_base.py
+++ b/src/web/handlers_base.py
@@ -68,17 +68,6 @@ class BaseHandler(tornado.web.RequestHandler):
 		else:
 			return tornado.web.RequestHandler.write_error(self, status_code, **kwargs)
 
-	def static_url(self, path, static=True):
-		ret = tornado.web.RequestHandler.static_url(self, path)
-
-		if self.settings.get("debug", False):
-			return ret
-
-		if static:
-			return "//static.ipfire.org%s" % ret
-
-		return ret
-
 	def get_remote_ip(self):
 		# Fix for clients behind a proxy that sends "X-Forwarded-For".
 		remote_ips = self.request.remote_ip.split(", ")
-- 
2.39.2