From 2cda8b0b7e78c5a2eca6a8845859a560c450e070 Mon Sep 17 00:00:00 2001 From: nonmakina Date: Mon, 28 Dec 2020 14:21:56 -0600 Subject: [PATCH] Fixes the sidebar so that it doesn't use iframes. --- templates/themes/categories/frames.html | 62 ++++++++++++++++++++++-- templates/themes/categories/news.html | 30 +++++------- templates/themes/categories/sidebar.html | 22 ++------- 3 files changed, 71 insertions(+), 43 deletions(-) diff --git a/templates/themes/categories/frames.html b/templates/themes/categories/frames.html index 25de9841..e35264c5 100644 --- a/templates/themes/categories/frames.html +++ b/templates/themes/categories/frames.html @@ -6,14 +6,66 @@ {{ settings.title }} - - + {{ include(settings.file_sidebar) }} + {{ include(settings.file_news) }} diff --git a/templates/themes/categories/news.html b/templates/themes/categories/news.html index dc6387c5..e0c1e4a6 100644 --- a/templates/themes/categories/news.html +++ b/templates/themes/categories/news.html @@ -1,18 +1,11 @@ {% filter remove_whitespace %} - - - - - {{ settings.title }} - - - - {{ boardlist.top }} +{{ boardlist.top }} +

{{ settings.title }}

{{ settings.subtitle }}
- +
{% if not news %}

{% trans %}(No news to show.){% endtrans %}

@@ -30,13 +23,12 @@ {% endfor %} {% endif %}
- -
-

- Tinyboard + - vichan {{ config.version }} - -
Tinyboard Copyright © 2010-2014 Tinyboard Development Group -
vichan Copyright © 2012-2016 vichan-devel

-
- - + +
+

- Tinyboard + + vichan {{ config.version }} - +
Tinyboard Copyright © 2010-2014 Tinyboard Development Group +
vichan Copyright © 2012-2016 vichan-devel

+
+
{% endfilter %} diff --git a/templates/themes/categories/sidebar.html b/templates/themes/categories/sidebar.html index 83199f8c..7552dd91 100644 --- a/templates/themes/categories/sidebar.html +++ b/templates/themes/categories/sidebar.html @@ -1,21 +1,5 @@ {% filter remove_whitespace %} - - - - - - {{ settings.title }} - - - - - +
{{ settings.title }}
    @@ -50,6 +34,6 @@ {% endfor %}
{% endfor %} - - +
+ {% endfilter %}