From 34472923c35c086129646369489c5049da448e99 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 10 Nov 2020 12:33:20 +0000
Subject: [PATCH] blog: Move as a sub-section of the main page

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 src/templates/base.html                       | 100 ++++++++----------
 src/templates/blog/base.html                  |   2 +-
 src/templates/blog/feed.xml                   |  10 +-
 src/templates/blog/messages/announcement.html |   2 +-
 src/templates/blog/messages/announcement.txt  |   2 +-
 src/templates/blog/modules/post.html          |   8 +-
 src/templates/blog/post.html                  |   4 +-
 src/templates/download/release.html           |   2 +-
 src/templates/index.html                      |   4 +-
 src/templates/location/index.html             |   2 +-
 src/web/__init__.py                           |  34 +++---
 src/web/handlers.py                           |   6 +-
 12 files changed, 84 insertions(+), 92 deletions(-)

diff --git a/src/templates/base.html b/src/templates/base.html
index 5598700c..190b38c3 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -24,11 +24,13 @@
 		<nav class="navbar navbar-light navbar-expand-lg">
 			<div class="container">
 				<a class="navbar-brand" href="/">
-					IPFire<span class="text-primary">_</span>
+					{% if hostname == "www.ipfire.org" and request.path.startswith("/blog") %}
+						IPFire<span class="text-primary">_</span>Blog
+					{% else %}
+						IPFire<span class="text-primary">_</span>
+					{% end %}
 
-					{% if hostname == "blog.ipfire.org" %}
-						{{ _("Blog") }}
-					{% elif hostname == "fireinfo.ipfire.org" %}
+					{% if hostname == "fireinfo.ipfire.org" %}
 						{{ _("Fireinfo") }}
 					{% elif hostname == "location.ipfire.org" %}
 						{{ _("Location") }}
@@ -42,7 +44,12 @@
 				</a>
 
 				{% block menu %}
-					{% if hostname in ("www.ipfire.org", "dev.ipfire.org") %}
+					{% if hostname == "www.ipfire.org" and request.path.startswith("/blog") %}
+						<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar"
+								aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
+							<span class="fas fa-bars"></span>
+						</button>
+
 						<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar"
 								aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
 							<span class="fas fa-bars"></span>
@@ -50,86 +57,65 @@
 
 						<div class="collapse navbar-collapse" id="navbar">
 							<ul class="navbar-nav ml-auto">
-								<li class="nav-item d-sm-block d-md-block d-lg-none">
-									<a class="nav-link {% if request.path == "/" %}active{% end %}" href="/">{{ _("Home") }}</a>
-								</li>
-
-								<li class="nav-item">
-									<a class="nav-link {% if request.path == "/features" %}active{% end %}" href="/features">{{ _("Features") }}</a>
-								</li>
-
-								<li class="nav-item">
-									<a class="nav-link {% if request.path == "/support" %}active{% end %}" href="/support">{{ _("Support") }}</a>
-								</li>
-
-								<li class="nav-item">
-									<a class="nav-link" href="https://blog.ipfire.org/">{{ _("Blog") }}</a>
-								</li>
-
-								<li class="nav-item">
-									<a class="nav-link" href="https://community.ipfire.org/">{{ _("Community") }}</a>
-								</li>
+								{% if current_user %}
+									<li class="nav-item">
+										<a class="nav-link {% if request.path == "/blog/drafts" %}active{% end %}" href="/blog/drafts">
+											{{ _("My Drafts") }}
+										</a>
+									</li>
+								{% end %}
 
 								<li class="nav-item">
-									<a class="nav-link {% if request.path.startswith("/download") %}active{% end %}" href="/download">{{ _("Download") }}</a>
+									<a class="nav-link {% if request.path == "/blog/tags/featured" %}active{% end %}" href="/blog/tags/featured">
+										{{ _("Featured") }}
+									</a>
 								</li>
 							</ul>
 
+							<form class="form-inline my-2 my-lg-0" action="/blog/search" method="GET">
+								<input class="form-control form-control-sm" type="search" name="q"
+									placeholder="{{ _("Search...") }}" aria-label="{{ _("Search") }}"
+									value="{% try %}{{ q }}{% except %}{% end %}">
+							</form>
+
 							<a class="btn btn-primary mt-2 mt-lg-0 ml-lg-2" href="/donate">
 								{{ _("Donate") }}
 							</a>
 						</div>
