Remove overloading of static_url

We will retire static.ipfire.org

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index 9c6a6294e64ab4ef2f6275bd870ca9cf9ce159fc..6b5e5724d8c3d1a76a003d54eebe298a4a425188 100644 (file)
--- 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 96f81774133b4fe1a919ebca5372a90fbebf14a0..03d1114a1110a5b0e9625e612f8d78dbfea7d731 100644 (file)
--- 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(", ")