From 18ebe51460736e0aea0dd535ea4f5586d4a2b56f Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Mon, 10 May 2021 11:35:34 +0200 Subject: [PATCH 01/20] switch to django-bootstrap5 --- .../contacts/templates/contacts/__contact_form_self.html | 2 +- castellum/contacts/templates/contacts/__contact_form_top.html | 2 +- castellum/contacts/templates/contacts/contact_form.html | 2 +- .../templates/execution/participation_appointments.html | 2 +- .../templates/execution/participation_appointments_form.html | 2 +- .../execution/templates/execution/participation_news.html | 2 +- castellum/execution/templates/execution/study_export.html | 2 +- castellum/execution/templates/execution/study_news_mail.html | 2 +- castellum/execution/templates/execution/study_resolve.html | 2 +- .../recruitment/templates/recruitment/attributes_form.html | 2 +- castellum/recruitment/templates/recruitment/cleanup.html | 2 +- castellum/recruitment/templates/recruitment/contact.html | 2 +- castellum/recruitment/templates/recruitment/mail.html | 2 +- castellum/settings/default.py | 4 ++-- castellum/studies/templates/studies/filtergroup.html | 2 +- .../studies/templates/studies/study_excluded_studies.html | 2 +- .../studies/templates/studies/study_exclusioncriteria.html | 2 +- castellum/studies/templates/studies/study_form.html | 2 +- castellum/studies/templates/studies/study_import.html | 2 +- castellum/studies/templates/studies/study_list.html | 2 +- castellum/studies/templates/studies/study_mailsettings.html | 2 +- castellum/studies/templates/studies/study_members.html | 2 +- .../studies/templates/studies/study_pseudonym_domains.html | 2 +- .../templates/studies/study_recruitmentsettings_form.html | 2 +- castellum/studies/templates/studies/study_sessions.html | 2 +- castellum/studies/templates/studies/studymembership_form.html | 2 +- castellum/studies/templates/studies/studysession_form.html | 2 +- castellum/subjects/templates/subjects/guardian_search.html | 2 +- .../subjects/templates/subjects/maintenance_attributes.html | 2 +- .../subjects/templates/subjects/maintenance_consent.html | 2 +- .../subjects/templates/subjects/maintenance_contact.html | 2 +- .../subjects/templates/subjects/maintenance_duplicates.html | 2 +- castellum/subjects/templates/subjects/maintenance_notes.html | 2 +- castellum/subjects/templates/subjects/maintenance_showup.html | 2 +- .../subjects/templates/subjects/maintenance_waiting.html | 2 +- .../templates/subjects/subject_additional_info_form.html | 2 +- .../templates/subjects/subject_data_protection_form.html | 2 +- castellum/subjects/templates/subjects/subject_detail.html | 2 +- castellum/subjects/templates/subjects/subject_search.html | 2 +- castellum/templates/base.html | 4 ++-- castellum/templates/login.html | 2 +- setup.cfg | 2 +- 42 files changed, 44 insertions(+), 44 deletions(-) diff --git a/castellum/contacts/templates/contacts/__contact_form_self.html b/castellum/contacts/templates/contacts/__contact_form_self.html index 529aca97d..0b7e0042b 100644 --- a/castellum/contacts/templates/contacts/__contact_form_self.html +++ b/castellum/contacts/templates/contacts/__contact_form_self.html @@ -1,4 +1,4 @@ -{% load bootstrap4 %} +{% load django_bootstrap5 %} {% bootstrap_field form.email %}
diff --git a/castellum/contacts/templates/contacts/__contact_form_top.html b/castellum/contacts/templates/contacts/__contact_form_top.html index 3224c1ba3..b32b98b60 100644 --- a/castellum/contacts/templates/contacts/__contact_form_top.html +++ b/castellum/contacts/templates/contacts/__contact_form_top.html @@ -1,4 +1,4 @@ -{% load bootstrap4 %} +{% load django_bootstrap5 %}
diff --git a/castellum/contacts/templates/contacts/contact_form.html b/castellum/contacts/templates/contacts/contact_form.html index 5971fcf35..cd08d509f 100644 --- a/castellum/contacts/templates/contacts/contact_form.html +++ b/castellum/contacts/templates/contacts/contact_form.html @@ -1,5 +1,5 @@ {% extends base_template|default:"subjects/base.html" %} -{% load static i18n bootstrap4 %} +{% load static i18n django_bootstrap5 %} {% block title %} {% if object %} diff --git a/castellum/execution/templates/execution/participation_appointments.html b/castellum/execution/templates/execution/participation_appointments.html index 12b7eddcf..9558077f4 100644 --- a/castellum/execution/templates/execution/participation_appointments.html +++ b/castellum/execution/templates/execution/participation_appointments.html @@ -1,5 +1,5 @@ {% extends "execution/participation_base.html" %} -{% load i18n auth bootstrap4 utils %} +{% load i18n auth django_bootstrap5 utils %} {% block content %}
diff --git a/castellum/execution/templates/execution/participation_appointments_form.html b/castellum/execution/templates/execution/participation_appointments_form.html index ca0c46dc0..f9102e89b 100644 --- a/castellum/execution/templates/execution/participation_appointments_form.html +++ b/castellum/execution/templates/execution/participation_appointments_form.html @@ -1,5 +1,5 @@ {% extends "execution/participation_base.html" %} -{% load i18n static bootstrap4 utils %} +{% load i18n static django_bootstrap5 utils %} {% block content %} {% if study.session_instructions %} diff --git a/castellum/execution/templates/execution/participation_news.html b/castellum/execution/templates/execution/participation_news.html index b1cd24bde..0160c9da0 100644 --- a/castellum/execution/templates/execution/participation_news.html +++ b/castellum/execution/templates/execution/participation_news.html @@ -1,5 +1,5 @@ {% extends "execution/participation_base.html" %} -{% load i18n bootstrap4 %} +{% load i18n django_bootstrap5 %} {% block content %}
diff --git a/castellum/execution/templates/execution/study_export.html b/castellum/execution/templates/execution/study_export.html index fec277cda..6a7a5e73b 100644 --- a/castellum/execution/templates/execution/study_export.html +++ b/castellum/execution/templates/execution/study_export.html @@ -1,5 +1,5 @@ {% extends "execution/study_base.html" %} -{% load i18n bootstrap4 %} +{% load i18n django_bootstrap5 %} {% block title %}{% translate 'Export' %} · {{ block.super }}{% endblock %} diff --git a/castellum/execution/templates/execution/study_news_mail.html b/castellum/execution/templates/execution/study_news_mail.html index 904d44b7f..20fc04783 100644 --- a/castellum/execution/templates/execution/study_news_mail.html +++ b/castellum/execution/templates/execution/study_news_mail.html @@ -1,5 +1,5 @@ {% extends "execution/study_base.html" %} -{% load i18n bootstrap4 humanize utils %} +{% load i18n django_bootstrap5 humanize utils %} {% block content %}

