From a00a9ffb949c5112b142c7a14c5bf92d3bf406ce Mon Sep 17 00:00:00 2001
From: Lucas Brandstaetter <lucas@brandstaetter.tech>
Date: Wed, 30 Oct 2024 02:29:47 +0100
Subject: [PATCH] Fix T003 djLint rule
{% endblock %} should include the block name.
---
.../templates/backoffice/assembly_auth.html | 4 ++--
.../templates/backoffice/assembly_auth_app.html | 6 ++++--
.../backoffice/assembly_badge_renewed.html | 6 ++++--
.../templates/backoffice/assembly_badges.html | 4 ++--
.../templates/backoffice/assembly_create.html | 2 +-
.../templates/backoffice/assembly_detail.html | 6 ++++--
.../templates/backoffice/assembly_edit.html | 2 +-
.../backoffice/assembly_editchildren.html | 2 +-
.../backoffice/assembly_editlinks.html | 2 +-
.../templates/backoffice/assembly_events.html | 8 ++++----
.../templates/backoffice/assembly_list.html | 6 +++---
.../backoffice/assembly_list_export.html | 4 ++--
.../templates/backoffice/assembly_members.html | 4 ++--
.../backoffice/assembly_members_edit.html | 2 +-
.../templates/backoffice/assembly_room.html | 8 +++++---
.../templates/backoffice/assembly_room_wa.html | 8 +++++---
.../templates/backoffice/assembly_vouchers.html | 4 ++--
.../assemblyteam_assembly_detail.html | 2 +-
.../backoffice/assemblyteam_edithierarchy.html | 2 +-
.../backoffice/assemblyteam_editposition.html | 2 +-
.../backoffice/assemblyteam_editstate.html | 2 +-
.../backoffice/assemblyteam_message.html | 2 +-
src/backoffice/templates/backoffice/base.html | 17 ++++++++++-------
.../templates/backoffice/event/list.html | 2 +-
src/backoffice/templates/backoffice/index.html | 2 +-
src/backoffice/templates/backoffice/login.html | 2 +-
.../templates/backoffice/map_floor_form.html | 6 ++++--
.../templates/backoffice/map_floor_list.html | 6 +++---
.../templates/backoffice/map_poi_form.html | 6 ++++--
.../templates/backoffice/map_poi_list.html | 6 +++---
.../backoffice/moderation_assembly-detail.html | 2 +-
.../backoffice/moderation_assembly-list.html | 6 +++---
.../backoffice/moderation_badge-detail.html | 2 +-
.../backoffice/moderation_badge-list.html | 6 +++---
.../backoffice/moderation_board-detail.html | 2 +-
.../backoffice/moderation_board-list.html | 6 +++---
.../backoffice/moderation_event-detail.html | 2 +-
.../templates/backoffice/moderation_index.html | 2 +-
.../backoffice/moderation_project-detail.html | 2 +-
.../backoffice/moderation_user-detail.html | 2 +-
.../backoffice/moderation_user-list.html | 6 +++---
.../backoffice/moderation_user-rename.html | 2 +-
.../backoffice/moderation_wiki-detail.html | 2 +-
.../backoffice/moderation_wiki-list.html | 6 +++---
.../templates/backoffice/profile.html | 2 +-
.../templates/backoffice/room-new.html | 6 ++++--
.../schedule_source-confirm_delete.html | 2 +-
.../backoffice/schedule_source-detail.html | 2 +-
.../backoffice/schedule_source-form.html | 2 +-
.../backoffice/schedule_source-list.html | 2 +-
.../schedule_source_import-detail.html | 2 +-
.../templates/backoffice/schedules_index.html | 2 +-
src/backoffice/templates/backoffice/sos.html | 2 +-
.../templates/backoffice/vouchers-list.html | 2 +-
.../templates/backoffice/wa-index.html | 2 +-
.../templates/backoffice/wa-map-detail.html | 4 ++--
.../templates/backoffice/wa-map-list.html | 6 +++---
.../templates/backoffice/wa-session-detail.html | 2 +-
.../templates/backoffice/wa-session-list.html | 2 +-
.../templates/backoffice/wa-texture-form.html | 2 +-
.../templates/backoffice/wa-texture-list.html | 2 +-
.../templates/backoffice/wiki_lock_list.html | 2 +-
.../backoffice/wiki_namespace_list.html | 2 +-
.../templates/backoffice/wiki_overview.html | 2 +-
.../templates/backoffice/wiki_page_detail.html | 2 +-
.../templates/backoffice/wiki_page_list.html | 2 +-
.../templates/registration/change_password.html | 2 +-
.../registration/change_password_done.html | 2 +-
.../registration/registration_form.html | 2 +-
.../registration/reset_password_complete.html | 2 +-
.../registration/reset_password_confirm.html | 2 +-
.../registration/reset_password_done.html | 2 +-
.../templates/registration/signup_done.html | 2 +-
src/core/templates/rest_framework/api.html | 4 ++--
src/core/templates/rest_framework/login.html | 4 +++-
src/plainui/jinja2/plainui/assemblies.html.j2 | 6 ++++--
.../jinja2/plainui/assemblies_all.html.j2 | 6 ++++--
.../jinja2/plainui/assemblies_events.html.j2 | 6 ++++--
src/plainui/jinja2/plainui/assembly.html.j2 | 6 ++++--
.../jinja2/plainui/badges/token_detail.html.j2 | 2 +-
src/plainui/jinja2/plainui/base.html.j2 | 9 ++++++---
src/plainui/jinja2/plainui/board.html.j2 | 4 ++--
.../jinja2/plainui/channel_events.html.j2 | 8 +++++---
.../jinja2/plainui/component_gallery.html.j2 | 6 ++++--
src/plainui/jinja2/plainui/conferences.html.j2 | 6 ++++--
src/plainui/jinja2/plainui/dereferrer.html.j2 | 6 ++++--
src/plainui/jinja2/plainui/event.html.j2 | 10 +++++++---
src/plainui/jinja2/plainui/fahrplan.html.j2 | 8 +++++---
src/plainui/jinja2/plainui/index.html.j2 | 10 +++++++---
src/plainui/jinja2/plainui/landing.html.j2 | 6 ++++--
src/plainui/jinja2/plainui/login.html.j2 | 4 ++--
.../jinja2/plainui/password_change.html.j2 | 6 ++++--
.../plainui/password_reset_complete.html.j2 | 4 ++--
.../plainui/password_reset_confirm.html.j2 | 4 ++--
.../jinja2/plainui/password_reset_done.html.j2 | 4 ++--
.../plainui/personal_message_list.html.j2 | 6 ++++--
.../plainui/personal_message_send.html.j2 | 6 ++++--
.../plainui/personal_message_show.html.j2 | 6 ++++--
src/plainui/jinja2/plainui/profile.html.j2 | 6 ++++--
.../jinja2/plainui/projects/detail.html.j2 | 10 +++++++---
.../jinja2/plainui/public_fahrplan.html.j2 | 3 ++-
src/plainui/jinja2/plainui/redeem_badge.html.j2 | 6 ++++--
src/plainui/jinja2/plainui/redeem_token.html.j2 | 4 ++--
.../registration/password_reset_form.html.j2 | 4 ++--
.../jinja2/plainui/report_content.html.j2 | 6 ++++--
src/plainui/jinja2/plainui/room.html.j2 | 10 +++++++---
src/plainui/jinja2/plainui/search.html.j2 | 6 ++++--
src/plainui/jinja2/plainui/signup.html.j2 | 4 ++--
src/plainui/jinja2/plainui/signup_done.html.j2 | 4 ++--
src/plainui/jinja2/plainui/sos.html.j2 | 8 +++++---
src/plainui/jinja2/plainui/sos_edit.html.j2 | 6 ++++--
src/plainui/jinja2/plainui/static_page.html.j2 | 4 ++--
.../jinja2/plainui/static_page_diff.html.j2 | 6 ++++--
.../jinja2/plainui/static_page_edit.html.j2 | 8 +++++---
.../plainui/static_page_global_history.html.j2 | 6 ++++--
.../jinja2/plainui/static_page_history.html.j2 | 6 ++++--
src/plainui/jinja2/plainui/tag.html.j2 | 4 ++--
.../jinja2/plainui/token_password_reset.html.j2 | 4 ++--
src/plainui/jinja2/plainui/upcoming.html.j2 | 6 ++++--
src/plainui/jinja2/plainui/user.html.j2 | 4 ++--
.../jinja2/plainui/wa_dereferrer.html.j2 | 6 ++++--
src/plainui/jinja2/plainui/world.html.j2 | 6 ++++--
122 files changed, 315 insertions(+), 220 deletions(-)
diff --git a/src/backoffice/templates/backoffice/assembly_auth.html b/src/backoffice/templates/backoffice/assembly_auth.html
index 595d30e0a..c68808285 100644
--- a/src/backoffice/templates/backoffice/assembly_auth.html
+++ b/src/backoffice/templates/backoffice/assembly_auth.html
@@ -4,7 +4,7 @@
{% block title %}
{% trans "Assembly__authentication" %} | {{ assembly.name }} | {{ conference.name }}
-{% endblock %}
+{% endblock title %}
{% block content %}
{% include "backoffice/assembly_edit_header.html" %}
@@ -91,4 +91,4 @@
</div>
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assembly_auth_app.html b/src/backoffice/templates/backoffice/assembly_auth_app.html
index 5da10aa59..4bf8556c1 100644
--- a/src/backoffice/templates/backoffice/assembly_auth_app.html
+++ b/src/backoffice/templates/backoffice/assembly_auth_app.html
@@ -2,7 +2,9 @@
{% load django_bootstrap5 %}
{% load i18n %}
-{% block title %}{{ object.name }} | {{ assembly.name }} | {{ conference.name }}{% endblock %}
+{% block title %}
+ {{ object.name }} | {{ assembly.name }} | {{ conference.name }}
+{% endblock title %}
{% block content %}
{% include "backoffice/assembly_edit_header.html" %}
@@ -27,4 +29,4 @@
</form>
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assembly_badge_renewed.html b/src/backoffice/templates/backoffice/assembly_badge_renewed.html
index 8b417afe5..408c08956 100644
--- a/src/backoffice/templates/backoffice/assembly_badge_renewed.html
+++ b/src/backoffice/templates/backoffice/assembly_badge_renewed.html
@@ -1,7 +1,9 @@
{% extends "backoffice/base.html" %}
{% load i18n %}
-{% block title %}{{ badge.name }} | {{ assembly.name }} | {{ conference.name }}{% endblock %}
+{% block title %}
+ {{ badge.name }} | {{ assembly.name }} | {{ conference.name }}
+{% endblock title %}
{% block content %}
{% include "backoffice/assembly_edit_header.html" %}
@@ -20,4 +22,4 @@
</div>
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assembly_badges.html b/src/backoffice/templates/backoffice/assembly_badges.html
index 6b01e0ce7..055cb24c9 100644
--- a/src/backoffice/templates/backoffice/assembly_badges.html
+++ b/src/backoffice/templates/backoffice/assembly_badges.html
@@ -3,7 +3,7 @@
{% block title %}
{% trans "Badges" %} | {{ assembly.name }} | {{ conference.name }}
-{% endblock %}
+{% endblock title %}
{% block content %}
{% include "backoffice/assembly_edit_header.html" %}
@@ -64,4 +64,4 @@
</div>
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assembly_create.html b/src/backoffice/templates/backoffice/assembly_create.html
index f664bd96c..fcedd6362 100644
--- a/src/backoffice/templates/backoffice/assembly_create.html
+++ b/src/backoffice/templates/backoffice/assembly_create.html
@@ -19,4 +19,4 @@
</div>
{% endif %}
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assembly_detail.html b/src/backoffice/templates/backoffice/assembly_detail.html
index 929a77623..4a5503cc6 100644
--- a/src/backoffice/templates/backoffice/assembly_detail.html
+++ b/src/backoffice/templates/backoffice/assembly_detail.html
@@ -1,7 +1,9 @@
{% extends "backoffice/base.html" %}
{% load i18n %}
-{% block title %}{{ assembly.name }} | {{ conference.name }}{% endblock %}
+{% block title %}
+ {{ assembly.name }} | {{ conference.name }}
+{% endblock title %}
{% block content %}
<div class="row">
@@ -168,4 +170,4 @@
{% endif %}
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assembly_edit.html b/src/backoffice/templates/backoffice/assembly_edit.html
index 5da375d08..1b5cead2d 100644
--- a/src/backoffice/templates/backoffice/assembly_edit.html
+++ b/src/backoffice/templates/backoffice/assembly_edit.html
@@ -156,4 +156,4 @@
</div>
</div>
</form>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assembly_editchildren.html b/src/backoffice/templates/backoffice/assembly_editchildren.html
index 62eb31596..68c0092a0 100644
--- a/src/backoffice/templates/backoffice/assembly_editchildren.html
+++ b/src/backoffice/templates/backoffice/assembly_editchildren.html
@@ -64,4 +64,4 @@
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assembly_editlinks.html b/src/backoffice/templates/backoffice/assembly_editlinks.html
index 4d16958f6..b08a37a0c 100644
--- a/src/backoffice/templates/backoffice/assembly_editlinks.html
+++ b/src/backoffice/templates/backoffice/assembly_editlinks.html
@@ -66,4 +66,4 @@
</div>
{% endwith %}
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assembly_events.html b/src/backoffice/templates/backoffice/assembly_events.html
index 50e77bf47..ec65a69bf 100644
--- a/src/backoffice/templates/backoffice/assembly_events.html
+++ b/src/backoffice/templates/backoffice/assembly_events.html
@@ -4,12 +4,12 @@
{% block title %}
{% trans "Events" %} | {{ assembly.name }} | {{ conference.name }}
-{% endblock %}
+{% endblock title %}
{% block htmlhead %}
<link rel="stylesheet"
href="{% static 'vendor/datatables/datatables.min.css' %}">
-{% endblock %}
+{% endblock htmlhead %}
{% block scripts %}
<script src="{% static 'vendor/datatables/datatables.min.js' %}"></script>
@@ -44,7 +44,7 @@
});
});
</script>
-{% endblock %}
+{% endblock scripts %}
{% block content %}
{% include "backoffice/assembly_edit_header.html" %}
@@ -84,4 +84,4 @@
</div>
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assembly_list.html b/src/backoffice/templates/backoffice/assembly_list.html
index dea10b8fc..853316101 100644
--- a/src/backoffice/templates/backoffice/assembly_list.html
+++ b/src/backoffice/templates/backoffice/assembly_list.html
@@ -6,7 +6,7 @@
{% block htmlhead %}
<link rel="stylesheet"
href="{% static 'vendor/datatables/datatables.min.css' %}">
-{% endblock %}
+{% endblock htmlhead %}
{% block scripts %}
<script src="{% static 'vendor/datatables/datatables.min.js' %}"></script>
@@ -41,7 +41,7 @@
});
});
</script>
-{% endblock %}
+{% endblock scripts %}
{% block content %}
@@ -115,4 +115,4 @@
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assembly_list_export.html b/src/backoffice/templates/backoffice/assembly_list_export.html
index 6971243ef..62e817608 100644
--- a/src/backoffice/templates/backoffice/assembly_list_export.html
+++ b/src/backoffice/templates/backoffice/assembly_list_export.html
@@ -2,7 +2,7 @@
{% load i18n %}
{% block title %}
{% trans "Assemblys" %} | {{ conference.name }}
-{% endblock %}
+{% endblock title %}
{% block content %}
<div class="row">
<div class="col-md-12">
@@ -144,4 +144,4 @@
</div>
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assembly_members.html b/src/backoffice/templates/backoffice/assembly_members.html
index f2e86966f..709497ad1 100644
--- a/src/backoffice/templates/backoffice/assembly_members.html
+++ b/src/backoffice/templates/backoffice/assembly_members.html
@@ -4,7 +4,7 @@
{% block title %}
{% trans "Assembly__members" %} | {{ assembly.name }} | {{ conference.name }}
-{% endblock %}
+{% endblock title %}
{% block content %}
{% include "backoffice/assembly_edit_header.html" %}
@@ -135,4 +135,4 @@
</div>
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assembly_members_edit.html b/src/backoffice/templates/backoffice/assembly_members_edit.html
index 6ac9e9c09..23fc93427 100644
--- a/src/backoffice/templates/backoffice/assembly_members_edit.html
+++ b/src/backoffice/templates/backoffice/assembly_members_edit.html
@@ -47,4 +47,4 @@
</div>
</form>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assembly_room.html b/src/backoffice/templates/backoffice/assembly_room.html
index f99be68ef..ac51ff19d 100644
--- a/src/backoffice/templates/backoffice/assembly_room.html
+++ b/src/backoffice/templates/backoffice/assembly_room.html
@@ -3,13 +3,15 @@
{% load i18n %}
{% load widget_tweaks %}
-{% block title %}{{ room.name }} | {{ assembly.name }} | {{ conference.name }}{% endblock %}
+{% block title %}
+ {{ room.name }} | {{ assembly.name }} | {{ conference.name }}
+{% endblock title %}
{% block htmlhead %}
<style type="text/css">
div#description h3 { font-size: 100%; text-transform: uppercase; border-bottom: 1px solid #CCCCCC; }
</style>
-{% endblock %}
+{% endblock htmlhead %}
{% block content %}
{% include "backoffice/assembly_edit_header.html" %}
@@ -122,4 +124,4 @@
{% if not link_edit %}
{% include "backoffice/assembly_room_mgmt.html" %}
{% endif %}
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assembly_room_wa.html b/src/backoffice/templates/backoffice/assembly_room_wa.html
index 6e168da35..b1626d44d 100644
--- a/src/backoffice/templates/backoffice/assembly_room_wa.html
+++ b/src/backoffice/templates/backoffice/assembly_room_wa.html
@@ -4,7 +4,9 @@
{% load i18n %}
{% load widget_tweaks %}
-{% block title %}{{ room.name }} | {{ assembly.name }} | {{ conference.name }}{% endblock %}
+{% block title %}
+ {{ room.name }} | {{ assembly.name }} | {{ conference.name }}
+{% endblock title %}
{% block htmlhead %}
<style type="text/css">
@@ -14,7 +16,7 @@
border-bottom: 1px solid #CCCCCC;
}
</style>
-{% endblock %}
+{% endblock htmlhead %}
{% block content %}
{% include "backoffice/assembly_edit_header.html" %}
@@ -120,4 +122,4 @@
</div>
{# djlint:on #}
{% include "backoffice/assembly_room_mgmt.html" %}
- {% endblock %}
+ {% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assembly_vouchers.html b/src/backoffice/templates/backoffice/assembly_vouchers.html
index 3eb965196..746544a45 100644
--- a/src/backoffice/templates/backoffice/assembly_vouchers.html
+++ b/src/backoffice/templates/backoffice/assembly_vouchers.html
@@ -4,7 +4,7 @@
{% block title %}
{% trans "Vouchers" %} | {{ assembly.name }} | {{ conference.name }}
-{% endblock %}
+{% endblock title %}
{% block content %}
{% include "backoffice/assembly_edit_header.html" %}
@@ -55,4 +55,4 @@
{% endfor %}
<div class="pb-10rem"></div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assemblyteam_assembly_detail.html b/src/backoffice/templates/backoffice/assemblyteam_assembly_detail.html
index e95922538..99b475e93 100644
--- a/src/backoffice/templates/backoffice/assemblyteam_assembly_detail.html
+++ b/src/backoffice/templates/backoffice/assemblyteam_assembly_detail.html
@@ -347,4 +347,4 @@
btn_msg.addEventListener("click", function() { for (const el of document.getElementsByClassName("logentry")) { if (el.getAttribute("data-has-msg") == "n") el.classList.add("d-none"); } });
btn_msg.click();
</script>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assemblyteam_edithierarchy.html b/src/backoffice/templates/backoffice/assemblyteam_edithierarchy.html
index 9391cdcc3..b134f209d 100644
--- a/src/backoffice/templates/backoffice/assemblyteam_edithierarchy.html
+++ b/src/backoffice/templates/backoffice/assemblyteam_edithierarchy.html
@@ -40,4 +40,4 @@
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assemblyteam_editposition.html b/src/backoffice/templates/backoffice/assemblyteam_editposition.html
index cfe287691..aec20bf0c 100644
--- a/src/backoffice/templates/backoffice/assemblyteam_editposition.html
+++ b/src/backoffice/templates/backoffice/assemblyteam_editposition.html
@@ -114,4 +114,4 @@
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assemblyteam_editstate.html b/src/backoffice/templates/backoffice/assemblyteam_editstate.html
index b9c98b229..11d3f2795 100644
--- a/src/backoffice/templates/backoffice/assemblyteam_editstate.html
+++ b/src/backoffice/templates/backoffice/assemblyteam_editstate.html
@@ -40,4 +40,4 @@
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/assemblyteam_message.html b/src/backoffice/templates/backoffice/assemblyteam_message.html
index 1406a87fe..9ce754e31 100644
--- a/src/backoffice/templates/backoffice/assemblyteam_message.html
+++ b/src/backoffice/templates/backoffice/assemblyteam_message.html
@@ -112,4 +112,4 @@
</div>
{% endif %}
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/base.html b/src/backoffice/templates/backoffice/base.html
index dbb0a7d99..d87a697a7 100644
--- a/src/backoffice/templates/backoffice/base.html
+++ b/src/backoffice/templates/backoffice/base.html
@@ -7,7 +7,7 @@
<title>
{% block title %}
{{ conference.slug }} {% trans "title_suffix" %}
- {% endblock %}
+ {% endblock title %}
</title>
<!-- FNORD -->
<link rel="stylesheet"
@@ -20,7 +20,8 @@
{% if uses_map %}
{% include "core/map_header.html" %}
{% endif %}
- {% block htmlhead %}{% endblock %}
+ {% block htmlhead %}
+ {% endblock htmlhead %}
</head>
<body>
@@ -281,7 +282,7 @@
{% endfor %}
</nav>
{% endif %}
- {% endblock %}
+ {% endblock sidebar %}
<div class="container{% if user.is_authenticated and conferencemember == None %} pb-10rem{% endif %}"
style="margin-top: 1em">
@@ -294,20 +295,22 @@
</div>
{% endif %}
- {% block content %}{% endblock %}
+ {% block content %}
+ {% endblock content %}
{% block footer %}
{% if user.is_authenticated and conference.require_ticket and conferencemember == None %}
<!-- This is not very elegant but should do the job -->
<div class="alert alert-warning fixed-bottom mx-3">⚠ {% trans "backoffice__not_a_conference_member" %}</div>
{% endif %}
- {% endblock %}
+ {% endblock footer %}
</div>
</div>
- {% endblock %}
+ {% endblock fullcontent %}
<script src="{% static 'jquery-3.7.1.min.js' %}"></script>
<script src="{% static 'vendor/bootstrap5/bootstrap.bundle.min.js' %}"></script>
- {% block scripts %}{% endblock %}
+ {% block scripts %}
+ {% endblock scripts %}
<div class="legal-footer bg-dark p-1">
<a class="link-light"
href="https://legal.cccv.de/"
diff --git a/src/backoffice/templates/backoffice/event/list.html b/src/backoffice/templates/backoffice/event/list.html
index d047cd27c..4ce972dd2 100644
--- a/src/backoffice/templates/backoffice/event/list.html
+++ b/src/backoffice/templates/backoffice/event/list.html
@@ -6,7 +6,7 @@
{% block htmlhead %}
<link rel="stylesheet"
href="{% static 'vendor/datatables/datatables.min.css' %}">
-{% endblock %}
+{% endblock htmlhead %}
{% block scripts %}
<script src="{% static 'vendor/datatables/datatables.min.js' %}"></script>
diff --git a/src/backoffice/templates/backoffice/index.html b/src/backoffice/templates/backoffice/index.html
index 851e5cf1f..693606dc0 100644
--- a/src/backoffice/templates/backoffice/index.html
+++ b/src/backoffice/templates/backoffice/index.html
@@ -64,4 +64,4 @@
<p>{% trans "welcome_text" %}</p>
{% endif %}
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/login.html b/src/backoffice/templates/backoffice/login.html
index 690ce6c3a..d5bafa91f 100644
--- a/src/backoffice/templates/backoffice/login.html
+++ b/src/backoffice/templates/backoffice/login.html
@@ -35,4 +35,4 @@
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/map_floor_form.html b/src/backoffice/templates/backoffice/map_floor_form.html
index d110951c8..22e1b4021 100644
--- a/src/backoffice/templates/backoffice/map_floor_form.html
+++ b/src/backoffice/templates/backoffice/map_floor_form.html
@@ -2,7 +2,9 @@
{% load django_bootstrap5 %}
{% load i18n %}
-{% block title %}{{ object.name }}{% endblock %}
+{% block title %}
+ {{ object.name }}
+{% endblock title %}
{% block content %}
<div class="row mb-3">
@@ -35,4 +37,4 @@
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/map_floor_list.html b/src/backoffice/templates/backoffice/map_floor_list.html
index 1638ec1f2..3fb085ee9 100644
--- a/src/backoffice/templates/backoffice/map_floor_list.html
+++ b/src/backoffice/templates/backoffice/map_floor_list.html
@@ -6,7 +6,7 @@
{% block htmlhead %}
<link rel="stylesheet"
href="{% static 'vendor/datatables/datatables.min.css' %}">
-{% endblock %}
+{% endblock htmlhead %}
{% block scripts %}
<script src="{% static 'vendor/datatables/datatables.min.js' %}"></script>
@@ -41,7 +41,7 @@
});
});
</script>
-{% endblock %}
+{% endblock title %}
{% block content %}
@@ -74,4 +74,4 @@
</div>
</div>
-{% endblock %}
+{% endblock title %}
diff --git a/src/backoffice/templates/backoffice/map_poi_form.html b/src/backoffice/templates/backoffice/map_poi_form.html
index a49c1a3b0..99c57dec3 100644
--- a/src/backoffice/templates/backoffice/map_poi_form.html
+++ b/src/backoffice/templates/backoffice/map_poi_form.html
@@ -2,7 +2,9 @@
{% load django_bootstrap5 %}
{% load i18n %}
-{% block title %}{{ object.name }}{% endblock %}
+{% block title %}
+ {{ object.name }}
+{% endblock title %}
{% block content %}
<div class="row mb-3">
@@ -48,4 +50,4 @@
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/map_poi_list.html b/src/backoffice/templates/backoffice/map_poi_list.html
index 63a111c6f..fe3088da3 100644
--- a/src/backoffice/templates/backoffice/map_poi_list.html
+++ b/src/backoffice/templates/backoffice/map_poi_list.html
@@ -6,7 +6,7 @@
{% block htmlhead %}
<link rel="stylesheet"
href="{% static 'vendor/datatables/datatables.min.css' %}">
-{% endblock %}
+{% endblock htmlhead %}
{% block scripts %}
<script src="{% static 'vendor/datatables/datatables.min.js' %}"></script>
@@ -41,7 +41,7 @@
});
});
</script>
-{% endblock %}
+{% endblock script %}
{% block content %}
@@ -74,4 +74,4 @@
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/moderation_assembly-detail.html b/src/backoffice/templates/backoffice/moderation_assembly-detail.html
index 358260ca4..282cec37c 100644
--- a/src/backoffice/templates/backoffice/moderation_assembly-detail.html
+++ b/src/backoffice/templates/backoffice/moderation_assembly-detail.html
@@ -113,4 +113,4 @@
</div>
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/moderation_assembly-list.html b/src/backoffice/templates/backoffice/moderation_assembly-list.html
index d071e30da..e9ddaae20 100644
--- a/src/backoffice/templates/backoffice/moderation_assembly-list.html
+++ b/src/backoffice/templates/backoffice/moderation_assembly-list.html
@@ -6,7 +6,7 @@
{% block htmlhead %}
<link rel="stylesheet"
href="{% static 'vendor/datatables/datatables.min.css' %}">
-{% endblock %}
+{% endblock htmlhead %}
{% block scripts %}
<script src="{% static 'vendor/datatables/datatables.min.js' %}"></script>
@@ -41,7 +41,7 @@
});
});
</script>
-{% endblock %}
+{% endblock scripts %}
{% block content %}
@@ -124,4 +124,4 @@
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/moderation_badge-detail.html b/src/backoffice/templates/backoffice/moderation_badge-detail.html
index 7e41944ec..acaca02b9 100644
--- a/src/backoffice/templates/backoffice/moderation_badge-detail.html
+++ b/src/backoffice/templates/backoffice/moderation_badge-detail.html
@@ -83,4 +83,4 @@
</div>
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/moderation_badge-list.html b/src/backoffice/templates/backoffice/moderation_badge-list.html
index 307cbf2ce..170d5823f 100644
--- a/src/backoffice/templates/backoffice/moderation_badge-list.html
+++ b/src/backoffice/templates/backoffice/moderation_badge-list.html
@@ -6,7 +6,7 @@
{% block htmlhead %}
<link rel="stylesheet"
href="{% static 'vendor/datatables/datatables.min.css' %}">
-{% endblock %}
+{% endblock htmlhead %}
{% block scripts %}
<script src="{% static 'vendor/datatables/datatables.min.js' %}"></script>
@@ -41,7 +41,7 @@
});
});
</script>
-{% endblock %}
+{% endblock scripts %}
{% block content %}
@@ -78,4 +78,4 @@
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/moderation_board-detail.html b/src/backoffice/templates/backoffice/moderation_board-detail.html
index 8e054eb00..88f61e64f 100644
--- a/src/backoffice/templates/backoffice/moderation_board-detail.html
+++ b/src/backoffice/templates/backoffice/moderation_board-detail.html
@@ -78,4 +78,4 @@
</div>
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/moderation_board-list.html b/src/backoffice/templates/backoffice/moderation_board-list.html
index cc2d3bb36..986750ecf 100644
--- a/src/backoffice/templates/backoffice/moderation_board-list.html
+++ b/src/backoffice/templates/backoffice/moderation_board-list.html
@@ -6,7 +6,7 @@
{% block htmlhead %}
<link rel="stylesheet"
href="{% static 'vendor/datatables/datatables.min.css' %}">
-{% endblock %}
+{% endblock htmlhead %}
{% block scripts %}
<script src="{% static 'vendor/datatables/datatables.min.js' %}"></script>
@@ -41,7 +41,7 @@
});
});
</script>
-{% endblock %}
+{% endblock scripts %}
{% block content %}
@@ -80,4 +80,4 @@
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/moderation_event-detail.html b/src/backoffice/templates/backoffice/moderation_event-detail.html
index efc811551..032da6aa7 100644
--- a/src/backoffice/templates/backoffice/moderation_event-detail.html
+++ b/src/backoffice/templates/backoffice/moderation_event-detail.html
@@ -149,4 +149,4 @@
</div>
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/moderation_index.html b/src/backoffice/templates/backoffice/moderation_index.html
index 84a0b9a2f..d383b916d 100644
--- a/src/backoffice/templates/backoffice/moderation_index.html
+++ b/src/backoffice/templates/backoffice/moderation_index.html
@@ -61,4 +61,4 @@
</div>
</div>
{% endif %}
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/moderation_project-detail.html b/src/backoffice/templates/backoffice/moderation_project-detail.html
index e92eaaedd..b1d68c1c9 100644
--- a/src/backoffice/templates/backoffice/moderation_project-detail.html
+++ b/src/backoffice/templates/backoffice/moderation_project-detail.html
@@ -110,4 +110,4 @@
</div>
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/moderation_user-detail.html b/src/backoffice/templates/backoffice/moderation_user-detail.html
index d72de0238..1c5061493 100644
--- a/src/backoffice/templates/backoffice/moderation_user-detail.html
+++ b/src/backoffice/templates/backoffice/moderation_user-detail.html
@@ -233,4 +233,4 @@
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/moderation_user-list.html b/src/backoffice/templates/backoffice/moderation_user-list.html
index c833fa33b..8d82c41fe 100644
--- a/src/backoffice/templates/backoffice/moderation_user-list.html
+++ b/src/backoffice/templates/backoffice/moderation_user-list.html
@@ -6,7 +6,7 @@
{% block htmlhead %}
<link rel="stylesheet"
href="{% static 'vendor/datatables/datatables.min.css' %}">
-{% endblock %}
+{% endblock htmlhead %}
{% block scripts %}
<script src="{% static 'vendor/datatables/datatables.min.js' %}"></script>
@@ -41,7 +41,7 @@
});
});
</script>
-{% endblock %}
+{% endblock scripts %}
{% block content %}
@@ -76,4 +76,4 @@
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/moderation_user-rename.html b/src/backoffice/templates/backoffice/moderation_user-rename.html
index e16efb752..935dfb225 100644
--- a/src/backoffice/templates/backoffice/moderation_user-rename.html
+++ b/src/backoffice/templates/backoffice/moderation_user-rename.html
@@ -36,4 +36,4 @@
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/moderation_wiki-detail.html b/src/backoffice/templates/backoffice/moderation_wiki-detail.html
index 34aa0770d..889664cf0 100644
--- a/src/backoffice/templates/backoffice/moderation_wiki-detail.html
+++ b/src/backoffice/templates/backoffice/moderation_wiki-detail.html
@@ -92,4 +92,4 @@
</div>
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/moderation_wiki-list.html b/src/backoffice/templates/backoffice/moderation_wiki-list.html
index 4646e257a..d30fe275b 100644
--- a/src/backoffice/templates/backoffice/moderation_wiki-list.html
+++ b/src/backoffice/templates/backoffice/moderation_wiki-list.html
@@ -6,7 +6,7 @@
{% block htmlhead %}
<link rel="stylesheet"
href="{% static 'vendor/datatables/datatables.min.css' %}">
-{% endblock %}
+{% endblock htmlhead %}
{% block scripts %}
<script src="{% static 'vendor/datatables/datatables.min.js' %}"></script>
@@ -41,7 +41,7 @@
});
});
</script>
-{% endblock %}
+{% endblock scripts %}
{% block content %}
@@ -78,4 +78,4 @@
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/profile.html b/src/backoffice/templates/backoffice/profile.html
index 1b4331f8d..b716108c3 100644
--- a/src/backoffice/templates/backoffice/profile.html
+++ b/src/backoffice/templates/backoffice/profile.html
@@ -9,4 +9,4 @@
<p>Hi {{ user.get_full_name|default:user.username }}!</p>
<p>Hier gibt es derzeit nichts einzustellen. / There is nothing to be configured here right now.</p>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/room-new.html b/src/backoffice/templates/backoffice/room-new.html
index cf4e720a4..816d64cbe 100644
--- a/src/backoffice/templates/backoffice/room-new.html
+++ b/src/backoffice/templates/backoffice/room-new.html
@@ -2,7 +2,9 @@
{% load django_bootstrap5 %}
{% load i18n %}
-{% block title %}room++ | {{ assembly.name }} | {{ conference.name }}{% endblock %}
+{% block title %}
+ room++ | {{ assembly.name }} | {{ conference.name }}
+{% endblock title %}
{% block content %}
{% include "backoffice/assembly_edit_header.html" %}
@@ -176,4 +178,4 @@
{% endif %}
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/schedule_source-confirm_delete.html b/src/backoffice/templates/backoffice/schedule_source-confirm_delete.html
index 5266d999b..a9839909d 100644
--- a/src/backoffice/templates/backoffice/schedule_source-confirm_delete.html
+++ b/src/backoffice/templates/backoffice/schedule_source-confirm_delete.html
@@ -48,4 +48,4 @@
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/schedule_source-detail.html b/src/backoffice/templates/backoffice/schedule_source-detail.html
index 5886ad0cc..8407cc6cd 100644
--- a/src/backoffice/templates/backoffice/schedule_source-detail.html
+++ b/src/backoffice/templates/backoffice/schedule_source-detail.html
@@ -119,4 +119,4 @@
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/schedule_source-form.html b/src/backoffice/templates/backoffice/schedule_source-form.html
index d58adcabc..644e6d720 100644
--- a/src/backoffice/templates/backoffice/schedule_source-form.html
+++ b/src/backoffice/templates/backoffice/schedule_source-form.html
@@ -33,4 +33,4 @@
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/schedule_source-list.html b/src/backoffice/templates/backoffice/schedule_source-list.html
index f73f41f35..c284a73d2 100644
--- a/src/backoffice/templates/backoffice/schedule_source-list.html
+++ b/src/backoffice/templates/backoffice/schedule_source-list.html
@@ -67,4 +67,4 @@
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/schedule_source_import-detail.html b/src/backoffice/templates/backoffice/schedule_source_import-detail.html
index f7bd1b5b0..2e16e1271 100644
--- a/src/backoffice/templates/backoffice/schedule_source_import-detail.html
+++ b/src/backoffice/templates/backoffice/schedule_source_import-detail.html
@@ -102,4 +102,4 @@
</div>
{% endif %}
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/schedules_index.html b/src/backoffice/templates/backoffice/schedules_index.html
index 911e90c3c..e22f0592e 100644
--- a/src/backoffice/templates/backoffice/schedules_index.html
+++ b/src/backoffice/templates/backoffice/schedules_index.html
@@ -84,4 +84,4 @@
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/sos.html b/src/backoffice/templates/backoffice/sos.html
index acd58bfa1..ca441a001 100644
--- a/src/backoffice/templates/backoffice/sos.html
+++ b/src/backoffice/templates/backoffice/sos.html
@@ -4,7 +4,7 @@
{% block title %}
{% trans "Self-organized content" %} | {{ conference.name }}
-{% endblock %}
+{% endblock title %}
{% block htmlhead %}
<link rel="stylesheet"
diff --git a/src/backoffice/templates/backoffice/vouchers-list.html b/src/backoffice/templates/backoffice/vouchers-list.html
index a4af34aff..9d6453fa5 100644
--- a/src/backoffice/templates/backoffice/vouchers-list.html
+++ b/src/backoffice/templates/backoffice/vouchers-list.html
@@ -58,4 +58,4 @@
</table>
</div>
{% endif %}
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/wa-index.html b/src/backoffice/templates/backoffice/wa-index.html
index a0317336f..91e552381 100644
--- a/src/backoffice/templates/backoffice/wa-index.html
+++ b/src/backoffice/templates/backoffice/wa-index.html
@@ -75,4 +75,4 @@
</div>
{% endfor %}
{% endif %}
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/wa-map-detail.html b/src/backoffice/templates/backoffice/wa-map-detail.html
index 1a055bc3a..f5da6bc2c 100644
--- a/src/backoffice/templates/backoffice/wa-map-detail.html
+++ b/src/backoffice/templates/backoffice/wa-map-detail.html
@@ -21,7 +21,7 @@ $(function() {
});
});
</script>
-{% endblock %}
+{% endblock scripts %}
{% block content %}
@@ -231,4 +231,4 @@ $(function() {
</div>
{% endif %}
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/wa-map-list.html b/src/backoffice/templates/backoffice/wa-map-list.html
index 39c7e3dc0..2d7a0f159 100644
--- a/src/backoffice/templates/backoffice/wa-map-list.html
+++ b/src/backoffice/templates/backoffice/wa-map-list.html
@@ -5,7 +5,7 @@
{% block htmlhead %}
<link rel="stylesheet"
href="{% static 'vendor/datatables/datatables.min.css' %}">
-{% endblock %}
+{% endblock htmlhead %}
{% block scripts %}
<script src="{% static 'vendor/datatables/datatables.min.js' %}"></script>
@@ -40,7 +40,7 @@
});
});
</script>
-{% endblock %}
+{% endblock scripts %}
{% block content %}
@@ -80,4 +80,4 @@
</table>
</div>
{% endif %}
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/wa-session-detail.html b/src/backoffice/templates/backoffice/wa-session-detail.html
index daf388894..494270a98 100644
--- a/src/backoffice/templates/backoffice/wa-session-detail.html
+++ b/src/backoffice/templates/backoffice/wa-session-detail.html
@@ -151,4 +151,4 @@
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/wa-session-list.html b/src/backoffice/templates/backoffice/wa-session-list.html
index 3261bf3f8..51cf08e73 100644
--- a/src/backoffice/templates/backoffice/wa-session-list.html
+++ b/src/backoffice/templates/backoffice/wa-session-list.html
@@ -48,4 +48,4 @@
</table>
</div>
{% endif %}
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/wa-texture-form.html b/src/backoffice/templates/backoffice/wa-texture-form.html
index 4d20f0737..d016ebb3e 100644
--- a/src/backoffice/templates/backoffice/wa-texture-form.html
+++ b/src/backoffice/templates/backoffice/wa-texture-form.html
@@ -100,4 +100,4 @@
</div>
</div>
{% endif %}
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/wa-texture-list.html b/src/backoffice/templates/backoffice/wa-texture-list.html
index bb90bde69..07aa4b349 100644
--- a/src/backoffice/templates/backoffice/wa-texture-list.html
+++ b/src/backoffice/templates/backoffice/wa-texture-list.html
@@ -36,4 +36,4 @@
</tbody>
</table>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/wiki_lock_list.html b/src/backoffice/templates/backoffice/wiki_lock_list.html
index 80fcd670d..2d0213a6c 100644
--- a/src/backoffice/templates/backoffice/wiki_lock_list.html
+++ b/src/backoffice/templates/backoffice/wiki_lock_list.html
@@ -78,4 +78,4 @@
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/wiki_namespace_list.html b/src/backoffice/templates/backoffice/wiki_namespace_list.html
index fbe98aa62..b4b9d80f4 100644
--- a/src/backoffice/templates/backoffice/wiki_namespace_list.html
+++ b/src/backoffice/templates/backoffice/wiki_namespace_list.html
@@ -27,4 +27,4 @@
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/wiki_overview.html b/src/backoffice/templates/backoffice/wiki_overview.html
index c063f81af..e7699227e 100644
--- a/src/backoffice/templates/backoffice/wiki_overview.html
+++ b/src/backoffice/templates/backoffice/wiki_overview.html
@@ -34,4 +34,4 @@
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/wiki_page_detail.html b/src/backoffice/templates/backoffice/wiki_page_detail.html
index f5a38ea84..f54315ced 100644
--- a/src/backoffice/templates/backoffice/wiki_page_detail.html
+++ b/src/backoffice/templates/backoffice/wiki_page_detail.html
@@ -86,4 +86,4 @@
</div>
{% endif %}
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/backoffice/wiki_page_list.html b/src/backoffice/templates/backoffice/wiki_page_list.html
index d0c00ec83..28f85bb43 100644
--- a/src/backoffice/templates/backoffice/wiki_page_list.html
+++ b/src/backoffice/templates/backoffice/wiki_page_list.html
@@ -56,4 +56,4 @@
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/registration/change_password.html b/src/backoffice/templates/registration/change_password.html
index a549653bc..2df88c764 100644
--- a/src/backoffice/templates/registration/change_password.html
+++ b/src/backoffice/templates/registration/change_password.html
@@ -9,4 +9,4 @@
{% bootstrap_form form %}
<button type="submit" class="btn btn-primary">{% trans "password_change_btn" %}</button>
</form>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/registration/change_password_done.html b/src/backoffice/templates/registration/change_password_done.html
index c9ddf5cd2..f556f265c 100644
--- a/src/backoffice/templates/registration/change_password_done.html
+++ b/src/backoffice/templates/registration/change_password_done.html
@@ -6,4 +6,4 @@
<div class="alert alert-success">
<h3>{% trans "registration_change_password_done" %}</h3>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/registration/registration_form.html b/src/backoffice/templates/registration/registration_form.html
index f59376878..2777ccd35 100644
--- a/src/backoffice/templates/registration/registration_form.html
+++ b/src/backoffice/templates/registration/registration_form.html
@@ -9,4 +9,4 @@
{% bootstrap_form form %}
<button type="submit" class="btn btn-primary">{% trans "registration_signup_btn" %}</button>
</form>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/registration/reset_password_complete.html b/src/backoffice/templates/registration/reset_password_complete.html
index fd8617a4d..820bee569 100644
--- a/src/backoffice/templates/registration/reset_password_complete.html
+++ b/src/backoffice/templates/registration/reset_password_complete.html
@@ -6,4 +6,4 @@
<div class="alert alert-success">
<p>{% trans "registration_reset_password_complete" %}</p>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/registration/reset_password_confirm.html b/src/backoffice/templates/registration/reset_password_confirm.html
index 26e5ae4dc..479e2abc5 100644
--- a/src/backoffice/templates/registration/reset_password_confirm.html
+++ b/src/backoffice/templates/registration/reset_password_confirm.html
@@ -9,4 +9,4 @@
{% bootstrap_form form %}
<button type="submit" class="btn btn-primary">{% trans "password_reset_btn" %}</button>
</form>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/registration/reset_password_done.html b/src/backoffice/templates/registration/reset_password_done.html
index 82973b42b..03100841c 100644
--- a/src/backoffice/templates/registration/reset_password_done.html
+++ b/src/backoffice/templates/registration/reset_password_done.html
@@ -7,4 +7,4 @@
<h3>{% trans "registration_reset_password_done" %}</h3>
<p>{% trans "registration_reset_password_mailsent" %}</p>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/backoffice/templates/registration/signup_done.html b/src/backoffice/templates/registration/signup_done.html
index 8505686e4..39f0e9150 100644
--- a/src/backoffice/templates/registration/signup_done.html
+++ b/src/backoffice/templates/registration/signup_done.html
@@ -7,4 +7,4 @@
<h3>{% trans "registration_signup_done" %}</h3>
<p>{% trans "registration_signup_mailsent" %}</p>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/core/templates/rest_framework/api.html b/src/core/templates/rest_framework/api.html
index 4110378e2..35b569ae4 100644
--- a/src/core/templates/rest_framework/api.html
+++ b/src/core/templates/rest_framework/api.html
@@ -3,10 +3,10 @@
{% block title %}
{% if name %}{{ name }} –{% endif %}
HUB API
-{% endblock %}
+{% endblock title %}
{% block branding %}
<a class="navbar-brand"
rel="nofollow"
href="{% hub_absolute "api:index" %}">Hub API</a>
-{% endblock %}
+{% endblock branding %}
diff --git a/src/core/templates/rest_framework/login.html b/src/core/templates/rest_framework/login.html
index 63fb13f25..df34795f3 100644
--- a/src/core/templates/rest_framework/login.html
+++ b/src/core/templates/rest_framework/login.html
@@ -1,2 +1,4 @@
{% extends "rest_framework/login_base.html" %}
-{% block branding %}<h3 style="margin: 0 0 20px;">HUB API</h3>{% endblock %}
+{% block branding %}
+ <h3 style="margin: 0 0 20px;">HUB API</h3>
+{% endblock branding %}
diff --git a/src/plainui/jinja2/plainui/assemblies.html.j2 b/src/plainui/jinja2/plainui/assemblies.html.j2
index bf0861b95..4c14050ce 100644
--- a/src/plainui/jinja2/plainui/assemblies.html.j2
+++ b/src/plainui/jinja2/plainui/assemblies.html.j2
@@ -6,7 +6,9 @@
{% import "plainui/components/nav.html.j2" as navMacro with context %}
{% import "plainui/components/wiki.html.j2" as wikiMacro with context %}
-{% block title %}{{ conf.name }} - {{ _("Assemblies") }}{% endblock %}
+{% block title %}
+ {{ conf.name }} - {{ _("Assemblies") }}
+{% endblock title %}
{% block content %}
{{ navMacro.top_nav(_("Assemblies") ) }}
@@ -36,4 +38,4 @@
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/assemblies_all.html.j2 b/src/plainui/jinja2/plainui/assemblies_all.html.j2
index fd68c1189..06854a1e3 100644
--- a/src/plainui/jinja2/plainui/assemblies_all.html.j2
+++ b/src/plainui/jinja2/plainui/assemblies_all.html.j2
@@ -3,7 +3,9 @@
{% extends "plainui/base.html.j2" %}
-{% block title %}{{ conf.name }} - {{ _("all assemblies") }}{% endblock %}
+{% block title %}
+ {{ conf.name }} - {{ _("all assemblies") }}
+{% endblock title %}
{% block content %}
{{ navMacro.top_nav(_("all assemblies") ) }}
@@ -42,4 +44,4 @@
</div>
<hr class="hub-spacer">
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/assemblies_events.html.j2 b/src/plainui/jinja2/plainui/assemblies_events.html.j2
index 6e3b6b35d..32f9a1b01 100644
--- a/src/plainui/jinja2/plainui/assemblies_events.html.j2
+++ b/src/plainui/jinja2/plainui/assemblies_events.html.j2
@@ -3,7 +3,9 @@
{% extends "plainui/base.html.j2" %}
-{% block title %}{{ conf.name }} - {{ _("assembly events") }}{% endblock %}
+{% block title %}
+ {{ conf.name }} - {{ _("assembly events") }}
+{% endblock title %}
{% block content %}
{{ navMacro.top_nav(_("assembly events") ) }}
@@ -21,4 +23,4 @@
</div>
<hr class="hub-spacer">
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/assembly.html.j2 b/src/plainui/jinja2/plainui/assembly.html.j2
index 27bf9477a..ae8b3d11a 100644
--- a/src/plainui/jinja2/plainui/assembly.html.j2
+++ b/src/plainui/jinja2/plainui/assembly.html.j2
@@ -10,7 +10,9 @@
{% import "plainui/components/badge_elements.html.j2" as badge_elements with context %}
{% import "plainui/components/nav.html.j2" as navMacro with context %}
-{% block title %}{{ conf.name }} - Assembly {{ assembly.name }}{% endblock %}
+{% block title %}
+ {{ conf.name }} - Assembly {{ assembly.name }}
+{% endblock title %}
{% block content %}
{{ navMacro.top_nav(_("Assembly") , has_breadcrumbs=True) }}
@@ -127,4 +129,4 @@
</div>
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/badges/token_detail.html.j2 b/src/plainui/jinja2/plainui/badges/token_detail.html.j2
index cf3230e8f..1774b6c1f 100644
--- a/src/plainui/jinja2/plainui/badges/token_detail.html.j2
+++ b/src/plainui/jinja2/plainui/badges/token_detail.html.j2
@@ -26,4 +26,4 @@
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/base.html.j2 b/src/plainui/jinja2/plainui/base.html.j2
index 564f63e2e..21a4bf793 100644
--- a/src/plainui/jinja2/plainui/base.html.j2
+++ b/src/plainui/jinja2/plainui/base.html.j2
@@ -15,10 +15,12 @@
href="{{ static('plainui/img/favicon.ico') }}"
type="image/x-icon">
<title>
- {% block title %}{% endblock %}
+ {% block title %}
+ {% endblock title %}
</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
- {% block head %}{% endblock %}
+ {% block head %}
+ {% endblock head %}
<link href="{{ static('vendor/map/leaflet.css') }}" rel='stylesheet' />
<script src="{{ static('vendor/map/leaflet.js') }}"></script>
<link href="{{ static('vendor/map/leaflet.draw.css') }}" rel='stylesheet' />
@@ -74,7 +76,8 @@
{% endfor -%}
</div>
{% endif %}
- {%- block content %}{% endblock %}
+ {%- block content %}
+ {% endblock content %}
</main>
{% endblock fullpage -%}
{%- block fullpage_add -%}
diff --git a/src/plainui/jinja2/plainui/board.html.j2 b/src/plainui/jinja2/plainui/board.html.j2
index 1f3673889..8c91735ac 100644
--- a/src/plainui/jinja2/plainui/board.html.j2
+++ b/src/plainui/jinja2/plainui/board.html.j2
@@ -9,7 +9,7 @@
{% else %}
{{ _("Bulletin Board") }}
{% endif %}
-{% endblock %}
+{% endblock title %}
{% block content %}
{% if private %}
{{ navMacro.top_nav(_("My Bulletin Board") ) }}
@@ -87,4 +87,4 @@
{# archive mode #}
{{ _("archivemode_notavailable") }}
{% endif %}
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/channel_events.html.j2 b/src/plainui/jinja2/plainui/channel_events.html.j2
index 2f1d431a2..7581cb7e7 100644
--- a/src/plainui/jinja2/plainui/channel_events.html.j2
+++ b/src/plainui/jinja2/plainui/channel_events.html.j2
@@ -5,8 +5,10 @@
{% block head %}
<script src="{{ static('plainui/js/player.js') }}"></script>
<script async src="{{ static('plainui/js/modal.js') }}"></script>
-{% endblock %}
-{% block title %}{{ conf.name }} - {{ _("Main Program") }}{% endblock %}
+{% endblock head %}
+{% block title %}
+ {{ conf.name }} - {{ _("Main Program") }}
+{% endblock title %}
{% block content %}
{{ titleMacro.title(title=_("Main Program") ) }}
@@ -126,4 +128,4 @@
</div>
{% endfor %}
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/component_gallery.html.j2 b/src/plainui/jinja2/plainui/component_gallery.html.j2
index f20e86e13..11a514977 100644
--- a/src/plainui/jinja2/plainui/component_gallery.html.j2
+++ b/src/plainui/jinja2/plainui/component_gallery.html.j2
@@ -18,7 +18,9 @@
{% import "plainui/components/map.html.j2" as mapMacro %}
{% import "plainui/components/alert.html.j2" as alert %}
-{% block title %}Components Gallery{% endblock %}
+{% block title %}
+ Components Gallery
+{% endblock title %}
{% set image_url = "https://picsum.photos/1400/800" %}
@@ -335,4 +337,4 @@
{% endcall %}
</dd>
</dl>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/conferences.html.j2 b/src/plainui/jinja2/plainui/conferences.html.j2
index 5ed87ec9e..4a5810f32 100644
--- a/src/plainui/jinja2/plainui/conferences.html.j2
+++ b/src/plainui/jinja2/plainui/conferences.html.j2
@@ -1,5 +1,7 @@
{% extends "plainui/base.html.j2" %}
-{% block title %}{{ _("Conferences") }}{% endblock %}
+{% block title %}
+ {{ _("Conferences") }}
+{% endblock title %}
{% block content %}
{{ titleMacro.title(_("Conferences") ) }}
<ul class="my-11">
@@ -9,4 +11,4 @@
</li>
{% endfor %}
</ul>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/dereferrer.html.j2 b/src/plainui/jinja2/plainui/dereferrer.html.j2
index 92387d7be..c580ab3c2 100644
--- a/src/plainui/jinja2/plainui/dereferrer.html.j2
+++ b/src/plainui/jinja2/plainui/dereferrer.html.j2
@@ -1,5 +1,7 @@
{% extends "plainui/base.html.j2" %}
-{% block title %}Dereferrer{% endblock %}
+{% block title %}
+ Dereferrer
+{% endblock title %}
{% block content %}
<article class="d-flex justify-content-center align-items-center my-11">
@@ -36,4 +38,4 @@
</section>
</article>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/event.html.j2 b/src/plainui/jinja2/plainui/event.html.j2
index 80428cfda..ab52b602a 100644
--- a/src/plainui/jinja2/plainui/event.html.j2
+++ b/src/plainui/jinja2/plainui/event.html.j2
@@ -18,9 +18,13 @@
{% extends "plainui/base.html.j2" %}
-{% block title %}{{ event.name }} - {{ conf.slug.upper() }}{% endblock %}
+{% block title %}
+ {{ event.name }} - {{ conf.slug.upper() }}
+{% endblock title %}
-{% block head %}<script src="{{ static('plainui/js/player.js') }}"></script>{% endblock %}
+{% block head %}
+ <script src="{{ static('plainui/js/player.js') }}"></script>
+{% endblock head %}
{% block content %}
<article class="mt-10">
{{ navMacro.top_nav(_("Event") , has_breadcrumbs=True) }}
@@ -175,4 +179,4 @@
</div>
</article>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/fahrplan.html.j2 b/src/plainui/jinja2/plainui/fahrplan.html.j2
index b7c1439f2..ffee9d5f1 100644
--- a/src/plainui/jinja2/plainui/fahrplan.html.j2
+++ b/src/plainui/jinja2/plainui/fahrplan.html.j2
@@ -22,7 +22,9 @@
{% endif %}">{{ t.name }}</button>
{% endmacro %}
-{% block title %}Conference {{ conf.name }}{% endblock %}
+{% block title %}
+ Conference {{ conf.name }}
+{% endblock title %}
{% block content %}
{{ navMacro.top_nav(_("Fahrplan") ) }}
@@ -111,10 +113,10 @@
{% endif %}
{% if mode == 'list' %}{{ list_events.list(events, my_favorite_events) }}{% endif %}
- {% endblock %}
+ {% endblock content %}
{% block fullpage_add %}
{% if mode == 'calendar' %}<div class="p-3 border m-2">{{ calendar(events) }}</div>{% endif %}
- {% endblock %}
+ {% endblock fullpage_add %}
diff --git a/src/plainui/jinja2/plainui/index.html.j2 b/src/plainui/jinja2/plainui/index.html.j2
index 305a9cd2f..5b25fab27 100644
--- a/src/plainui/jinja2/plainui/index.html.j2
+++ b/src/plainui/jinja2/plainui/index.html.j2
@@ -6,8 +6,12 @@
{% import "plainui/components/buttons.html.j2" as buttonsMacro %}
{% import "plainui/components/list_events.html.j2" as list_events with context %}
-{% block title %}{{ conf.name }} - Index{% endblock %}
-{% block head %}<script src="{{ static('plainui/js/player.js') }}" /></script>{% endblock %}
+{% block title %}
+ {{ conf.name }} - Index
+{% endblock title %}
+{% block head %}
+ <script src="{{ static('plainui/js/player.js') }}" /></script>
+{% endblock head %}
{% block content %}
{% set start_title, start_body = fetch_wiki_page('start') %}
@@ -66,4 +70,4 @@
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/landing.html.j2 b/src/plainui/jinja2/plainui/landing.html.j2
index c33b6614d..12346f02d 100644
--- a/src/plainui/jinja2/plainui/landing.html.j2
+++ b/src/plainui/jinja2/plainui/landing.html.j2
@@ -1,5 +1,7 @@
{% extends "plainui/base.html.j2" %}
-{% block title %}Conference {{ conf.name }}{% endblock %}
+{% block title %}
+ Conference {{ conf.name }}
+{% endblock title %}
{% block fullpage %}
<article class="hub-landing">
@@ -75,4 +77,4 @@
</header>
</article>
-{% endblock %}
+{% endblock fullpage %}
diff --git a/src/plainui/jinja2/plainui/login.html.j2 b/src/plainui/jinja2/plainui/login.html.j2
index e264e4bf0..9f25baf47 100644
--- a/src/plainui/jinja2/plainui/login.html.j2
+++ b/src/plainui/jinja2/plainui/login.html.j2
@@ -5,7 +5,7 @@
{% block title %}
{{ _("%(conf)s - Login", conf=conf.name) }}
-{% endblock %}
+{% endblock title %}
{% block fullpage %}
<article class="container">
@@ -53,4 +53,4 @@
<hr class="hub-spacer">
</article>
-{% endblock %}
+{% endblock fullpage %}
diff --git a/src/plainui/jinja2/plainui/password_change.html.j2 b/src/plainui/jinja2/plainui/password_change.html.j2
index 9a5bb0a89..9ab7f71e0 100644
--- a/src/plainui/jinja2/plainui/password_change.html.j2
+++ b/src/plainui/jinja2/plainui/password_change.html.j2
@@ -1,7 +1,9 @@
{% import "plainui/components/form_elements.html.j2" as form_elements %}
{% import "plainui/components/logo.html.j2" as logoMacro %}
{% extends "plainui/base.html.j2" %}
-{% block title %}{{ conf.name }} - {{ _("Change Password") }}{% endblock %}
+{% block title %}
+ {{ conf.name }} - {{ _("Change Password") }}
+{% endblock title %}
{% block content %}
<div class="row justify-content-center px-6 mt-11 mb-8">
@@ -25,4 +27,4 @@
</div>
</form>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/password_reset_complete.html.j2 b/src/plainui/jinja2/plainui/password_reset_complete.html.j2
index 434f15033..3b8305dd5 100644
--- a/src/plainui/jinja2/plainui/password_reset_complete.html.j2
+++ b/src/plainui/jinja2/plainui/password_reset_complete.html.j2
@@ -2,7 +2,7 @@
{% import "plainui/components/logo.html.j2" as logoMacro %}
{% block title %}
{{ _("%(conf)s - Password Reset complete", conf=conf.name) }}
-{% endblock %}
+{% endblock title %}
{% block fullpage %}
<article class="hub-landing">
@@ -24,4 +24,4 @@
<hr class="hub-spacer">
</article>
-{% endblock %}
+{% endblock fullpage %}
diff --git a/src/plainui/jinja2/plainui/password_reset_confirm.html.j2 b/src/plainui/jinja2/plainui/password_reset_confirm.html.j2
index 2b27e9b42..e58765772 100644
--- a/src/plainui/jinja2/plainui/password_reset_confirm.html.j2
+++ b/src/plainui/jinja2/plainui/password_reset_confirm.html.j2
@@ -3,7 +3,7 @@
{% extends "plainui/base.html.j2" %}
{% block title %}
{{ _("%(conf)s - Reset Password", conf=conf.name) }}
-{% endblock %}
+{% endblock title %}
{% block fullpage %}
<article class="hub-landing">
@@ -34,4 +34,4 @@
<hr class="hub-spacer">
</article>
-{% endblock %}
+{% endblock fullpage %}
diff --git a/src/plainui/jinja2/plainui/password_reset_done.html.j2 b/src/plainui/jinja2/plainui/password_reset_done.html.j2
index 37feafd83..404a9cc02 100644
--- a/src/plainui/jinja2/plainui/password_reset_done.html.j2
+++ b/src/plainui/jinja2/plainui/password_reset_done.html.j2
@@ -2,7 +2,7 @@
{% import "plainui/components/logo.html.j2" as logoMacro %}
{% block title %}
{{ _("%(conf)s - Password Reset sent", conf=conf.name) }}
-{% endblock %}
+{% endblock title %}
{% block fullpage %}
<article class="hub-landing">
@@ -31,4 +31,4 @@
<hr class="hub-spacer">
</article>
-{% endblock %}
+{% endblock fullpage %}
diff --git a/src/plainui/jinja2/plainui/personal_message_list.html.j2 b/src/plainui/jinja2/plainui/personal_message_list.html.j2
index 6b9ce22df..19ddd35f5 100644
--- a/src/plainui/jinja2/plainui/personal_message_list.html.j2
+++ b/src/plainui/jinja2/plainui/personal_message_list.html.j2
@@ -3,7 +3,9 @@
{% extends "plainui/base.html.j2" %}
-{% block title %}{{ conf.name }} - {{ _("Personal Messages") }}{% endblock %}
+{% block title %}
+ {{ conf.name }} - {{ _("Personal Messages") }}
+{% endblock title %}
{% block content %}
{{ navMacro.top_nav(_("Personal Messages") ) }}
@@ -153,4 +155,4 @@
<p class="font-headings text-white text-right p-0">{{ msgs | length }} {{ _("messages_x_of_n") }} {{ total }}</p>
</form>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/personal_message_send.html.j2 b/src/plainui/jinja2/plainui/personal_message_send.html.j2
index 0bac33c6f..e0c6eb5d5 100644
--- a/src/plainui/jinja2/plainui/personal_message_send.html.j2
+++ b/src/plainui/jinja2/plainui/personal_message_send.html.j2
@@ -3,7 +3,9 @@
{% extends "plainui/base.html.j2" %}
-{% block title %}{{ conf.name }} - {{ _("Personal Messages - Send") }}{% endblock %}
+{% block title %}
+ {{ conf.name }} - {{ _("Personal Messages - Send") }}
+{% endblock title %}
{% block content %}
{{ navMacro.top_nav(_("Send Personal Message") , has_breadcrumbs=True) }}
@@ -39,4 +41,4 @@
</form>
<hr class="hub-spacer">
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/personal_message_show.html.j2 b/src/plainui/jinja2/plainui/personal_message_show.html.j2
index 9cf1d4fec..ae39db88d 100644
--- a/src/plainui/jinja2/plainui/personal_message_show.html.j2
+++ b/src/plainui/jinja2/plainui/personal_message_show.html.j2
@@ -4,7 +4,9 @@
{% extends "plainui/base.html.j2" %}
-{% block title %}{{ conf.name }} - {{ _("Personal Message") }}{% endblock %}
+{% block title %}
+ {{ conf.name }} - {{ _("Personal Message") }}
+{% endblock title %}
{% block content %}
{{ navMacro.top_nav(_("Message from %(user)s", user=msg.sender.display_name) , has_breadcrumbs=True) }}
@@ -61,4 +63,4 @@
{{ markdown(msg_body) }}
</article>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/profile.html.j2 b/src/plainui/jinja2/plainui/profile.html.j2
index ed9587f11..1a95c223a 100644
--- a/src/plainui/jinja2/plainui/profile.html.j2
+++ b/src/plainui/jinja2/plainui/profile.html.j2
@@ -11,7 +11,9 @@
{% import "plainui/components/tagbox.html.j2" as tagMacros %}
{% import "plainui/components/badge_elements.html.j2" as badgeMacros with context %}
-{% block title %}{{ conf.name }} - {{ _("Profile") }}{% endblock %}
+{% block title %}
+ {{ conf.name }} - {{ _("Profile") }}
+{% endblock title %}
{% block content %}
{{ navMacro.top_nav(_("My Dashboard") ) }}
@@ -132,4 +134,4 @@
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/projects/detail.html.j2 b/src/plainui/jinja2/plainui/projects/detail.html.j2
index 97e0fe1f1..dc5f2e6dc 100644
--- a/src/plainui/jinja2/plainui/projects/detail.html.j2
+++ b/src/plainui/jinja2/plainui/projects/detail.html.j2
@@ -6,8 +6,12 @@
{% import "plainui/components/function_btns.html.j2" as fbtns with context %}
{% extends "plainui/base.html.j2" %}
-{% block title %}Conference {{ conf.name }} - Project {{ project.name }}{% endblock %}
-{% block head %}<script src="{{ static('plainui/js/player.js') }}" /></script>{% endblock %}
+{% block title %}
+ Conference {{ conf.name }} - Project {{ project.name }}
+{% endblock title %}
+{% block head %}
+ <script src="{{ static('plainui/js/player.js') }}" /></script>
+{% endblock head %}
{% block content %}
{{ navMacro.top_nav(_("Project") , has_breadcrumbs=True) }}
<nav aria-label="breadcrumb">
@@ -89,4 +93,4 @@
{% endif %}
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/public_fahrplan.html.j2 b/src/plainui/jinja2/plainui/public_fahrplan.html.j2
index 54f833002..f69aca7d6 100644
--- a/src/plainui/jinja2/plainui/public_fahrplan.html.j2
+++ b/src/plainui/jinja2/plainui/public_fahrplan.html.j2
@@ -14,7 +14,8 @@
type="image/x-icon">
<title>{{ _("%(conf)s - Public Fahrplan", conf=conf.name) }}</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
- {% block head %}{% endblock %}
+ {% block head %}
+ {% endblock head %}
<script>
document.addEventListener('DOMContentLoaded', (e) => {
document.querySelector('html').classList.remove('no-js');
diff --git a/src/plainui/jinja2/plainui/redeem_badge.html.j2 b/src/plainui/jinja2/plainui/redeem_badge.html.j2
index 6e7ef8fbf..283cfa7de 100644
--- a/src/plainui/jinja2/plainui/redeem_badge.html.j2
+++ b/src/plainui/jinja2/plainui/redeem_badge.html.j2
@@ -1,7 +1,9 @@
{% extends "plainui/base.html.j2" %}
{% import "plainui/components/form_elements.html.j2" as form_elements %}
-{% block title %}{{ conf.name }} - {{ _("Profile") }}{% endblock %}
+{% block title %}
+ {{ conf.name }} - {{ _("Profile") }}
+{% endblock title %}
{% block content %}
{{ titleMacro.title(_("Redeem Badge Token") ) }}
@@ -24,4 +26,4 @@
</form>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/redeem_token.html.j2 b/src/plainui/jinja2/plainui/redeem_token.html.j2
index fcedb2fcf..b9e6c0a67 100644
--- a/src/plainui/jinja2/plainui/redeem_token.html.j2
+++ b/src/plainui/jinja2/plainui/redeem_token.html.j2
@@ -5,7 +5,7 @@
{% block title %}
{{ _("Conference %(conf)s - Redeem Token", conf=conf.name) }}
-{% endblock %}
+{% endblock title %}
{% block content %}
{{ titleMacro.title(_("Redeem Token") ) }}
@@ -107,4 +107,4 @@
{% call alert.info(class="my-8") %}
{{ _("User accounts from maschinenraum.rc3.world can be used to login.") }}
{% endcall %}
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/registration/password_reset_form.html.j2 b/src/plainui/jinja2/plainui/registration/password_reset_form.html.j2
index b9b04457b..dc1720129 100644
--- a/src/plainui/jinja2/plainui/registration/password_reset_form.html.j2
+++ b/src/plainui/jinja2/plainui/registration/password_reset_form.html.j2
@@ -3,7 +3,7 @@
{% extends "plainui/base.html.j2" %}
{% block title %}
{{ _("%(conf)s - Reset Password", conf=conf.name) }}
-{% endblock %}
+{% endblock title %}
{% block fullpage %}
<article class="hub-landing">
<figure class="hub-landing__logo">
@@ -42,4 +42,4 @@
<hr class="hub-spacer">
</article>
-{% endblock %}
+{% endblock fullpage %}
diff --git a/src/plainui/jinja2/plainui/report_content.html.j2 b/src/plainui/jinja2/plainui/report_content.html.j2
index f68848515..363cdb9d2 100644
--- a/src/plainui/jinja2/plainui/report_content.html.j2
+++ b/src/plainui/jinja2/plainui/report_content.html.j2
@@ -4,7 +4,9 @@
{% extends "plainui/base.html.j2" %}
-{% block title %}_("Report Content") - {{ conf.name }}{% endblock %}
+{% block title %}
+ _("Report Content") - {{ conf.name }}
+{% endblock title %}
{% block content %}
{{ navMacro.top_nav(_("Help, there is a Problem...") ) }}
@@ -61,4 +63,4 @@
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/room.html.j2 b/src/plainui/jinja2/plainui/room.html.j2
index 91cc9c9aa..0497b0a10 100644
--- a/src/plainui/jinja2/plainui/room.html.j2
+++ b/src/plainui/jinja2/plainui/room.html.j2
@@ -6,9 +6,13 @@
{% extends "plainui/base.html.j2" %}
-{% block title %}Conference {{ conf.name }} - Room {{ room.name }}{% endblock %}
+{% block title %}
+ Conference {{ conf.name }} - Room {{ room.name }}
+{% endblock title %}
-{% block head %}<script src="{{ static('plainui/js/player.js') }}" /></script>{% endblock %}
+{% block head %}
+ <script src="{{ static('plainui/js/player.js') }}" /></script>
+{% endblock head %}
{% block content %}
{{ navMacro.top_nav(_("Room") , has_breadcrumbs=True) }}
@@ -66,4 +70,4 @@
{% endif %}
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/search.html.j2 b/src/plainui/jinja2/plainui/search.html.j2
index c9a2c5c7c..ca787b0a7 100644
--- a/src/plainui/jinja2/plainui/search.html.j2
+++ b/src/plainui/jinja2/plainui/search.html.j2
@@ -3,7 +3,9 @@
{% extends "plainui/base.html.j2" %}
-{% block title %}{{ conf.name }} - {{ _("Search Results") }}{% endblock %}
+{% block title %}
+ {{ conf.name }} - {{ _("Search Results") }}
+{% endblock title %}
{% block content %}
@@ -46,4 +48,4 @@
{{ _("No results, sorry!") }}
{%- endfor %}
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/signup.html.j2 b/src/plainui/jinja2/plainui/signup.html.j2
index e4d6ae942..58d0f4db8 100644
--- a/src/plainui/jinja2/plainui/signup.html.j2
+++ b/src/plainui/jinja2/plainui/signup.html.j2
@@ -3,7 +3,7 @@
{% import "plainui/components/logo.html.j2" as logoMacro %}
{% block title %}
{{ _("%(conf)s - Registration", conf=conf.name) }}
-{% endblock %}
+{% endblock title %}
{% block fullpage %}
<article class="container">
@@ -40,4 +40,4 @@
<hr class="hub-spacer">
</article>
-{% endblock %}
+{% endblock fullpage %}
diff --git a/src/plainui/jinja2/plainui/signup_done.html.j2 b/src/plainui/jinja2/plainui/signup_done.html.j2
index e366255ee..01ab9bdcd 100644
--- a/src/plainui/jinja2/plainui/signup_done.html.j2
+++ b/src/plainui/jinja2/plainui/signup_done.html.j2
@@ -3,7 +3,7 @@
{% import "plainui/components/logo.html.j2" as logoMacro %}
{% block title %}
{{ _("%(conf)s - Registration", conf=conf.name) }}
-{% endblock %}
+{% endblock title %}
{% block fullpage %}
<article class="container">
@@ -17,4 +17,4 @@
<hr class="hub-spacer">
</article>
-{% endblock %}
+{% endblock fullpage %}
diff --git a/src/plainui/jinja2/plainui/sos.html.j2 b/src/plainui/jinja2/plainui/sos.html.j2
index 366534526..bb4e6ba3f 100644
--- a/src/plainui/jinja2/plainui/sos.html.j2
+++ b/src/plainui/jinja2/plainui/sos.html.j2
@@ -3,8 +3,10 @@
{% import "plainui/components/nav.html.j2" as navMacro with context %}
{% import "plainui/components/wiki.html.j2" as wikiMacro with context %}
-{# Translators: Website title #}
-{% block title %}{{ conf.name }} - {{ _("self-organized sessions") }}{% endblock %}
+{% block title %}
+ {# Translators: Website title #}
+ {{ conf.name }} - {{ _("self-organized sessions") }}
+{% endblock title %}
{% block content %}
{{ navMacro.top_nav(_("self-organized sessions") ) }}
<div class="hub-vlayout-l">
@@ -21,4 +23,4 @@
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/sos_edit.html.j2 b/src/plainui/jinja2/plainui/sos_edit.html.j2
index 3d8f8d2d7..171eba037 100644
--- a/src/plainui/jinja2/plainui/sos_edit.html.j2
+++ b/src/plainui/jinja2/plainui/sos_edit.html.j2
@@ -1,6 +1,8 @@
{% import "plainui/components/form_elements.html.j2" as form_elements %}
{% extends "plainui/base.html.j2" %}
-{% block title %}{{ conf.name }} - Edit Self-organized Session{% endblock %}
+{% block title %}
+ {{ conf.name }} - Edit Self-organized Session
+{% endblock title %}
{% block content %}
<form method="post"
class="border p-0 mx-auto my-11 {% if form.errors %}border-danger{% endif %}">
@@ -30,4 +32,4 @@
{{ form_elements.errors(form) }}
</div>
</form>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/static_page.html.j2 b/src/plainui/jinja2/plainui/static_page.html.j2
index 010138b32..4bc92c9a3 100644
--- a/src/plainui/jinja2/plainui/static_page.html.j2
+++ b/src/plainui/jinja2/plainui/static_page.html.j2
@@ -11,7 +11,7 @@
{% else %}
{{ _("missing page") }}
{% endif %}
-{% endblock %}
+{% endblock title %}
{% block content %}
{%- if not page %}
@@ -60,4 +60,4 @@
<article class="hub-text">{{ markdownMacro.markdown(markdown=page_body | safe, border=False) }}</article>
</div>
{% endif %}
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/static_page_diff.html.j2 b/src/plainui/jinja2/plainui/static_page_diff.html.j2
index 469e54323..194e1d0c3 100644
--- a/src/plainui/jinja2/plainui/static_page_diff.html.j2
+++ b/src/plainui/jinja2/plainui/static_page_diff.html.j2
@@ -1,7 +1,9 @@
{% extends "plainui/base.html.j2" %}
{% import "plainui/components/markdown.html.j2" as markdownMacro %}
{% import "plainui/components/nav.html.j2" as navMacro with context %}
-{% block title %}{{ conf.name }} - {{ page.title }}{% endblock %}
+{% block title %}
+ {{ conf.name }} - {{ page.title }}
+{% endblock title %}
{% block content %}
{{ navMacro.top_nav(_("Compare") ) }}
@@ -32,4 +34,4 @@
</div>
<article class="pb-11">{{ diff |safe }}</article>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/static_page_edit.html.j2 b/src/plainui/jinja2/plainui/static_page_edit.html.j2
index f18cfb084..aee948651 100644
--- a/src/plainui/jinja2/plainui/static_page_edit.html.j2
+++ b/src/plainui/jinja2/plainui/static_page_edit.html.j2
@@ -2,7 +2,9 @@
{% import "plainui/components/form_elements.html.j2" as formElements %}
{% import "plainui/components/markdown.html.j2" as markdownMacro %}
{% import "plainui/components/nav.html.j2" as navMacro with context %}
-{% block title %}{{ conf.name }} - {{ page.title }}{% endblock %}
+{% block title %}
+ {{ conf.name }} - {{ page.title }}
+{% endblock title %}
{% block content %}
{{ navMacro.top_nav(_("Edit") ) }}
@@ -65,7 +67,7 @@
</div>
</form>
</article>
-{% endblock %}
+{% endblock content %}
{% block jstools %}
{% if page_slug and lock_id %}
@@ -84,4 +86,4 @@
setInterval(refresh_lock, {{ lock_refresh_interval | tojson}} * 1000);
</script>
{% endif %}
-{% endblock %}
+{% endblock jstools %}
diff --git a/src/plainui/jinja2/plainui/static_page_global_history.html.j2 b/src/plainui/jinja2/plainui/static_page_global_history.html.j2
index f9865696a..42217e6a0 100644
--- a/src/plainui/jinja2/plainui/static_page_global_history.html.j2
+++ b/src/plainui/jinja2/plainui/static_page_global_history.html.j2
@@ -1,7 +1,9 @@
{% extends "plainui/base.html.j2" %}
{% import "plainui/components/markdown.html.j2" as markdownMacro %}
{% import "plainui/components/nav.html.j2" as navMacro with context %}
-{% block title %}{{ conf.name }} - {{ _("Page Modifications") }}{% endblock %}
+{% block title %}
+ {{ conf.name }} - {{ _("Page Modifications") }}
+{% endblock title %}
{% block content %}
{{ navMacro.top_nav(_("Page Modifications") ) }}
@@ -36,4 +38,4 @@
</div>
</article>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/static_page_history.html.j2 b/src/plainui/jinja2/plainui/static_page_history.html.j2
index 3fdbb0074..7b41d0094 100644
--- a/src/plainui/jinja2/plainui/static_page_history.html.j2
+++ b/src/plainui/jinja2/plainui/static_page_history.html.j2
@@ -1,7 +1,9 @@
{% extends "plainui/base.html.j2" %}
{% import "plainui/components/markdown.html.j2" as markdownMacro %}
{% import "plainui/components/nav.html.j2" as navMacro with context %}
-{% block title %}{{ conf.name }} - {{ page.title }}{% endblock %}
+{% block title %}
+ {{ conf.name }} - {{ page.title }}
+{% endblock title %}
{% block content %}
{{ navMacro.top_nav(_("History") ) }}
@@ -39,4 +41,4 @@
</form>
</article>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/tag.html.j2 b/src/plainui/jinja2/plainui/tag.html.j2
index 32a09c1ac..64d94531b 100644
--- a/src/plainui/jinja2/plainui/tag.html.j2
+++ b/src/plainui/jinja2/plainui/tag.html.j2
@@ -7,7 +7,7 @@
{% block title %}
{{ conf.name }} - {{ _("Tag %(name)s", name=tag.slug) }}
-{% endblock %}
+{% endblock title %}
{% block content %}
{{ navMacro.top_nav(_("Tag %(name)s", name=tag.slug) ) }}
@@ -28,4 +28,4 @@
{{ list_projects.list(projects,my_favorite_projects, metadata=false) }}
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/token_password_reset.html.j2 b/src/plainui/jinja2/plainui/token_password_reset.html.j2
index 5e304c7f3..7fbe04ffe 100644
--- a/src/plainui/jinja2/plainui/token_password_reset.html.j2
+++ b/src/plainui/jinja2/plainui/token_password_reset.html.j2
@@ -2,7 +2,7 @@
{% import "plainui/components/form_elements.html.j2" as form_elements %}
{% block title %}
{{ _("Conference %(conf)s - Password Reset", conf=conf.name) }}
-{% endblock %}
+{% endblock title %}
{% block content %}
{{ titleMacro.title(_("Password Reset") ) }}
@@ -25,4 +25,4 @@
</form>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/upcoming.html.j2 b/src/plainui/jinja2/plainui/upcoming.html.j2
index 40c75937c..50004f639 100644
--- a/src/plainui/jinja2/plainui/upcoming.html.j2
+++ b/src/plainui/jinja2/plainui/upcoming.html.j2
@@ -1,9 +1,11 @@
{% extends "plainui/base.html.j2" %}
{% import "plainui/components/list_events.html.j2" as list_events with context %}
-{% block title %}{{ conf.name }} - {{ _("Upcoming") }}{% endblock %}
+{% block title %}
+ {{ conf.name }} - {{ _("Upcoming") }}
+{% endblock title %}
{% block content %}
{{ titleMacro.title(_("Upcoming events") ) }}
<div class="border mt-8 mb-11 p-3">{{ list_events.slider(events, my_favorite_events) }}</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/user.html.j2 b/src/plainui/jinja2/plainui/user.html.j2
index 5134cc265..2e58c056a 100644
--- a/src/plainui/jinja2/plainui/user.html.j2
+++ b/src/plainui/jinja2/plainui/user.html.j2
@@ -9,7 +9,7 @@
{% block title %}
{{ _("%(conf)s - User %(name)s", conf=conf.name, name=display_user.username) }}
-{% endblock %}
+{% endblock title %}
{% block content %}
{{ navMacro.top_nav(_("User Profile") ) }}
@@ -45,4 +45,4 @@
</div>
</div>
-{% endblock %}
+{% endblock content %}
diff --git a/src/plainui/jinja2/plainui/wa_dereferrer.html.j2 b/src/plainui/jinja2/plainui/wa_dereferrer.html.j2
index 284dad728..637809279 100644
--- a/src/plainui/jinja2/plainui/wa_dereferrer.html.j2
+++ b/src/plainui/jinja2/plainui/wa_dereferrer.html.j2
@@ -1,5 +1,7 @@
{% extends "plainui/base.html.j2" %}
-{% block title %}Dereferrer{% endblock %}
+{% block title %}
+ Dereferrer
+{% endblock title %}
{% block body %}
<article class="d-flex justify-content-center align-items-center">
@@ -36,4 +38,4 @@
</section>
</article>
-{% endblock %}
+{% endblock body %}
diff --git a/src/plainui/jinja2/plainui/world.html.j2 b/src/plainui/jinja2/plainui/world.html.j2
index 603a283bb..3ede9c87b 100644
--- a/src/plainui/jinja2/plainui/world.html.j2
+++ b/src/plainui/jinja2/plainui/world.html.j2
@@ -2,7 +2,9 @@
{% import "plainui/components/markdown.html.j2" as markdownMacro %}
{% import "plainui/components/image.html.j2" as imageMacro %}
-{% block title %}{{ conf.name }} - {{ _("2D World") }}{% endblock %}
+{% block title %}
+ {{ conf.name }} - {{ _("2D World") }}
+{% endblock title %}
{% block content %}
<article>
<div class="w-100 text-center my-12">
@@ -16,4 +18,4 @@
<hr class="hub-spacer">
-{% endblock %}
+{% endblock content %}
--
GitLab