-					{% elif hostname == "blog.ipfire.org" %}
+					{% elif hostname in ("www.ipfire.org", "dev.ipfire.org") %}
 						<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar"
 								aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
 							<span class="fas fa-bars"></span>
 						</button>
 
 						<div class="collapse navbar-collapse" id="navbar">
-							<ul class="navbar-nav ml-auto d-lg-none">
-								<li class="nav-item">
-									<a class="nav-link {% if request.path == "/" %}active{% end %}" href="/">
-										{{ _("Newest") }}
-									</a>
+							<ul class="navbar-nav ml-auto">
+								<li class="nav-item d-sm-block d-md-block d-lg-none">
+									<a class="nav-link {% if request.path == "/" %}active{% end %}" href="/">{{ _("Home") }}</a>
 								</li>
 
-								{% if current_user %}
-									<li class="nav-item">
-										<a class="nav-link {% if request.path == "/drafts" %}active{% end %}" href="/drafts">
-											{{ _("My Drafts") }}
-										</a>
-									</li>
-								{% end %}
+								<li class="nav-item">
+									<a class="nav-link {% if request.path == "/features" %}active{% end %}" href="/features">{{ _("Features") }}</a>
+								</li>
 
 								<li class="nav-item">
-									<a class="nav-link {% if request.path == "/tags/featured" %}active{% end %}" href="/tags/featured">
-										{{ _("Featured") }}
-									</a>
+									<a class="nav-link {% if request.path == "/support" %}active{% end %}" href="/support">{{ _("Support") }}</a>
 								</li>
 
 								<li class="nav-item">
-									<a class="nav-link {% if request.path == "/tags/lightningwirelabs.com" %}active{% end %} d-flex justify-content-between"
-											href="/tags/lightningwirelabs.com">
-										<span>{{ _("Lightning Wire Labs") }}</span>
+									<a class="nav-link" href="/blog">{{ _("Blog") }}</a>
+								</li>
 
-										<img class="img-fluid" src="{{ static_url("img/lightningwirelabs-logo.svg") }}"
-											alt="{{ _("Lightning Wire Labs") }}">
-									</a>
+								<li class="nav-item">
+									<a class="nav-link" href="https://community.ipfire.org/">{{ _("Community") }}</a>
 								</li>
 
 								<li class="nav-item">
-									<a class="nav-link d-flex justify-content-between" href="/feed.xml">
-										<span>{{ _("RSS Feed") }}</span> <span class="fas fa-rss"></span>
-									</a>
+									<a class="nav-link {% if request.path.startswith("/download") %}active{% end %}" href="/download">{{ _("Download") }}</a>
 								</li>
 							</ul>
 
-							<form class="form-inline ml-lg-auto my-2 my-lg-0" action="/search" method="GET">
-								<input class="form-control form-control-sm" type="search" name="q"
-									placeholder="{{ _("Search...") }}" aria-label="{{ _("Search") }}" value="{% try %}{{ q }}{% except %}{% end %}">
-							</form>
-
-							<a class="btn btn-primary ml-lg-2" href="https://www.ipfire.org/donate">
+							<a class="btn btn-primary mt-2 mt-lg-0 ml-lg-2" href="/donate">
 								{{ _("Donate") }}
 							</a>
 						</div>
@@ -319,7 +305,7 @@
 									</li>
 
 									<li>
-										<a class="footer-link" href="https://blog.ipfire.org">{{ _("Blog") }}</a>
+										<a class="footer-link" href="/blog">{{ _("Blog") }}</a>
 									</li>
 
 									<li>
diff --git a/src/templates/blog/base.html b/src/templates/blog/base.html
index 14f7576f..2da66d44 100644
--- a/src/templates/blog/base.html
+++ b/src/templates/blog/base.html
@@ -1,7 +1,7 @@
 {% extends "../base.html" %}
 
 {% block head %}