{% translate 'This form allows you to send a message to all subjects who indicated interest in study news. You cannot attach a document to the email, but you can include a link.' %}

diff --git a/castellum/execution/templates/execution/study_resolve.html b/castellum/execution/templates/execution/study_resolve.html index 3ee8cf6f6..e64d94f19 100644 --- a/castellum/execution/templates/execution/study_resolve.html +++ b/castellum/execution/templates/execution/study_resolve.html @@ -1,5 +1,5 @@ {% extends "execution/study_base.html" %} -{% load i18n bootstrap4 %} +{% load i18n django_bootstrap5 %} {% block content %} diff --git a/castellum/recruitment/templates/recruitment/attributes_form.html b/castellum/recruitment/templates/recruitment/attributes_form.html index 42d10693d..651137ef8 100644 --- a/castellum/recruitment/templates/recruitment/attributes_form.html +++ b/castellum/recruitment/templates/recruitment/attributes_form.html @@ -1,5 +1,5 @@ {% extends base_template|default:"recruitment/base.html" %} -{% load static i18n bootstrap4 %} +{% load static i18n django_bootstrap5 %} {% block title %}{% translate "Edit attributes" %} · {{ block.super }}{% endblock %} diff --git a/castellum/recruitment/templates/recruitment/cleanup.html b/castellum/recruitment/templates/recruitment/cleanup.html index 4e31175a1..a769366f8 100644 --- a/castellum/recruitment/templates/recruitment/cleanup.html +++ b/castellum/recruitment/templates/recruitment/cleanup.html @@ -1,5 +1,5 @@ {% extends "recruitment/recruitment_base.html" %} -{% load i18n bootstrap4 %} +{% load i18n django_bootstrap5 %} {% block title %}{% translate "Recruitment" %} · {{ study }} · {{ block.super }}{% endblock %} diff --git a/castellum/recruitment/templates/recruitment/contact.html b/castellum/recruitment/templates/recruitment/contact.html index 093fd88c7..a38b29247 100644 --- a/castellum/recruitment/templates/recruitment/contact.html +++ b/castellum/recruitment/templates/recruitment/contact.html @@ -1,5 +1,5 @@ {% extends "recruitment/base.html" %} -{% load i18n static bootstrap4 utils auth %} +{% load i18n static django_bootstrap5 utils auth %} {% block title %}{% translate "Recruitment" %} · {{ study }} · {{ block.super }}{% endblock %} diff --git a/castellum/recruitment/templates/recruitment/mail.html b/castellum/recruitment/templates/recruitment/mail.html index 28c9f97f6..d4a4de4f1 100644 --- a/castellum/recruitment/templates/recruitment/mail.html +++ b/castellum/recruitment/templates/recruitment/mail.html @@ -1,5 +1,5 @@ {% extends base_template|default:"recruitment/recruitment_base.html" %} -{% load i18n auth bootstrap4 humanize utils %} +{% load i18n auth django_bootstrap5 humanize utils %} {% block title %}{% translate "Mail recruitment" %} · {{ block.super }}{% endblock %} diff --git a/castellum/settings/default.py b/castellum/settings/default.py index a27fb650e..38068d14c 100644 --- a/castellum/settings/default.py +++ b/castellum/settings/default.py @@ -25,7 +25,7 @@ INSTALLED_APPS = [ 'django.contrib.messages', 'django.contrib.staticfiles', - 'bootstrap4', + 'django_bootstrap5', 'phonenumber_field', 'parler', 'stronghold', @@ -240,7 +240,7 @@ NPM_FILE_PATTERNS = { ], } -BOOTSTRAP4 = { +BOOTSTRAP5 = { 'set_placeholder': False, 'success_css_class': None, } diff --git a/castellum/studies/templates/studies/filtergroup.html b/castellum/studies/templates/studies/filtergroup.html index 3671d115b..7f73f384d 100644 --- a/castellum/studies/templates/studies/filtergroup.html +++ b/castellum/studies/templates/studies/filtergroup.html @@ -1,5 +1,5 @@ {% extends "studies/study_recruitmentsettings_base.html" %} -{% load static i18n bootstrap4 utils %} +{% load static i18n django_bootstrap5 utils %} {% block title %}{% translate "Filters" %} · {{ block.super }}{% endblock %} diff --git a/castellum/studies/templates/studies/study_excluded_studies.html b/castellum/studies/templates/studies/study_excluded_studies.html index a286466b9..9939af605 100644 --- a/castellum/studies/templates/studies/study_excluded_studies.html +++ b/castellum/studies/templates/studies/study_excluded_studies.html @@ -1,5 +1,5 @@ {% extends "studies/study_recruitmentsettings_base.html" %} -{% load i18n auth bootstrap4 %} +{% load i18n auth django_bootstrap5 %} {% block title %}{% translate "Excluded studies" %} · {{ block.super }}{% endblock %} diff --git a/castellum/studies/templates/studies/study_exclusioncriteria.html b/castellum/studies/templates/studies/study_exclusioncriteria.html index dfde99ba7..f42b0a4f0 100644 --- a/castellum/studies/templates/studies/study_exclusioncriteria.html +++ b/castellum/studies/templates/studies/study_exclusioncriteria.html @@ -1,5 +1,5 @@ {% extends "studies/study_recruitmentsettings_base.html" %} -{% load i18n auth bootstrap4 %} +{% load i18n auth django_bootstrap5 %} {% block title %}{% translate "Inclusion/exclusion criteria" %} · {{ block.super }}{% endblock %} diff --git a/castellum/studies/templates/studies/study_form.html b/castellum/studies/templates/studies/study_form.html index 94eeedd06..332a4a112 100644 --- a/castellum/studies/templates/studies/study_form.html +++ b/castellum/studies/templates/studies/study_form.html @@ -1,5 +1,5 @@ {% extends base_template|default:"studies/base.html" %} -{% load static i18n bootstrap4 utils %} +{% load static i18n django_bootstrap5 utils %} {% block title %} {% if object %} diff --git a/castellum/studies/templates/studies/study_import.html b/castellum/studies/templates/studies/study_import.html index 57365f947..f2aef61bc 100644 --- a/castellum/studies/templates/studies/study_import.html +++ b/castellum/studies/templates/studies/study_import.html @@ -1,5 +1,5 @@ {% extends "studies/base.html" %} -{% load i18n bootstrap4 %} +{% load i18n django_bootstrap5 %} {% block title %}{% translate 'Import' %} · {{ block.super }}{% endblock %} diff --git a/castellum/studies/templates/studies/study_list.html b/castellum/studies/templates/studies/study_list.html index 536abbe78..0bbd6e20d 100644 --- a/castellum/studies/templates/studies/study_list.html +++ b/castellum/studies/templates/studies/study_list.html @@ -1,5 +1,5 @@ {% extends "studies/base.html" %} -{% load i18n static auth bootstrap4 utils %} +{% load i18n static auth django_bootstrap5 utils %} {% block title %}{% translate "Studies" %} · {{ block.super }}{% endblock %} diff --git a/castellum/studies/templates/studies/study_mailsettings.html b/castellum/studies/templates/studies/study_mailsettings.html index 17de32e53..997e7fdcc 100644 --- a/castellum/studies/templates/studies/study_mailsettings.html +++ b/castellum/studies/templates/studies/study_mailsettings.html @@ -1,5 +1,5 @@ {% extends "studies/study_recruitmentsettings_base.html" %} -{% load i18n auth bootstrap4 %} +{% load i18n auth django_bootstrap5 %} {% block title %}{% translate "Mail Settings" %} · {{ block.super }}{% endblock %} diff --git a/castellum/studies/templates/studies/study_members.html b/castellum/studies/templates/studies/study_members.html index d6c41fe4c..51033889b 100644 --- a/castellum/studies/templates/studies/study_members.html +++ b/castellum/studies/templates/studies/study_members.html @@ -1,5 +1,5 @@ {% extends "studies/study_base.html" %} -{% load i18n bootstrap4 %} +{% load i18n django_bootstrap5 %} {% block title %}{% translate "Member management" %} · {{ block.super }}{% endblock %} diff --git a/castellum/studies/templates/studies/study_pseudonym_domains.html b/castellum/studies/templates/studies/study_pseudonym_domains.html index 24c0025aa..9655ebe14 100644 --- a/castellum/studies/templates/studies/study_pseudonym_domains.html +++ b/castellum/studies/templates/studies/study_pseudonym_domains.html @@ -1,5 +1,5 @@ {% extends "studies/study_base.html" %} -{% load i18n auth bootstrap4 utils %} +{% load i18n auth django_bootstrap5 utils %} {% block title %}{% translate "Pseudonym domains" %} · {{ block.super }}{% endblock %} diff --git a/castellum/studies/templates/studies/study_recruitmentsettings_form.html b/castellum/studies/templates/studies/study_recruitmentsettings_form.html index 4ee2cfb6e..f243f93ec 100644 --- a/castellum/studies/templates/studies/study_recruitmentsettings_form.html +++ b/castellum/studies/templates/studies/study_recruitmentsettings_form.html @@ -1,5 +1,5 @@ {% extends "studies/study_recruitmentsettings_base.html" %} -{% load static i18n bootstrap4 %} +{% load static i18n django_bootstrap5 %} {% block title %} {% translate "General recruitment settings" %} · {{ block.super }} diff --git a/castellum/studies/templates/studies/study_sessions.html b/castellum/studies/templates/studies/study_sessions.html index 1a3f37ecd..0b22c161f 100644 --- a/castellum/studies/templates/studies/study_sessions.html +++ b/castellum/studies/templates/studies/study_sessions.html @@ -1,5 +1,5 @@ {% extends "studies/study_base.html" %} -{% load static i18n auth bootstrap4 %} +{% load static i18n auth django_bootstrap5 %} {% block title %}{% translate "Sessions" %} · {{ block.super }}{% endblock %} diff --git a/castellum/studies/templates/studies/studymembership_form.html b/castellum/studies/templates/studies/studymembership_form.html index 5b53f747d..5f2f6c432 100644 --- a/castellum/studies/templates/studies/studymembership_form.html +++ b/castellum/studies/templates/studies/studymembership_form.html @@ -1,5 +1,5 @@ {% extends "studies/study_base.html" %} -{% load i18n bootstrap4 %} +{% load i18n django_bootstrap5 %} {% block title %}{{ object.user }} · {% translate "Member management" %} · {{ block.super }}{% endblock %} diff --git a/castellum/studies/templates/studies/studysession_form.html b/castellum/studies/templates/studies/studysession_form.html index 53ac2dd21..4667d976a 100644 --- a/castellum/studies/templates/studies/studysession_form.html +++ b/castellum/studies/templates/studies/studysession_form.html @@ -1,5 +1,5 @@ {% extends "studies/study_base.html" %} -{% load static i18n bootstrap4 %} +{% load static i18n django_bootstrap5 %} {% block title %}{% translate "Sessions" %} · {{ block.super }}{% endblock %} diff --git a/castellum/subjects/templates/subjects/guardian_search.html b/castellum/subjects/templates/subjects/guardian_search.html index 021b58dce..868a35bcb 100644 --- a/castellum/subjects/templates/subjects/guardian_search.html +++ b/castellum/subjects/templates/subjects/guardian_search.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load i18n static bootstrap4 auth utils %} +{% load i18n static django_bootstrap5 auth utils %} {% block title %}{% translate "Guardians" %} · {{ block.super }}{% endblock %} diff --git a/castellum/subjects/templates/subjects/maintenance_attributes.html b/castellum/subjects/templates/subjects/maintenance_attributes.html index 6bc3929a5..e2a3f435a 100644 --- a/castellum/subjects/templates/subjects/maintenance_attributes.html +++ b/castellum/subjects/templates/subjects/maintenance_attributes.html @@ -1,5 +1,5 @@ {% extends "subjects/maintenance_base.html" %} -{% load i18n bootstrap4 auth %} +{% load i18n django_bootstrap5 auth %} {% block title %}{% translate "Attributes" %} · {{ block.super }}{% endblock %} diff --git a/castellum/subjects/templates/subjects/maintenance_consent.html b/castellum/subjects/templates/subjects/maintenance_consent.html index f9057c96e..54f73f066 100644 --- a/castellum/subjects/templates/subjects/maintenance_consent.html +++ b/castellum/subjects/templates/subjects/maintenance_consent.html @@ -1,5 +1,5 @@ {% extends "subjects/maintenance_base.html" %} -{% load i18n bootstrap4 auth %} +{% load i18n django_bootstrap5 auth %} {% block title %}{% translate "Consent" %} · {{ block.super }}{% endblock %} diff --git a/castellum/subjects/templates/subjects/maintenance_contact.html b/castellum/subjects/templates/subjects/maintenance_contact.html index ee259abcc..94ece56ed 100644 --- a/castellum/subjects/templates/subjects/maintenance_contact.html +++ b/castellum/subjects/templates/subjects/maintenance_contact.html @@ -1,5 +1,5 @@ {% extends "subjects/maintenance_base.html" %} -{% load i18n bootstrap4 auth %} +{% load i18n django_bootstrap5 auth %} {% block title %}{% translate "Contact" %} · {{ block.super }}{% endblock %} diff --git a/castellum/subjects/templates/subjects/maintenance_duplicates.html b/castellum/subjects/templates/subjects/maintenance_duplicates.html index d5110442d..7910cf572 100644 --- a/castellum/subjects/templates/subjects/maintenance_duplicates.html +++ b/castellum/subjects/templates/subjects/maintenance_duplicates.html @@ -1,5 +1,5 @@ {% extends "subjects/maintenance_base.html" %} -{% load i18n bootstrap4 auth %} +{% load i18n django_bootstrap5 auth %} {% block title %}{% translate "Duplicates" %} · {{ block.super }}{% endblock %} diff --git a/castellum/subjects/templates/subjects/maintenance_notes.html b/castellum/subjects/templates/subjects/maintenance_notes.html index 85a5b6440..44d5d51b2 100644 --- a/castellum/subjects/templates/subjects/maintenance_notes.html +++ b/castellum/subjects/templates/subjects/maintenance_notes.html @@ -1,5 +1,5 @@ {% extends "subjects/maintenance_base.html" %} -{% load i18n bootstrap4 auth %} +{% load i18n django_bootstrap5 auth %} {% block title %}{% translate "Notes" %} · {{ block.super }}{% endblock %} diff --git a/castellum/subjects/templates/subjects/maintenance_showup.html b/castellum/subjects/templates/subjects/maintenance_showup.html index 394659307..b9a57f9cb 100644 --- a/castellum/subjects/templates/subjects/maintenance_showup.html +++ b/castellum/subjects/templates/subjects/maintenance_showup.html @@ -1,5 +1,5 @@ {% extends "subjects/maintenance_base.html" %} -{% load i18n bootstrap4 auth %} +{% load i18n django_bootstrap5 auth %} {% block title %}{% translate "Show up" %} · {{ block.super }}{% endblock %} diff --git a/castellum/subjects/templates/subjects/maintenance_waiting.html b/castellum/subjects/templates/subjects/maintenance_waiting.html index 18395b18b..5cb2d06fc 100644 --- a/castellum/subjects/templates/subjects/maintenance_waiting.html +++ b/castellum/subjects/templates/subjects/maintenance_waiting.html @@ -1,5 +1,5 @@ {% extends "subjects/maintenance_base.html" %} -{% load i18n bootstrap4 auth %} +{% load i18n django_bootstrap5 auth %} {% block title %}{% translate "Waiting for consent" %} · {{ block.super }}{% endblock %} diff --git a/castellum/subjects/templates/subjects/subject_additional_info_form.html b/castellum/subjects/templates/subjects/subject_additional_info_form.html index f5f7afa68..73420efca 100644 --- a/castellum/subjects/templates/subjects/subject_additional_info_form.html +++ b/castellum/subjects/templates/subjects/subject_additional_info_form.html @@ -1,5 +1,5 @@ {% extends base_template|default:"subjects/base.html" %} -{% load static i18n bootstrap4 utils %} +{% load static i18n django_bootstrap5 utils %} {% block title %} {% translate "Edit subject" %} · {{ block.super }} diff --git a/castellum/subjects/templates/subjects/subject_data_protection_form.html b/castellum/subjects/templates/subjects/subject_data_protection_form.html index ad02a081d..ff3c5ad4e 100644 --- a/castellum/subjects/templates/subjects/subject_data_protection_form.html +++ b/castellum/subjects/templates/subjects/subject_data_protection_form.html @@ -1,5 +1,5 @@ {% extends base_template|default:"subjects/base.html" %} -{% load static i18n bootstrap4 utils %} +{% load static i18n django_bootstrap5 utils %} {% block title %} {% translate "Edit subject" %} · {{ block.super }} diff --git a/castellum/subjects/templates/subjects/subject_detail.html b/castellum/subjects/templates/subjects/subject_detail.html index 41a7faf88..ffab05902 100644 --- a/castellum/subjects/templates/subjects/subject_detail.html +++ b/castellum/subjects/templates/subjects/subject_detail.html @@ -1,5 +1,5 @@ {% extends "subjects/subject_base.html" %} -{% load i18n bootstrap4 utils auth appointments %} +{% load i18n django_bootstrap5 utils auth appointments %} {% block title %}{% translate "Subject details" %} · {{ block.super }}{% endblock %} diff --git a/castellum/subjects/templates/subjects/subject_search.html b/castellum/subjects/templates/subjects/subject_search.html index b2e859f71..a9a2a7ecb 100644 --- a/castellum/subjects/templates/subjects/subject_search.html +++ b/castellum/subjects/templates/subjects/subject_search.html @@ -1,5 +1,5 @@ {% extends "subjects/base.html" %} -{% load i18n bootstrap4 auth utils %} +{% load i18n django_bootstrap5 auth utils %} {% block title %}{% translate "Subjects" %} · {{ block.super }}{% endblock %} diff --git a/castellum/templates/base.html b/castellum/templates/base.html index e5ed98b26..e83eb01ac 100644 --- a/castellum/templates/base.html +++ b/castellum/templates/base.html @@ -1,5 +1,5 @@ -{% load i18n static bootstrap4 utils %} +{% load i18n static django_bootstrap5 utils %} {% get_current_language as LANGUAGE_CODE %} {% get_parler_languages as LANGUAGES %} @@ -92,7 +92,7 @@ {% if messages %} {% for message in messages %} -
{% for entry in form.appointments %} -
+
{% bootstrap_field entry.field form_group_class="" %} {% if entry.invitation_url == 'not-invited' %}

