From abfa773282267470f191bf639b5ba9c8fd06ccb5 Mon Sep 17 00:00:00 2001 From: Zankaria Date: Thu, 22 Aug 2024 00:09:28 +0200 Subject: [PATCH 1/2] templates: bust all js caches with resource_version --- templates/header.html | 6 +++--- templates/mod/ban_list.html | 14 +++++++------- templates/mod/pages.html | 4 ++-- templates/mod/recent_posts.html | 4 ++-- templates/themes/calendar/calendar.html | 16 ++++++++-------- templates/themes/overboards/theme.php | 6 +++--- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/templates/header.html b/templates/header.html index 4ef6ce47..78dea225 100644 --- a/templates/header.html +++ b/templates/header.html @@ -18,10 +18,10 @@ {% if not config.additional_javascript_compile %} {% if not config.deferred_javascript %} - {% for javascript in config.additional_javascript|merge(config.additional_javascript_defer) %}{% endfor %} + {% for javascript in config.additional_javascript|merge(config.additional_javascript_defer) %}{% endfor %} {% else %} - {% for javascript in config.additional_javascript %}{% endfor %} - {% for javascript in config.additional_javascript_defer %}{% endfor %} + {% for javascript in config.additional_javascript %}{% endfor %} + {% for javascript in config.additional_javascript_defer %}{% endfor %} {% endif %} {% endif %} {% if mod %} diff --git a/templates/mod/ban_list.html b/templates/mod/ban_list.html index 9e511b29..beae445f 100644 --- a/templates/mod/ban_list.html +++ b/templates/mod/ban_list.html @@ -1,10 +1,10 @@ - - - - - - + + + + + + @@ -33,7 +33,7 @@ - + {% if token_json %} diff --git a/templates/mod/pages.html b/templates/mod/pages.html index c2395c02..f6be9487 100644 --- a/templates/mod/pages.html +++ b/templates/mod/pages.html @@ -1,4 +1,4 @@ - +

{% if board %} @@ -27,7 +27,7 @@ -
{% trans %}URL{% endtrans %}{% trans %}Title{% endtrans %}
+ diff --git a/templates/mod/recent_posts.html b/templates/mod/recent_posts.html index 8ee2e275..ba93bf60 100644 --- a/templates/mod/recent_posts.html +++ b/templates/mod/recent_posts.html @@ -1,5 +1,5 @@ - - + + {% if not posts %}

({% trans 'There are no active posts.' %})

{% else %} diff --git a/templates/themes/calendar/calendar.html b/templates/themes/calendar/calendar.html index eeb08f1c..bd348f27 100644 --- a/templates/themes/calendar/calendar.html +++ b/templates/themes/calendar/calendar.html @@ -11,8 +11,8 @@ {{ settings.title }} {% include 'header.html' %} - - + +
@@ -25,11 +25,11 @@
- +
-

- Tinyboard + - vichan + +

