From 968e2ea5dc75f679d6a28b064cdf588af620c8fa Mon Sep 17 00:00:00 2001 From: Zankaria Date: Sat, 19 Oct 2024 18:55:32 +0200 Subject: [PATCH 1/4] header.html: remove obsolete recaptcha styling --- templates/header.html | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/templates/header.html b/templates/header.html index e99cd85b..7e3f9c54 100644 --- a/templates/header.html +++ b/templates/header.html @@ -30,32 +30,4 @@ {% endif %} {% if config.recaptcha %} - {% endif %} +{% endif %} From 0a3430c134f384b162cb13561ee996af25cdbf98 Mon Sep 17 00:00:00 2001 From: Zankaria Date: Sat, 19 Oct 2024 18:58:23 +0200 Subject: [PATCH 2/4] thread.html: load captcha after main.js --- templates/thread.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/thread.html b/templates/thread.html index c58eafa4..18ddadd9 100644 --- a/templates/thread.html +++ b/templates/thread.html @@ -8,10 +8,11 @@ , board_name = "{{ board.uri }}" , thread_id = "{{ thread.id }}"; - {{ include('captcha_script.html', { form_action_type: 'post_reply' }) }} {% include 'header.html' %} + {{ include('captcha_script.html', { form_action_type: 'post_reply' }) }} + {% set meta_subject %}{% if config.thread_subject_in_title and thread.subject %}{{ thread.subject|e }}{% else %}{{ thread.body_nomarkup|remove_modifiers|newline_to_full_stop|remove_markup|e[:256] }}{% endif %}{% endset %} From d828fb13b99ef44b3e16f8fedec19cddb8c78648 Mon Sep 17 00:00:00 2001 From: Zankaria Date: Sat, 19 Oct 2024 18:58:46 +0200 Subject: [PATCH 3/4] catalog.html: load captcha after main.js --- templates/themes/catalog/catalog.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/themes/catalog/catalog.html b/templates/themes/catalog/catalog.html index d956649b..d166b563 100644 --- a/templates/themes/catalog/catalog.html +++ b/templates/themes/catalog/catalog.html @@ -9,9 +9,9 @@ , board_name = "{{ board.uri }}" , is_overboard = "{{ is_overboard }}"; - {{ include('captcha_script.html', { form_action_type: 'post_thread' }) }} {{ settings.title }} ( /{{ board.title|e }}/ ) {% include 'header.html' %} + {{ include('captcha_script.html', { form_action_type: 'post_thread' }) }}
From deda7df25c814504fdf44782ac44d8af0492265a Mon Sep 17 00:00:00 2001 From: Zankaria Date: Sat, 19 Oct 2024 19:00:01 +0200 Subject: [PATCH 4/4] index.html: load captcha after main.js --- templates/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/index.html b/templates/index.html index e9b944a1..297d1fda 100644 --- a/templates/index.html +++ b/templates/index.html @@ -13,9 +13,9 @@ active_page = "ukko"; {% endif %} + {% include 'header.html' %} {{ include('captcha_script.html', { form_action_type: 'post_thread' }) }} - {% include 'header.html' %} {% set page_num %}{% for page in pages %}{% if page.selected %}{% if page.num != 1 %}{{ page.num }}{% endif %}{% endif %}{% endfor %}{% endset %} {% set meta_subject %}{{ board.subtitle|newline_to_full_stop|e }}{% endset %}