-	<link rel="alternate" type="application/atom+xml" title="RSS" href="https://blog.ipfire.org/feed.xml" />
+	<link rel="alternate" type="application/atom+xml" title="RSS" href="https://www.ipfire.org/blog/feed.xml" />
 	{% block meta %}{% end block %}
 {% end block %}
 
diff --git a/src/templates/blog/feed.xml b/src/templates/blog/feed.xml
index 98fe72e6..ac29e6c1 100644
--- a/src/templates/blog/feed.xml
+++ b/src/templates/blog/feed.xml
@@ -3,10 +3,10 @@
 {% import ipfire.accounts as accounts %}
 
 <feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en-GB">
-	<id>https://blog.ipfire.org/feed.xml</id>
+	<id>https://www.ipfire.org/blog/feed.xml</id>
 
-	<link href="https://blog.ipfire.org/feed.xml" rel="self" type="application/atom+xml" />
-	<link href="https://blog.ipfire.org" rel="alternate" type="text/html"/>
+	<link href="https://www.ipfire.org/blog/feed.xml" rel="self" type="application/atom+xml" />
+	<link href="https://www.ipfire.org/blog" rel="alternate" type="text/html"/>
 	<link rel="payment" title="Donate!" href="https://www.ipfire.org/donate" type="text/html" />
 
 	<title>IPFire Blog</title>
@@ -16,9 +16,9 @@
 
 	{% for post in posts %}
 		<entry>
-			<id>https://blog.ipfire.org/post/{{ post.slug }}</id>
+			<id>https://www.ipfire.org/blog/{{ post.slug }}</id>
 			<title type="html">{{ post.title }}</title>
-			<link href="https://blog.ipfire.org/post/{{ post.slug }}" rel="alternate" type="text/html" title="{{ post.title }}" />
+			<link href="https://www.ipfire.org/blog/{{ post.slug }}" rel="alternate" type="text/html" title="{{ post.title }}" />
 			<author>
 				<name>{{ post.author }}</name>
 				{% if isinstance(post.author, accounts.Account) %}
diff --git a/src/templates/blog/messages/announcement.html b/src/templates/blog/messages/announcement.html
index 566069bf..5e039be1 100644
--- a/src/templates/blog/messages/announcement.html
+++ b/src/templates/blog/messages/announcement.html
@@ -21,7 +21,7 @@
 						<tbody>
 							<tr>
 								<td>
-                                    <a href="https://blog.ipfire.org/post/{{ post.slug }}" target="_blank">{{ _("Click Here To Read More") }}</a>
+                                    <a href="https://www.ipfire.org/blog/{{ post.slug }}" target="_blank">{{ _("Click Here To Read More") }}</a>
                                 </td>
 							</tr>
 						</tbody>
diff --git a/src/templates/blog/messages/announcement.txt b/src/templates/blog/messages/announcement.txt
index 5e497475..9326d691 100644
--- a/src/templates/blog/messages/announcement.txt
+++ b/src/templates/blog/messages/announcement.txt
@@ -15,4 +15,4 @@ X-Auto-Response-Suppress: OOF
 
 {{ _("Click here to read more:") }}
 
-  https://blog.ipfire.org/post/{{ post.slug }}
+  https://www.ipfire.org/blog/{{ post.slug }}
diff --git a/src/templates/blog/modules/post.html b/src/templates/blog/modules/post.html
index 75d09222..f0c3c304 100644
--- a/src/templates/blog/modules/post.html
+++ b/src/templates/blog/modules/post.html
@@ -3,7 +3,7 @@
 <div class="blog-post {% if "lightningwirelabs.com" in post.tags %}lightning-wire-labs{% end %}">
 	<div class="blog-header">
 		<h4 class="card-title">
-			<a href="https://blog.ipfire.org/post/{{ post.slug }}">
+			<a href="/blog/{{ post.slug }}">
 				{{ post.title }}
 			</a>
 		</h4>
@@ -12,7 +12,7 @@
 			{{ _("by") }}
 
 			{% if isinstance(post.author, accounts.Account) %}
-				<a href="/authors/{{ post.author.uid }}">{{ post.author.name }}</a>,
+				<a href="/blog/authors/{{ post.author.uid }}">{{ post.author.name }}</a>,
 			{% else %}
 				<strong>{{ post.author }}</strong>,
 			{% end %}
