From: Michael Tremer Date: Wed, 18 Jul 2018 18:08:04 +0000 (+0100) Subject: blog: Add RSS feed URL to header X-Git-Url: http://git.ipfire.org/?p=ipfire.org.git;a=commitdiff_plain;h=a1bf2f6c5b48fbc879da64f5f70f0b0bd81f114f blog: Add RSS feed URL to header Signed-off-by: Michael Tremer --- diff --git a/src/templates/base.html b/src/templates/base.html index eac5f64d..473b6881 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -12,9 +12,7 @@ - {% if rss_url %} - - {% end %} + {% block head %}{% end block %} diff --git a/src/templates/blog/base.html b/src/templates/blog/base.html index a561ca11..466afdb8 100644 --- a/src/templates/blog/base.html +++ b/src/templates/blog/base.html @@ -1,5 +1,9 @@ {% extends "../base.html" %} +{% block head %} + +{% end block %} + {% block subtitle %}{{ _("Blog") }}{% end block %} {% block menu %} diff --git a/src/templates/index.html b/src/templates/index.html index 3594ae4e..354396f1 100644 --- a/src/templates/index.html +++ b/src/templates/index.html @@ -1,5 +1,9 @@ {% extends "base.html" %} +{% block head %} + +{% end block %} + {% block title %}{{ _("Welcome to IPFire") }}{% end block %} {% block container %} diff --git a/src/web/handlers.py b/src/web/handlers.py index 83ea9e21..c5cfb680 100644 --- a/src/web/handlers.py +++ b/src/web/handlers.py @@ -38,8 +38,6 @@ class LangCompatHandler(BaseHandler): class IndexHandler(BaseHandler): - rss_url = "/news.rss" - """ This handler displays the welcome page. """ diff --git a/src/web/handlers_base.py b/src/web/handlers_base.py index 8d468ea4..711f3bc8 100644 --- a/src/web/handlers_base.py +++ b/src/web/handlers_base.py @@ -14,8 +14,6 @@ import tornado.web from .. import util class BaseHandler(tornado.web.RequestHandler): - rss_url = None - def get_account(self, uid): # Find the name of the author return self.accounts.find(uid) @@ -40,7 +38,6 @@ class BaseHandler(tornado.web.RequestHandler): "format_size" : util.format_size, "format_time" : util.format_time, "hostname" : self.hostname, - "rss_url" : self.rss_url, "year" : today.year, } ret.update(self.ssl_params)