- Tinyboard + + vichan + lainchan {{ config.version }} -
Tinyboard Copyright © 2010-2014 Tinyboard Development Group
vichan Copyright © 2012-2016 vichan-devel @@ -56,7 +56,7 @@ event.allDay = false; } element.find('.fc-title').append("
" + event.description); - element.css('background-color',event.color); + element.css('background-color',event.color); }, selectable: true, selectHelper: true, @@ -102,7 +102,7 @@ url: url, color:color, }, - true + true ); } calendar.fullCalendar('unselect'); @@ -138,7 +138,7 @@ }); }, eventClick: function(event) { - var decision = confirm("Do you really want to do that?"); + var decision = confirm("Do you really want to do that?"); if (decision) { $.ajax({ type: "POST", diff --git a/templates/themes/overboards/theme.php b/templates/themes/overboards/theme.php index 34b9b6b0..409062d6 100644 --- a/templates/themes/overboards/theme.php +++ b/templates/themes/overboards/theme.php @@ -53,7 +53,7 @@ { error('thread_limit must be an integer above 1.', true); } - if (!is_array($overboard['exclude'])) + if (!is_array($overboard['exclude'])) { error('Exclude list must be array of strings.', true); } @@ -62,7 +62,7 @@ error('Exclude list must be array of strings.', true); } } - + } return $settings; @@ -199,7 +199,7 @@ } $html .= ''; - $html .= ''; + $html .= ''; return Element('index.html', array( 'config' => $config, From ef1634184a632da3343eb94c5f14672534591367 Mon Sep 17 00:00:00 2001 From: Zankaria Date: Thu, 22 Aug 2024 00:15:51 +0200 Subject: [PATCH 2/2] templates: bust all css caches with resource_version --- templates/header.html | 8 ++++---- templates/mod/ban_list.html | 4 ++-- templates/mod/header.html | 2 +- templates/themes/basic/index.html | 8 ++++---- templates/themes/categories/news.html | 4 ++-- templates/themes/faq/index.html | 2 +- templates/themes/recent/recent.html | 14 +++++++------- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/templates/header.html b/templates/header.html index 78dea225..a158eff6 100644 --- a/templates/header.html +++ b/templates/header.html @@ -1,14 +1,14 @@ - + {% if config.url_favicon %}{% endif %} {% if config.url_appletouchicon %}{% endif %} {% if config.meta_keywords %}{% endif %} - {% if config.default_stylesheet.1 != '' %}{% endif %} - {% if config.default_code_stylesheet.1 != '' %}{% endif %} + {% if config.default_stylesheet.1 != '' %}{% endif %} + {% if config.default_code_stylesheet.1 != '' %}{% endif %} {% if config.font_awesome %}{% endif %} {% if config.country_flags_condensed %}{% endif %} - {% if config.sc_editor %} {% endif %} + {% if config.sc_editor %} {% endif %} - - + +

{% if token %} diff --git a/templates/mod/header.html b/templates/mod/header.html index e0ede06a..626e04c2 100644 --- a/templates/mod/header.html +++ b/templates/mod/header.html @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/templates/themes/basic/index.html b/templates/themes/basic/index.html index 94bc79d0..e9a17b75 100644 --- a/templates/themes/basic/index.html +++ b/templates/themes/basic/index.html @@ -2,7 +2,7 @@ - + {% if config.meta_keywords %}{% endif %} @@ -40,12 +40,12 @@ {% endfor %} {% endif %}
- +
-

- Tinyboard + +

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

diff --git a/templates/themes/categories/news.html b/templates/themes/categories/news.html index b9ffecca..4af4e21c 100644 --- a/templates/themes/categories/news.html +++ b/templates/themes/categories/news.html @@ -19,8 +19,8 @@

{{ settings.title }}

{{ settings.subtitle }}
- - + +

{{ description }}

diff --git a/templates/themes/faq/index.html b/templates/themes/faq/index.html index be6a711d..5433388a 100644 --- a/templates/themes/faq/index.html +++ b/templates/themes/faq/index.html @@ -2,7 +2,7 @@ - + {{ settings.title }} {% if config.meta_keywords %}{% endif %} diff --git a/templates/themes/recent/recent.html b/templates/themes/recent/recent.html index 0d131bff..e90e2105 100644 --- a/templates/themes/recent/recent.html +++ b/templates/themes/recent/recent.html @@ -5,12 +5,12 @@ {{ settings.title }} - - - + + + {% if config.url_favicon %}{% endif %} - {% if config.font_awesome %}{% endif %} + {% if config.font_awesome %}{% endif %} {% include 'header.html' %} @@ -31,10 +31,10 @@
-

CYBERPUNK IS DUCK

Pour out the Soykaf, lurk, and read the rules before posting!
+

CYBERPUNK IS DUCK

Pour out the Soykaf, lurk, and read the rules before posting!
mascot

-
+

Latest News

{% if not recent_news %}

(No news to show.)

@@ -70,7 +70,7 @@
    {% for post in recent_posts %}
  • - {{ post.board_name }}: + {{ post.board_name }}: {{ post.snippet }}