@@ -60,13 +60,13 @@
 		{% end %}
 
 		{% if post.release %}
-			<a class="btn btn-primary" href="https://www.ipfire.org/download/{{ post.release.slug }}">
+			<a class="btn btn-primary" href="/download/{{ post.release.slug }}">
 				{{ _("Download") }}
 			</a>
 		{% end %}
 
 		{% if post.release or "donate" in post.tags %}
-			<a class="btn btn-outline-primary ml-2" href="https://www.ipfire.org/donate">
+			<a class="btn btn-outline-primary ml-2" href="/donate">
 				{{ _("Donate") }}
 			</a>
 		{% end %}
diff --git a/src/templates/blog/post.html b/src/templates/blog/post.html
index 210617e8..d42820bb 100644
--- a/src/templates/blog/post.html
+++ b/src/templates/blog/post.html
@@ -10,7 +10,7 @@
 	<meta property="og:title" content="{{ post.title }} - The IPFire Blog" />
 	<meta property="og:description" content="{{ post.excerpt }}" />
 	<meta property="og:url" content="{{ request.full_url() }}" />
-	<meta property="og:image" content="https://blog.ipfire.org/{{ static_url("img/ipfire-tux.png") }}" />
+	<meta property="og:image" content="{{ static_url("img/ipfire-tux.png") }}" />
 
 	<meta property="og:type" content="article" />
 	{% if post.published_at %}
@@ -31,7 +31,7 @@
 	<meta property="twitter:card" content="summary_large_image" />
 	<meta property="twitter:title" content="{{ post.title }} - The IPFire Blog" />
 	<meta property="twitter:description" content="{{ post.excerpt }}" />
-	<meta property="twitter:image" content="https://blog.ipfire.org/{{ static_url("img/ipfire-tux.png") }}" />
+	<meta property="twitter:image" content="{{ static_url("img/ipfire-tux.png") }}" />
 {% end block %}
 
 {% block main %}
diff --git a/src/templates/download/release.html b/src/templates/download/release.html
index 98fbcb7f..9f9b9054 100644
--- a/src/templates/download/release.html
+++ b/src/templates/download/release.html
@@ -14,7 +14,7 @@
 
 				{% if release.blog %}
 					&bull;
-					<a href="https://blog.ipfire.org/post/{{ release.blog.slug }}">{{ _("Release Notes") }}</a>
+					<a href="/blog/{{ release.blog.slug }}">{{ _("Release Notes") }}</a>
 				{% end %}
 			</h6>
 
diff --git a/src/templates/index.html b/src/templates/index.html
index f0f2bea8..b63d07db 100644
--- a/src/templates/index.html
+++ b/src/templates/index.html
@@ -2,7 +2,7 @@
 
 {% block head %}
 	<meta name="description" content="{{ _("IPFire is a hardened, versatile, state-of-the-art Open Source firewall based on Linux.") }}" />
-	<link rel="alternate" type="application/atom+xml" title="RSS" href="https://blog.ipfire.org/feed.xml" />
+	<link rel="alternate" type="application/atom+xml" title="RSS" href="/blog/feed.xml" />
 {% end block %}
 
 {% block title %}{{ _("Welcome to IPFire") }}{% end block %}
@@ -17,7 +17,7 @@
 				{% if latest_release.blog %}
 					&nbsp;
 
-					<a class="text-dark font-weight-bold" href="https://blog.ipfire.org/post/{{ latest_release.blog.slug }}">
+					<a class="text-dark font-weight-bold" href="/blog/{{ latest_release.blog.slug }}">
 						{{ _("Read More") }}
 					</a>
 				{% end %}
diff --git a/src/templates/location/index.html b/src/templates/location/index.html
index c6fe831d..b2e16c1e 100644
--- a/src/templates/location/index.html
+++ b/src/templates/location/index.html
@@ -148,7 +148,7 @@
 							</div>
 						</div>
 
-						<a class="btn btn-primary btn-lg btn-block" href="https://blog.ipfire.org/tags/location">
+						<a class="btn btn-primary btn-lg btn-block" href="https://www.ipfire.org/blog/tags/location">
 							{{ _("Read More") }}
 						</a>
 					</div>