diff --git a/castellum/recruitment/templates/recruitment/attributes_form.html b/castellum/recruitment/templates/recruitment/attributes_form.html index 651137ef8..21a113836 100644 --- a/castellum/recruitment/templates/recruitment/attributes_form.html +++ b/castellum/recruitment/templates/recruitment/attributes_form.html @@ -9,7 +9,7 @@ {% csrf_token %} {% for field, answer_declined in uncategorized %} -

+
{% bootstrap_field field form_group_class="" %}
@@ -22,7 +22,7 @@
{{ category }} {% for field, answer_declined in fields %} -
+
{% bootstrap_field field form_group_class="" %}
diff --git a/castellum/recruitment/templates/recruitment/contact.html b/castellum/recruitment/templates/recruitment/contact.html index 064d0ea2a..eac64a42f 100644 --- a/castellum/recruitment/templates/recruitment/contact.html +++ b/castellum/recruitment/templates/recruitment/contact.html @@ -167,7 +167,7 @@ {% for entry in form.appointments %} -
+
{% bootstrap_field entry.field form_group_class="" %} {% if entry.invitation_url == 'not-invited' %}

@@ -202,7 +202,7 @@

{% bootstrap_field form.followup_time %}
-
+
diff --git a/castellum/recruitment/templates/recruitment/mail.html b/castellum/recruitment/templates/recruitment/mail.html index d4a4de4f1..4ec11bf11 100644 --- a/castellum/recruitment/templates/recruitment/mail.html +++ b/castellum/recruitment/templates/recruitment/mail.html @@ -12,7 +12,7 @@ {% include 'utils/form_errors.html' with form=form %} {% csrf_token %} -
+