]> git.ipfire.org Git - ipfire.org.git/commitdiff
projects / ipfire.org.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 013e599)
blog: Add RSS feed URL to header
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 18 Jul 2018 18:08:04 +0000 (19:08 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 18 Jul 2018 18:08:04 +0000 (19:08 +0100)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/templates/base.html patch | blob | blame | history
src/templates/blog/base.html patch | blob | blame | history
src/templates/index.html patch | blob | blame | history
src/web/handlers.py patch | blob | blame | history
src/web/handlers_base.py patch | blob | blame | history

diff --git a/src/templates/base.html b/src/templates/base.html
index eac5f64db8a686af28c537a3415ac24631de0134..473b6881e991f100454b59d32ac497a108b29f0f 100644 (file)
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -12,9 +12,7 @@
                <link rel="stylesheet" type="text/css" href="{{ static_url("main.css") }}" />
                <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-               {% if rss_url %}
-                       <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ rss_url }}" />
-               {% end %}
+               {% block head %}{% end block %}
        </head>
 
        <body id="page-top" class="{% if request.host in ("www.ipfire.org", "dev.ipfire.org") and request.path in ("/", "/donate") %}background{% end %}">
diff --git a/src/templates/blog/base.html b/src/templates/blog/base.html
index a561ca11af444f770b538c79b1c095f8c4166399..466afdb85922b8eb9667814c025042aeddf82df6 100644 (file)
--- a/src/templates/blog/base.html
+++ b/src/templates/blog/base.html
@@ -1,5 +1,9 @@
 {% extends "../base.html" %}
 
+{% block head %}
+       <link rel="alternate" type="application/rss+xml" title="RSS" href="https://blog.ipfire.org/feed.xml" />
+{% end block %}
+
 {% block subtitle %}{{ _("Blog") }}{% end block %}
 
 {% block menu %}
diff --git a/src/templates/index.html b/src/templates/index.html
index 3594ae4e31fb5390ee07335f0866c261dc5e64e7..354396f11634a3c3a35438c1cd1ad2e3979d8175 100644 (file)
--- a/src/templates/index.html
+++ b/src/templates/index.html
@@ -1,5 +1,9 @@
 {% extends "base.html" %}
 
+{% block head %}
+       <link rel="alternate" type="application/rss+xml" title="RSS" href="https://blog.ipfire.org/feed.xml" />
+{% end block %}
+
 {% block title %}{{ _("Welcome to IPFire") }}{% end block %}
 
 {% block container %}
diff --git a/src/web/handlers.py b/src/web/handlers.py
index 83ea9e210d612441a169ce224eccff2e42db838c..c5cfb68077018c3d37696cb710a3fc22d80e2fdd 100644 (file)
--- 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 8d468ea46d75099f222f34c6c56d65a4533154a7..711f3bc8fe203c7d6bc6ef6b2e85f9a559c13033 100644 (file)
--- 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)
The website of ipfire.org.