diff --git a/src/web/__init__.py b/src/web/__init__.py
index 97b4a953..0f9c3d6a 100644
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -119,6 +119,19 @@ class Application(tornado.web.Application):
 			# Entry site that lead the user to index
 			(r"/", IndexHandler),
 
+			# Blog
+			(r"/blog", blog.IndexHandler),
+			(r"/blog/authors/(\w+)", blog.AuthorHandler),
+			(r"/blog/compose", blog.ComposeHandler),
+			(r"/blog/drafts", blog.DraftsHandler),
+			(r"/blog/feed.xml", blog.FeedHandler),
+			(r"/blog/search", blog.SearchHandler),
+			(r"/blog/tags/([0-9a-z\-\.]+)", blog.TagHandler),
+			(r"/blog/([0-9a-z\-\._]+)", blog.PostHandler),
+			(r"/blog/([0-9a-z\-\._]+)/delete", blog.DeleteHandler),
+			(r"/blog/([0-9a-z\-\._]+)/edit", blog.EditHandler),
+			(r"/blog/([0-9a-z\-\._]+)/publish", blog.PublishHandler),
+
 			# Download sites
 			(r"/downloads", tornado.web.RedirectHandler, { "url" : "/download" }),
 			(r"/download", download.IndexHandler),
@@ -149,23 +162,16 @@ class Application(tornado.web.Application):
 			(r"/error/([45][0-9]{2})", base.ErrorHandler),
 		])
 
-		# blog.ipfire.org
+		# blog.ipfire.org - LEGACY REDIRECTION
 		self.add_handlers(r"blog\.ipfire\.org", [
-			(r"/", blog.IndexHandler),
-			(r"/authors/(\w+)", blog.AuthorHandler),
-			(r"/compose", blog.ComposeHandler),
-			(r"/drafts", blog.DraftsHandler),
-			(r"/post/([0-9a-z\-\._]+)", blog.PostHandler),
-			(r"/post/([0-9a-z\-\._]+)/delete", blog.DeleteHandler),
-			(r"/post/([0-9a-z\-\._]+)/edit", blog.EditHandler),
-			(r"/post/([0-9a-z\-\._]+)/publish", blog.PublishHandler),
-			(r"/search", blog.SearchHandler),
-			(r"/tags/([0-9a-z\-\.]+)", blog.TagHandler),
-			(r"/years/([0-9]+)", blog.YearHandler),
+			(r"/", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/blog" }),
+			(r"/authors/(\w+)", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/blog/authors/{0}" }),
+			(r"/post/([0-9a-z\-\._]+)", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/blog/{0}" }),
+			(r"/tags/([0-9a-z\-\.]+)", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/blog/tags/{0}" }),
 
 			# RSS Feed
-			(r"/feed.xml", blog.FeedHandler),
-		] + authentication_handlers)
+			(r"/feed.xml", tornado.web.RedirectHandler, { "url" : "https://www.ipfire.org/blog/feed.xml" }),
+		])
 
 		# downloads.ipfire.org
 		self.add_handlers(r"downloads?\.ipfire\.org", [
diff --git a/src/web/handlers.py b/src/web/handlers.py
index 2c785b22..e79e647c 100644
--- a/src/web/handlers.py
+++ b/src/web/handlers.py
@@ -28,17 +28,17 @@ class IndexHandler(base.BaseHandler):
 
 class NewsHandler(base.BaseHandler):
 	def get(self, post):
-		self.redirect("https://blog.ipfire.org/post/%s" % post, permanent=True)
+		self.redirect("https://www.ipfire.org/blog/%s" % post, permanent=True)
 
 
 class PlanetPostHandler(base.BaseHandler):
 	def get(self, post):
-		self.redirect("https://blog.ipfire.org/post/%s" % post, permanent=True)
+		self.redirect("https://www.ipfire.org/blog/%s" % post, permanent=True)
 
 
 class PlanetUserHandler(base.BaseHandler):
 	def get(self, user):
-		self.redirect("https://blog.ipfire.org/authors/%s" % user, permanent=True)
+		self.redirect("https://www.ipfire.org/blog/authors/%s" % user, permanent=True)
 
 
 class StaticHandler(base.BaseHandler):
-- 
2.47.3