blog: Drop unused base.html

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

diff --git a/Makefile.am b/Makefile.am
index 2aea8a0380dd822a42c610ceda133f2d43e0ca4c..1dbfe5be613f290a2af4f71cbc9aff72b7404042 100644 (file)
--- 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 c560a75d239614a7c2ff3164ca1914c4d0008ff0..86af62dd54e6ff1f3628658c17c2d66a0cd5bc08 100644 (file)
--- 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 (file)
index d08e661..0000000
--- 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 9051e765c8b252091ebe046e8254fb1840a8357c..686e3f6fc7676d6b24769f68bec1bfb8db1513c9 100644 (file)
--- 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 410e057c4a3f53c897d17dca1e2bc3cf00cb9bf2..5761deb063acd236984e685d6bd2484b07dc83a3 100644 (file)
--- 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 6fce2dd24a8b3eca45ec63ce88896cc897bef32f..6edfa8753155106257e2f6abbead74155020b2b0 100644 (file)
--- 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 84d8f29c67104879839f53475ec97fd6486e055c..635d35ee9b039e12ae37dd15197ac19b158e39aa 100644 (file)
--- 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 c3b02ade64b8e1d75ad94e14bb16691e6eef4596..59c5bd5917482bbc4fcd401632efb284287332df 100644 (file)
--- 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 e4d4cde781c6fe24492cefcef3fc0f0f7e7197cd..e66f86abbb64647654821ae00f6982da0a3625b9 100644 (file)
--- 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 ce271328dd5f21a87e5ecfe2cbf2b6b42d3e778e..85b83cff0528b2513db834f16f158fd9ba435a01 100644 (file)
--- 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 749c6aa533df0b899abe81c699b2ffa1a45282bb..e9d09a258323bcf1dda3c07a970bc1c5c0a1027f 100644 (file)
--- 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 719790d7554f9a886fbde91779fe4d89c3e8ec47..31a01de3f8431df213f845270e9b1b3e624b5cef 100644 (file)
--- 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 %}