From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 26 Jul 2023 14:08:25 +0000 (+0000)
Subject: blog: Drop unused base.html
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=894c5a5acae79aaf28b89930652693029c863ff8;p=ipfire.org.git

blog: Drop unused base.html

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

diff --git a/Makefile.am b/Makefile.am
index 2aea8a03..1dbfe5be 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -146,7 +146,6 @@ templates_auth_modulesdir = $(templates_authdir)/modules
 
 templates_blog_DATA = \
 	src/templates/blog/author.html \
-	src/templates/blog/base.html \
 	src/templates/blog/compose.html \
 	src/templates/blog/delete.html \
 	src/templates/blog/drafts.html \
diff --git a/src/templates/blog/author.html b/src/templates/blog/author.html
index c560a75d..86af62dd 100644
--- a/src/templates/blog/author.html
+++ b/src/templates/blog/author.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ author }}{% end block %}
 
diff --git a/src/templates/blog/base.html b/src/templates/blog/base.html
deleted file mode 100644
index d08e6615..00000000
--- a/src/templates/blog/base.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends "../base.html" %}
-
-{% block head %}
-	<link rel="alternate" type="application/atom+xml" title="RSS" href="https://www.ipfire.org/blog/feed.xml" />
-	{% block meta %}{% end block %}
-{% end block %}
-
-{% block content %}
-	<div class="row">
-		<div class="col-12 col-lg-9">
-			{% block main %}
-				<div class="row justify-content-center">
-					<div class="col-12 col-md-6">
-						{% block modal %}{% end block %}
-					</div>
-				</div>
-			{% end block %}
-		</div>
-	</div>
-{% end block %}
diff --git a/src/templates/blog/compose.html b/src/templates/blog/compose.html
index 9051e765..686e3f6f 100644
--- a/src/templates/blog/compose.html
+++ b/src/templates/blog/compose.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{% if post %}{{ _("Edit %s") % post.title }}{% else %}{{ _("Compose A New Article") }}{% end %}{% end block %}
 
diff --git a/src/templates/blog/delete.html b/src/templates/blog/delete.html
index 410e057c..5761deb0 100644
--- a/src/templates/blog/delete.html
+++ b/src/templates/blog/delete.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ _("Delete %s") % post.title }}{% end block %}
 
diff --git a/src/templates/blog/drafts.html b/src/templates/blog/drafts.html
index 6fce2dd2..6edfa875 100644
--- a/src/templates/blog/drafts.html
+++ b/src/templates/blog/drafts.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ _("My Drafts") }}{% end block %}
 
diff --git a/src/templates/blog/index.html b/src/templates/blog/index.html
index 84d8f29c..635d35ee 100644
--- a/src/templates/blog/index.html
+++ b/src/templates/blog/index.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ _("Welcome!") }}{% end block %}
 
diff --git a/src/templates/blog/post.html b/src/templates/blog/post.html
index c3b02ade..59c5bd59 100644
--- a/src/templates/blog/post.html
+++ b/src/templates/blog/post.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ post.title }}{% end block %}
 
@@ -35,6 +35,8 @@
 {% end block %}
 
 {% block container %}
+	{% import ipfire.accounts as accounts %}
+
 	<section class="hero has-background-primary-light">
 		<div class="hero-body">
 			<div class="container">
diff --git a/src/templates/blog/publish.html b/src/templates/blog/publish.html
index e4d4cde7..e66f86ab 100644
--- a/src/templates/blog/publish.html
+++ b/src/templates/blog/publish.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ _("Publish %s") % post.title }}{% end block %}
 
diff --git a/src/templates/blog/search-results.html b/src/templates/blog/search-results.html
index ce271328..85b83cff 100644
--- a/src/templates/blog/search-results.html
+++ b/src/templates/blog/search-results.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ _("Search results for '%s'") % q }}{% end block %}
 
diff --git a/src/templates/blog/tag.html b/src/templates/blog/tag.html
index 749c6aa5..e9d09a25 100644
--- a/src/templates/blog/tag.html
+++ b/src/templates/blog/tag.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ _("Posts tagged with '%s'") % tag }}{% end block %}
 
diff --git a/src/templates/blog/year.html b/src/templates/blog/year.html
index 719790d7..31a01de3 100644
--- a/src/templates/blog/year.html
+++ b/src/templates/blog/year.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ _("Posts in %s") % year }}{% end block %}
 
@@ -37,4 +37,4 @@
 			</div>
 		</div>
 	</section>
-{% end block %}
\ No newline at end of file
+{% end block %}