From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 17 Jul 2018 11:43:05 +0000 (+0100)
Subject: Add new blog post design
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=12e5de7e1cadbab618524c4804f35d87760524b0;p=ipfire.org.git

Add new blog post design

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

diff --git a/Makefile.am b/Makefile.am
index 4cc5dfb4..ecf7f3ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -76,6 +76,7 @@ backenddir = $(pythondir)/ipfire
 
 web_PYTHON = \
 	src/web/__init__.py \
+	src/web/blog.py \
 	src/web/handlers.py \
 	src/web/handlers_accounts.py \
 	src/web/handlers_admin.py \
@@ -109,6 +110,12 @@ templates_DATA = \
 
 templatesdir = $(datadir)/templates
 
+templates_blog_DATA = \
+	src/templates/blog/base.html \
+	src/templates/blog/post.html
+
+templates_blogdir = $(templatesdir)/blog
+
 templates_modules_DATA = \
 	src/templates/modules/menu.html
 
diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss
index 36840546..f20da770 100644
--- a/src/scss/_variables.scss
+++ b/src/scss/_variables.scss
@@ -69,7 +69,7 @@ $lead-font-size:			1.5rem;
 $small-font-size:			87.5%;
 
 // Headings
-$headings-font-weight:		400;
+$headings-font-weight:		500;
 $headings-line-height:		1.5;
 $headings-margin-bottom:	1.5rem;
 $headings-color:			$blue-grey-900;
diff --git a/src/scss/style.scss b/src/scss/style.scss
index 5d4ba335..13bac62f 100644
--- a/src/scss/style.scss
+++ b/src/scss/style.scss
@@ -219,6 +219,10 @@ footer {
 	}
 }
 
+.blog-post {
+	// Custom CSS for blog posts goes here
+}
+
 // Sidebar navigation
 
 #sidebar .nav {
diff --git a/src/templates/base.html b/src/templates/base.html
index 1fbc93e5..826f2395 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -27,7 +27,7 @@
 
 				<a class="navbar-brand mx-auto text-dark" href="/">
 					<img src="{{ static_url("img/ipfire-tux.png") }}" alt="IPFire" height="32px" />
-					IP<strong>Fire</strong>
+					IP<strong>Fire</strong> {% block subtitle %}{% end block %}
 				</a>
 
 				<div class="collapse navbar-collapse" id="navbar">
@@ -46,6 +46,7 @@
 		{% block container %}
 			<div class="container">
 				{% block body %}{% end block %}
+				{% block content %}{% end block %}
 			</div>
 		{% end block %}
 
diff --git a/src/templates/blog/base.html b/src/templates/blog/base.html
new file mode 100644
index 00000000..5c02aa5c
--- /dev/null
+++ b/src/templates/blog/base.html
@@ -0,0 +1,37 @@
+{% extends "../base.html" %}
+
+{% block subtitle %}{{ _("Blog") }}{% end block %}
+
+{% block menu %}{% end block %}
+
+{% block content %}
+	<div class="row">
+		<div class="col-12 col-md-3">
+			<nav class="mb-5">
+				<ul class="nav flex-column">
+					<li class="nav-item">
+						<a class="nav-link {% if request.path == "/" %}active{% end %}" href="/">
+							{{ _("Newest") }}
+						</a>
+					</li>
+
+					<li class="nav-item">
+						<a class="nav-link {% if request.path == "/featured" %}active{% end %}" href="/featured">
+							{{ _("Featured") }}
+						</a>
+					</li>
+
+					<li class="nav-item">
+						<a class="nav-link {% if request.path == "/tags/lightning-wire-labs" %}active{% end %}" href="/tags/lightning-wire-labs">
+							{{ _("Lightning Wire Labs") }}
+						</a>
+					</li>
+				</ul>
+			</nav>
+		</div>
+
+		<div class="col">
+			{% block main %}{% end block %}
+		</div>
+	</div>
+{% end block %}
diff --git a/src/templates/blog/post.html b/src/templates/blog/post.html
new file mode 100644
index 00000000..37053a79
--- /dev/null
+++ b/src/templates/blog/post.html
@@ -0,0 +1,18 @@
+{% extends "base.html" %}
+
+{% block title %}{{ post.title }}{% end block %}
+
+{% block main %}
+	<div class="card">
+		<div class="card-body blog-post">
+			<h5 class="mb-0">{{ post.title }}</h5>
+
+			<p class="small text-muted">
+				{{ _("by") }} <a href="/authors/{{ post.author.uid }}">{{ post.author.name }}</a>,
+				{{ locale.format_date(post.published, shorter=True, relative=False) }}
+			</p>
+
+			{% raw post.text %}
+		</div>
+	</div>
+{% end block %}
diff --git a/src/web/__init__.py b/src/web/__init__.py
index e35322c8..6a1f9218 100644
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -11,6 +11,8 @@ import ipfire
 from handlers import *
 from ui_modules import *
 
+from . import blog
+
 BASEDIR = os.path.join(os.path.dirname(__file__), "..")
 
 class Application(tornado.web.Application):
@@ -117,6 +119,11 @@ class Application(tornado.web.Application):
 			(r"/(de|en)/(.*)", LangCompatHandler),
 		])
 
+		# blog.ipfire.org
+		self.add_handlers(r"blog(\.dev)?\.ipfire\.org", [
+			(r"/post/(.*)", blog.PostHandler),
+		])
+
 		# downloads.ipfire.org
 		self.add_handlers(r"downloads?(\.dev)?\.ipfire\.org", [
 			(r"/", DownloadsIndexHandler),
diff --git a/src/web/blog.py b/src/web/blog.py
new file mode 100644
index 00000000..06f8c2ef
--- /dev/null
+++ b/src/web/blog.py
@@ -0,0 +1,13 @@
+#!/usr/bin/python
+
+import tornado.web
+
+import handlers_base as base
+
+class PostHandler(base.BaseHandler):
+	def get(self, slug):
+		entry = self.planet.get_entry_by_slug(slug)
+		if not entry:
+			raise tornado.web.HTTPError(404)
+
+		self.render("blog/post.html", post=entry)