diff --git a/castellum/contacts/static/js/availability.js b/castellum/contacts/static/js/availability.js index 4824dcd0c41d802e521e213bc401287c64f6da44..d959208dc96cc772be9558bc5044805440e83dd4 100644 --- a/castellum/contacts/static/js/availability.js +++ b/castellum/contacts/static/js/availability.js @@ -30,7 +30,7 @@ availability.querySelectorAll('select').forEach(function(select) { var label = document.createElement('label'); label.className = 'd-block mb-0'; - label.innerHTML = '' + + label.innerHTML = '' + ''; label.querySelector('span').textContent = django.gettext('All day'); select.before(label); @@ -43,7 +43,7 @@ $$.on(availability, 'change', 'select', function() { // hours --> day - var wholeDay = this.closest('.form-group').querySelector('[data-js="toggle-day"]'); + var wholeDay = this.closest('.col-6').querySelector('[data-js="toggle-day"]'); setCheckbox(this, wholeDay); // hours --> week @@ -52,7 +52,7 @@ $$.on(availability, 'change', '[data-js="toggle-day"]', function() { // day --> hours - var select = this.closest('.form-group').querySelector('select'); + var select = this.closest('.col-6').querySelector('select'); select.querySelectorAll('option').forEach(option => { option.selected = this.checked; }); @@ -76,7 +76,7 @@ // set initial state of day checkboxes document.querySelectorAll('[data-js="toggle-day"]').forEach(function(wholeDay) { - var select = wholeDay.closest('.form-group').querySelector('select'); + var select = wholeDay.closest('.col-6').querySelector('select'); setCheckbox(select, wholeDay); }); diff --git a/castellum/contacts/templates/contacts/__contact_form_self.html b/castellum/contacts/templates/contacts/__contact_form_self.html index 529aca97dd799fb0d4b7e4bfcf756e22086dcf90..5a764548da1dc28b4595b92fb95f12c3032bf22d 100644 --- a/castellum/contacts/templates/contacts/__contact_form_self.html +++ b/castellum/contacts/templates/contacts/__contact_form_self.html @@ -1,7 +1,7 @@ -{% load bootstrap4 %} +{% load django_bootstrap5 %} {% bootstrap_field form.email %} -
+
{% bootstrap_field form.phone_number %}
@@ -9,7 +9,7 @@ {% bootstrap_field form.phone_number_alternative %}
-
+
{% bootstrap_field form.address.street %}
@@ -17,7 +17,7 @@ {% bootstrap_field form.address.house_number %}
-
+
{% bootstrap_field form.address.zip_code %}
diff --git a/castellum/contacts/templates/contacts/__contact_form_top.html b/castellum/contacts/templates/contacts/__contact_form_top.html index 3224c1ba3d0871a3aa378fad26a53393d39abd4c..e81793ccae53aae826e25019ea68b094112feb26 100644 --- a/castellum/contacts/templates/contacts/__contact_form_top.html +++ b/castellum/contacts/templates/contacts/__contact_form_top.html @@ -1,6 +1,6 @@ -{% load bootstrap4 %} +{% load django_bootstrap5 %} -
+
{% bootstrap_field form.title %}
diff --git a/castellum/contacts/templates/contacts/contact_form.html b/castellum/contacts/templates/contacts/contact_form.html index 5971fcf355fecb5fe8d9a75db2d5090492a0b2f5..cd08d509f80922771178bf5b77338b6313dc860f 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 12b7eddcfbabd05cc66d470f11b9d62434498c64..0f4233d84b0c4753acc045a76b6f845cc5f46fc6 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 %}
@@ -9,10 +9,10 @@ {% if appointment %}
-
+ {% csrf_token %} - {% bootstrap_field form.show_up show_label=False %} - + {% bootstrap_field form.show_up layout='inline' inline_field_class='hack-not-col-12' %} +
{% else %} diff --git a/castellum/execution/templates/execution/participation_appointments_form.html b/castellum/execution/templates/execution/participation_appointments_form.html index ca0c46dc03a20b6bfefb1ba280385adfd20edb77..7acc39f5d34f735b5af9679c32ca3dc5aecf9c4d 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 %} @@ -23,8 +23,8 @@
{% for entry in form.appointments %} -
- {% bootstrap_field entry.field form_group_class="" %} +
+ {% bootstrap_field entry.field layout='inline' %} {% if entry.invitation_url == 'not-invited' %}

{% translate 'Scheduler only available for participating subjects.' %} diff --git a/castellum/execution/templates/execution/participation_news.html b/castellum/execution/templates/execution/participation_news.html index b1cd24bde8c0217d7ad46c067bfaf0b0ee5c6760..0160c9da038034c6dc37721b7c54c24740da4b02 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_detail.html b/castellum/execution/templates/execution/study_detail.html index 9571e4a51816a682483a05824b4f9f7709ace019..4c2ba02b6232c2eab1a69e5963b96a336f0a434e 100644 --- a/castellum/execution/templates/execution/study_detail.html +++ b/castellum/execution/templates/execution/study_detail.html @@ -6,13 +6,13 @@ {% for participation, can_access in list %}
  • {% if can_access %} -
    +
    {{ participation.subject.contact.full_name }} {% with summary=participation.subject|showup_summary %} ● {% endwith %} {% if session_count > 0 %} - + {% icon 'calendar' label=_('Appointments') %} {{ participation.appointment_count }}/{{ session_count }} {% if participation.appointment_today %} @@ -21,10 +21,10 @@ {% endif %} {% if participation.subject.blocked %} - {{ participation.subject|verbose_name:'blocked' }} + {{ participation.subject|verbose_name:'blocked' }} {% endif %} {% if participation.subject.deceased %} - {{ participation.subject|verbose_name:'deceased' }} + {{ participation.subject|verbose_name:'deceased' }} {% endif %}
    @@ -32,7 +32,7 @@
    {% else %}
    -
    +
    {% translate 'access denied' %} {% icon 'ban' %}
    diff --git a/castellum/execution/templates/execution/study_export.html b/castellum/execution/templates/execution/study_export.html index fec277cda2307bbdb7f37294d607a7eec6135a52..6a7a5e73b03f1859ab60d174abdd206c34383081 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 904d44b7f9bb78740f7bb1e5367ef58942d084ec..20fc0478388138f7fa264bdf72148961c8d3c293 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 3ee8cf6f63680efd814c7eeb51b1da8afec08d11..e64d94f19c7f10ea1afe076874389c5241fa29c7 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/static/js/contact.js b/castellum/recruitment/static/js/contact.js index 6ab78d13e1571e2122ba8e0152cab83741ed40b8..679a38ce07ccc081785c3c15524f5fe72a0843e8 100644 --- a/castellum/recruitment/static/js/contact.js +++ b/castellum/recruitment/static/js/contact.js @@ -2,7 +2,7 @@ var setVisibility = function() { var status = document.querySelector('[name="status"]'); var followupInput = document.querySelector('[name="followup_date"]'); - var followup = followupInput.closest('.form-row'); + var followup = followupInput.closest('.row'); if (status.value === '4') { followup.hidden = false; @@ -38,6 +38,8 @@ }); if (document.querySelector('#appointments .is-invalid')) { - $('#appointments-tab').tab('show'); + var el = document.querySelector('#appointments-tab'); + var tab = new bootstrap.Tab(el); + tab.show(); } })(); diff --git a/castellum/recruitment/static/js/filters.js b/castellum/recruitment/static/js/filters.js index f1082e2581c544297383800153249ec84db4174d..3a9782a871e0e350d2f91076fdea2d1087dc5e2f 100644 --- a/castellum/recruitment/static/js/filters.js +++ b/castellum/recruitment/static/js/filters.js @@ -7,7 +7,7 @@ var template = document.getElementById('template-' + pk); if (template) { var formrow = document.createElement('div'); - formrow.className = 'form-row mb-3'; + formrow.className = 'row gx-2 mb-3'; formrow.innerHTML = template.innerHTML.replace(/{prefix}/g, 'form-' + totalForms.value); container.append(formrow); totalForms.value = parseInt(totalForms.value, 10) + 1; @@ -16,7 +16,7 @@ }); $$.on(document, 'click', '[data-js="filter-delete"]', function() { - var formrow = this.closest('.form-row'); + var formrow = this.closest('.row'); var index = Array.prototype.indexOf.call(formrow.parentElement.children, formrow); formrow.querySelector('[name^="form-' + index + '-value"]').remove(); diff --git a/castellum/recruitment/templates/recruitment/__recruitment_list.html b/castellum/recruitment/templates/recruitment/__recruitment_list.html index 97d0841b139ca16c8ee4888e7ceee75cc5ce1aed..964eeb2e487456ab4147f0f9ef59de03b2c5f248 100644 --- a/castellum/recruitment/templates/recruitment/__recruitment_list.html +++ b/castellum/recruitment/templates/recruitment/__recruitment_list.html @@ -6,31 +6,31 @@ {% if can_access %}
    last_agreeable_contact_time %}class="text-muted"{% endif %}>
    - + {% for desc, bucket in buckets %} - {{ bucket }} + {{ bucket }} {% endfor %} {% if participation.status_open and participation.status != participation.NOT_CONTACTED %} - {{ participation|display:'status' }} + {{ participation|display:'status' }} {% endif %} {% if participation.status == participation.INVITED and session_count > 0 %} - + {% icon 'calendar' label=_('Appointments') %} {{ participation.appointment_count }}/{{ session_count }} {% endif %} {% if participation.subject.blocked %} - {{ participation.subject|verbose_name:'blocked' }} + {{ participation.subject|verbose_name:'blocked' }} {% endif %}
    {% if participation.status_open and participation.last_contacted_elsewhere.date > last_agreeable_contact_time %} -
    +
    {% translate 'recently contacted in another recruitment' %} {% icon 'phone-slash' %}
    {% elif participation.status == participation.NOT_REACHED or participation.status == participation.AWAITING_RESPONSE %} -
    +
    {% blocktranslate count attempts=participation.attempts %} {{ attempts }} attempt @@ -41,7 +41,7 @@
    {% translate 'last' %}:
    {% elif participation.status == participation.FOLLOWUP_APPOINTED %} -
    +
    {% if participation.followup_date|is_today %} {% if participation.followup_time %} @@ -81,8 +81,8 @@
    {% else %}
    - -
    + +
    {% translate 'access denied' %}
    diff --git a/castellum/recruitment/templates/recruitment/age_widget.html b/castellum/recruitment/templates/recruitment/age_widget.html index f3e2a4af1c817ad99c04b1b5346e57d82c20789a..cb354a81ceaf84b06e7e7a2d9610c210c4340009 100644 --- a/castellum/recruitment/templates/recruitment/age_widget.html +++ b/castellum/recruitment/templates/recruitment/age_widget.html @@ -1,4 +1,4 @@ -
    +
    {% for widget in widget.subwidgets %}
    {% include widget.template_name %} diff --git a/castellum/recruitment/templates/recruitment/attributes_form.html b/castellum/recruitment/templates/recruitment/attributes_form.html index 42d10693dfa8a830e55fa33b13402648ca07c718..b91667cb4008dcc01d683c3bf80d644e3e6acadb 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 %} @@ -9,8 +9,8 @@ {% csrf_token %} {% for field, answer_declined in uncategorized %} -
    - {% bootstrap_field field form_group_class="" %} +
    + {% bootstrap_field field layout="inline" %}
    @@ -22,8 +22,8 @@
    {{ category }} {% for field, answer_declined in fields %} -
    - {% bootstrap_field field form_group_class="" %} +
    + {% bootstrap_field field layout="inline" %}
    diff --git a/castellum/recruitment/templates/recruitment/cleanup.html b/castellum/recruitment/templates/recruitment/cleanup.html index 4e31175a149d637e0f4e582785eb4df7fd82219d..a769366f81822aea952575bd091a0915c367e7ac 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 093fd88c74cd2f127591f06ebf70e83c7f753329..4ee22709770886b8b7bc7b906a22b5ab99c6943f 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 %} @@ -9,7 +9,7 @@ {{ subject.contact.full_name }} - {{ object|display:'status' }} + {{ object|display:'status' }}
    {% endblock %} @@ -40,14 +40,14 @@ {% if view.subtab == 'open' %} -
    diff --git a/castellum/settings/default.py b/castellum/settings/default.py index a27fb650e6e95111d364e04c480803b5aa56bb0d..f172607b5f64b04d99a589efeb7ea5ddbb00c45b 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', @@ -211,7 +211,7 @@ NPM_FILE_PATTERNS = { ], 'jdenticon': ['dist/jdenticon.min.js'], 'jquery': ['dist/jquery.min.js'], - 'popper.js': ['dist/umd/popper.min.js'], + '@popperjs': ['core/dist/umd/popper-lite.min.js'], '@fortawesome/fontawesome-free': [ 'css/all.min.css', 'webfonts/fa-regular-400.eot', @@ -240,7 +240,7 @@ NPM_FILE_PATTERNS = { ], } -BOOTSTRAP4 = { +BOOTSTRAP5 = { 'set_placeholder': False, 'success_css_class': None, } diff --git a/castellum/static/images/bootstrap/caret.svg b/castellum/static/images/bootstrap/caret.svg new file mode 100644 index 0000000000000000000000000000000000000000..84fe61de5138d051970ee8a309b6551f4fee4a33 --- /dev/null +++ b/castellum/static/images/bootstrap/caret.svg @@ -0,0 +1,3 @@ + + + diff --git a/castellum/static/images/bootstrap/indeterminate.svg b/castellum/static/images/bootstrap/indeterminate.svg new file mode 100644 index 0000000000000000000000000000000000000000..92c4caf326f02e893a727248c86e1a3bf656035c --- /dev/null +++ b/castellum/static/images/bootstrap/indeterminate.svg @@ -0,0 +1,3 @@ + + + diff --git a/castellum/static/images/bootstrap/radio.svg b/castellum/static/images/bootstrap/radio.svg new file mode 100644 index 0000000000000000000000000000000000000000..03be3e0564154e52dc5a2c2950a8ac9c87f462e1 --- /dev/null +++ b/castellum/static/images/bootstrap/radio.svg @@ -0,0 +1,3 @@ + + + diff --git a/castellum/static/js/unsaved-changes.js b/castellum/static/js/unsaved-changes.js index d2acb0c821cda197837d15dd8631b84504625603..fd9f0e4dadb6fc842ed487d0443dc460f4340b45 100644 --- a/castellum/static/js/unsaved-changes.js +++ b/castellum/static/js/unsaved-changes.js @@ -15,9 +15,10 @@ $$.on(document, 'click', 'a:not([data-js="cancel"]):not([href^="#"])', function(event){ if (unsavedForms.length) { event.preventDefault(); - var modal = document.querySelector('#unsaved-changes-modal'); - modal.querySelector('[data-js="cancel"]').href = this.href; - $(modal).modal('show'); + var el = document.querySelector('#unsaved-changes-modal'); + var modal = new bootstrap.Modal(el); + el.querySelector('[data-js="cancel"]').href = this.href; + modal.show(); } }); diff --git a/castellum/static/js/utils.js b/castellum/static/js/utils.js index a84c8ef21c5e70dcb96f345dad3916d39cd2a3d0..2486994d331dc0a3370467193da6fd9371c58a2f 100644 --- a/castellum/static/js/utils.js +++ b/castellum/static/js/utils.js @@ -77,7 +77,7 @@ }); $$.on(document, 'click', '[data-js="clear-datetime"]', function() { - this.closest('.form-row').querySelectorAll('input').forEach(el => { + this.closest('.row').querySelectorAll('input').forEach(el => { el.value = ''; $$.trigger(el, 'change'); }); diff --git a/castellum/static/style.css b/castellum/static/style.css index 091a17d5a1d56b3724aa0623e438c7360b1658a5..2de79cb2c6452efa6f7d763dad1deaa1ccc7c10d 100644 --- a/castellum/static/style.css +++ b/castellum/static/style.css @@ -44,6 +44,18 @@ .was-validated .form-control:invalid, .form-control.is-invalid { background-image: url("images/bootstrap/invalid.svg"); } +.form-check-input[type="checkbox"]:checked { + background-image: url("images/bootstrap/check.svg"); +} +.form-check-input[type="checkbox"]:indeterminate { + background-image: url("images/bootstrap/indeterminate.svg"); +} +.form-check-input[type="radio"]:checked { + background-image: url("images/bootstrap/radio.svg"); +} +.form-select { + background-image: url("images/bootstrap/caret.svg"); +} /* work around https://github.com/twbs/bootstrap/issues/23454 */ .invalid-feedback { @@ -70,12 +82,12 @@ } .list-group-item-custom { - color: var(--primary); + color: var(--bs-primary); } .list-group-item-custom.active { - color: var(--dark); - background-color: var(--white); + color: var(--bs-dark); + background-color: var(--bs-white); border-color: rgba(0,0,0,.125); position: relative; } @@ -87,7 +99,7 @@ top: 0; bottom: 0; width: 0.25rem; - background-color: var(--primary); + background-color: var(--bs-primary); } .breadcrumb { @@ -98,11 +110,11 @@ } .container { - max-width: var(--breakpoint-md, 768px); + max-width: 768px; } .container-lg { - max-width: var(--breakpoint-lg, 992px); + max-width: 992px; } .text-hyphens { @@ -128,8 +140,8 @@ margin-top: -0.6em; border-radius: 50%; text-align: center; - color: var(--white); - background-color: var(--success); + color: var(--bs-white); + background-color: var(--bs-success); background-image: url("images/bootstrap/check.svg"); opacity: 0; transition: opacity 300ms ease; @@ -159,3 +171,10 @@ .dl-inline dd { margin: 0 1em 0 0; } + +.breadcrumb-item a { + text-decoration: none; +} +.breadcrumb-item a:hover { + text-decoration: underline; +} diff --git a/castellum/studies/templates/studies/filtergroup.html b/castellum/studies/templates/studies/filtergroup.html index 3671d115bdeeb3ad7e0e072758ad82592ab1bcd0..02f4de5d4d157f55545b0014deacf52330f06e89 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 %} @@ -62,7 +62,7 @@
    {% for form in formset %} -
    +
    {{ form.id.as_hidden }} {{ form.DELETE.as_hidden }} @@ -90,7 +90,7 @@ {% endfor %}
    -
    +
    {% bootstrap_field add_form.description show_label=False %}
    diff --git a/castellum/studies/templates/studies/study_base.html b/castellum/studies/templates/studies/study_base.html index be2af5b1ddfb747197a35c8266b3257c82d3fa41..aeeee0e47bc15e941d08dd2f29ea71372cc7e4c9 100644 --- a/castellum/studies/templates/studies/study_base.html +++ b/castellum/studies/templates/studies/study_base.html @@ -13,10 +13,10 @@

    {{ study }}

    {% if study.is_started %} - {% translate 'Started' %} + {% translate 'Started' %} {% endif %} {% if study.status == study.FINISHED %} - {% translate 'Finished' %} + {% translate 'Finished' %} {% endif %}

    diff --git a/castellum/studies/templates/studies/study_excluded_studies.html b/castellum/studies/templates/studies/study_excluded_studies.html index a286466b95a56baf34edb68cdc5ddd797bb6c834..98ce128d28b4eec32a7a807b6e529eabf3149a8f 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 %} @@ -18,14 +18,14 @@

    {{ form.excluded_studies }}
    - {% translate 'Participants from excluded studies will be excluded from recruitment for this study.' %} +
    {% translate 'Participants from excluded studies will be excluded from recruitment for this study.' %}
    {% if related_studies %} - +
    {% translate 'Studies in which potential subjects have pariticipated' %}: {% for study in related_studies %} {{ study }} ({{ study.count }}){% if not forloop.last %},{% endif %} {% endfor %} - +
    {% endif %}
    diff --git a/castellum/studies/templates/studies/study_exclusioncriteria.html b/castellum/studies/templates/studies/study_exclusioncriteria.html index dfde99ba75fffb2485915c52cf1a4bcf33fb2599..f42b0a4f08dd1d4b7474ea23b3cef0725e2ab261 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 94eeedd0609dc59459495458e18f96e463f2f271..332a4a112fb1d825e35a34043cd91955184a1342 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 57365f947bf5216d88192f4db54c7533f81b237a..f2aef61bc9402d04418ea1eba4865eee1080249c 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 536abbe7849d933efd8625241ffb7102583db95b..00acb6a451c74c12d03ad84459e16d3746995902 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 %} @@ -68,10 +68,10 @@ {% for study in object_list %}
  • -
    {{ study.name }}
    -
    {{ study.contact_person }}
    +
    {{ study.name }}
    +
    {{ study.contact_person }}
    {% if study.status == study.FINISHED %} - {% translate 'Finished' %} + {% translate 'Finished' %} {% endif %}
    diff --git a/castellum/studies/templates/studies/study_mailsettings.html b/castellum/studies/templates/studies/study_mailsettings.html index 17de32e53b335d7354a88426afca369af118dd0d..997e7fdccaacc6f52b5a17568754dde19648aa06 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 d6c41fe4cd97199dfec8a7a7d5e2961df1994d10..f7e5dbc22d7aebced80d37f0c269a994f428745e 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 %} @@ -19,15 +19,15 @@ {% for membership in object.studymembership_set.all %}
  • -
    {{ membership.user.get_full_name }}
    +
    {{ membership.user.get_full_name }}
      {% for group in membership.user.groups.all %} -
    • {{ group }}
      • +
    • {{ group }}
      • {% endfor %}
      {% for group in membership.groups.all %} -
    • {{ group }}
      • +
    • {{ group }}
      • {% endfor %}
    diff --git a/castellum/studies/templates/studies/study_pseudonym_domains.html b/castellum/studies/templates/studies/study_pseudonym_domains.html index 24c0025aa5f7557af61d62db9fdf867f09d0f8f6..03bcf5ba6f3706398e73d66bf912689a23d9c651 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 %} @@ -8,7 +8,7 @@
      {% for domain in study.domains.all %}
    • - +
      {% csrf_token %} diff --git a/castellum/studies/templates/studies/study_recruitmentsettings_form.html b/castellum/studies/templates/studies/study_recruitmentsettings_form.html index 4ee2cfb6e6fc931a612bfc5e7594dd352598a54d..f243f93ec487dc575d9c524f8001056c97d6a11e 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 1a3f37ecdcc1c11fde9ca4471fc0d6d5c18a537c..55394d6219d0d02e50ed7fd48bd9aecb6228c6d7 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 %} @@ -7,15 +7,15 @@
        {% for session in study.studysession_set.all %}
      • -
        +
        {{ session.name }}
        - {{ session.duration }}{% translate 'min' %} + {{ session.duration }}{% translate 'min' %} {% for type in session.type.all %} - {{ type }} + {{ type }} {% endfor %} {% if session.resource %} - {{ session.resource }} + {{ session.resource }} {% endif %}
        {% translate 'Edit' %} @@ -39,7 +39,7 @@ {% include 'utils/form_errors.html' with form=form %} {% csrf_token %} -
        +
        {% bootstrap_field form.sessions_start %}
        diff --git a/castellum/studies/templates/studies/studymembership_form.html b/castellum/studies/templates/studies/studymembership_form.html index 5b53f747de1f63be0ca99752f06e28cf75bbd446..7b9189a9bcd8a43cacc4f4083d39c42887a4a413 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 %} @@ -10,7 +10,7 @@

        {% translate 'The User belongs to the following groups in all studies' %}

          {% for group in object.user.groups.all %} -
        • {{ group }}
          • +
        • {{ group }}
          • {% empty %}
        • {% translate 'no global groups' %}
          • {% endfor %} diff --git a/castellum/studies/templates/studies/studysession_form.html b/castellum/studies/templates/studies/studysession_form.html index 53ac2dd21fbf851e85a816579a4dc8b4348f8631..c65337cfc3a159cc9faa0858404db597a2b526f8 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 %} @@ -19,8 +19,8 @@ {% bootstrap_field form.type %} {% bootstrap_field form.reminder_text %} {% if SCHEDULER_URL and object %} -
          - {% bootstrap_field form.schedule_id form_group_class="" %} +
          + {% bootstrap_field form.schedule_id layout="inline" %} {% if object.schedule_id %} {% translate 'Go to schedule' %} {% else %} diff --git a/castellum/subjects/templates/subjects/guardian_search.html b/castellum/subjects/templates/subjects/guardian_search.html index 021b58dce52c55adbdc57583a75a470511cecec7..67592e326d96b41d0a227cffc140ed6fa7b0e55e 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 %} @@ -23,11 +23,11 @@ @@ -41,7 +41,7 @@
        • {% if can_access %} -
          +
          {% if contact.title %}{{ contact.title }}{% endif %} {% if contact.first_name|lower == form.cleaned_data.first_name|lower %} {{ contact.first_name }} @@ -56,10 +56,10 @@
          {% if contact.date_of_birth %} -
          {{ contact.date_of_birth }}
          +
          {{ contact.date_of_birth }}
          {% endif %} {% if contact.email %} -
          +
          {% if contact.email|lower == form.cleaned_data.email|lower %} {{ contact.email }} {% else %} @@ -69,11 +69,11 @@ {% endif %}
          {% if subject.blocked %} - {{ subject|verbose_name:'blocked' }} + {{ subject|verbose_name:'blocked' }} {% endif %} {% else %} -

          {{ contact.full_name }}

          -
          {% translate 'access denied' %}
          +

          {{ contact.full_name }}

          +
          {% translate 'access denied' %}
          {% endif %}
          diff --git a/castellum/subjects/templates/subjects/maintenance_attributes.html b/castellum/subjects/templates/subjects/maintenance_attributes.html index 6bc3929a578f142cfd5a17f9dc6448c3d03a6905..e2a3f435a6058b804758ed1c82e77d4df6a70290 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 f9057c96e0d7e7589dd5793b2363495190fa973f..54f73f0668428fec71fcdd7522391c674c6180f9 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 ee259abccc0f14f390b75b34faf05845603b6fb3..94ece56ed0628c4c4cde8c208b47f9f8dae908ba 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 d5110442d48e179b3cb255d1d91ebdd99f0f946b..7910cf572cafe7175274bab6337c0cdf8d2cf35e 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 85a5b6440d535dc15ab5420ec197099fe0f56102..44d5d51b249f9e519a3161cb6ec93c5d696e9a39 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 394659307e911ce85f159b9ea2ad9c067f4beaef..b9a57f9cb1a2e7ab8e6cd051756baedfc6935ae0 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 18395b18ba9040dc524ad8ea592128711f659c3d..5cb2d06fc2a25d6d9c0a9f35aa746b66c9db1098 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/participation_add.html b/castellum/subjects/templates/subjects/participation_add.html index bcffbb189fed3bd3648ef442dbe3f5098d4f5a84..15b8a4ebf900bca2a9488e7264056f35152ce526 100644 --- a/castellum/subjects/templates/subjects/participation_add.html +++ b/castellum/subjects/templates/subjects/participation_add.html @@ -17,10 +17,10 @@
            {% for study in object_list %}
          • -
            {{ study }}
            - {{ study.contact_person }} +
            {{ study }}
            + {{ study.contact_person }} {% if study.p %} - {{ study.p.0|display:'status' }} + {{ study.p.0|display:'status' }} {% if study.p.0.status != study.p.0.INVITED %} {% csrf_token %} diff --git a/castellum/subjects/templates/subjects/participation_list.html b/castellum/subjects/templates/subjects/participation_list.html index 5caa218f96532918408d4fb97ad08a0faf513049..8c37b0aa8866b5452cb5fa2740d5142567a58986 100644 --- a/castellum/subjects/templates/subjects/participation_list.html +++ b/castellum/subjects/templates/subjects/participation_list.html @@ -7,8 +7,8 @@
              {% for participation in object_list %}
            • -
              {{ participation.study }}
              - {{ participation.study.contact_person }} +
              {{ participation.study }}
              + {{ participation.study.contact_person }}
              • {% empty %} diff --git a/castellum/subjects/templates/subjects/participation_recruit.html b/castellum/subjects/templates/subjects/participation_recruit.html index 2d0879a19f15340e7fc32458f3c749e0ea10d018..a4018b4d24eab858b6f9bbbe9350d4a6947a2338 100644 --- a/castellum/subjects/templates/subjects/participation_recruit.html +++ b/castellum/subjects/templates/subjects/participation_recruit.html @@ -7,10 +7,10 @@
                {% for study in object_list %}
              • -
                {{ study }}
                - {{ study.contact_person }} +
                {{ study }}
                + {{ study.contact_person }} {% if study.p %} - {{ study.p.0|display:'status' }} + {{ study.p.0|display:'status' }} {% endif %} {% csrf_token %} diff --git a/castellum/subjects/templates/subjects/subject_additional_info_form.html b/castellum/subjects/templates/subjects/subject_additional_info_form.html index f5f7afa68c3c05637ff28e6969b4f5dd43d46ffb..a7cd63befd1e25d139c3e53d0277ee4bf3fe82fa 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 }} @@ -19,7 +19,7 @@
                {% translate "Availability" %} -
                +
                {% bootstrap_field form.availability_monday %}
                @@ -45,16 +45,16 @@ {% translate "Notes" %}

                {% if subject.note_hard_of_hearing %} - {{ subject|verbose_name:'note_hard_of_hearing' }} + {{ subject|verbose_name:'note_hard_of_hearing' }} {% endif %} {% if subject.note_difficult_to_understand %} - {{ subject|verbose_name:'note_difficult_to_understand' }} + {{ subject|verbose_name:'note_difficult_to_understand' }} {% endif %} {% if subject.note_abusive_language %} - {{ subject|verbose_name:'note_abusive_language' }} + {{ subject|verbose_name:'note_abusive_language' }} {% endif %} {% for note in subject.subjectnote_set.all %} - {{ note.content }} + {{ note.content }} {% endfor %}

                diff --git a/castellum/subjects/templates/subjects/subject_confirm_delete.html b/castellum/subjects/templates/subjects/subject_confirm_delete.html index 9ac57a6b46925f14cea80c7b226ea2466f349d73..33516e84b54e9bead07b4af952608eb3ba560124 100644 --- a/castellum/subjects/templates/subjects/subject_confirm_delete.html +++ b/castellum/subjects/templates/subjects/subject_confirm_delete.html @@ -19,10 +19,10 @@ {% for participation in object.participation_set.all %} {% has_perm 'studies.view_study' user participation.study as can_view_study %}
              • -
                +
                {{ participation.study }}
                {{ participation.study.contact_person }} - {{ participation|display:'status' }} + {{ participation|display:'status' }}
                {% if participation.status == participation.INVITED %} diff --git a/castellum/subjects/templates/subjects/subject_data_protection_form.html b/castellum/subjects/templates/subjects/subject_data_protection_form.html index ad02a081d2bf68f8f0230960c0f35a183da36a36..0019d2a345c0951104f6546a2d592da13a1f9c14 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 }} @@ -12,34 +12,34 @@ {% bootstrap_field form.privacy_level %} -
                +
                - {% if object.consent.document.is_deprecated %} - +
                {% blocktranslate %} The current consent refers to an outdated document and will soon expire, thus rendering the recruitment consent invalid. Please contact this subject and ask them to consent to the latest document or withdraw their consent. This message will disappear once you change the value of the checkbox. {% endblocktranslate %} - +
                {% endif %} {% if object.has_consent_from_before_full_age %} - +
                {% blocktranslate %} The subject has recently come of age. Please ask them to renew or withdraw their consent. This message will disappear once you change the value of the checkbox. {% endblocktranslate %} - +
                {% endif %} - {{ form.consent_status.help_text }} +
                {{ form.consent_status.help_text }}
                diff --git a/castellum/subjects/templates/subjects/subject_detail.html b/castellum/subjects/templates/subjects/subject_detail.html index 41a7faf886218436c8056ac7f32ede1d3173b144..ffab059024da33e26762895bfe0336ef579541a8 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 b2e859f71ea39567c4cdd281e58945194c87d358..8dac366670f0d6731f21989f5de8dd75faa94dbd 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 %} @@ -21,11 +21,11 @@ @@ -42,7 +42,7 @@
                {% if can_access %} -
                +
                {% if contact.title %}{{ contact.title }}{% endif %} {% if contact.first_name|lower == form.cleaned_data.first_name|lower %} {{ contact.first_name }} @@ -58,10 +58,10 @@ {% if can_view_subject %}
                {% if contact.date_of_birth %} -
                {{ contact.date_of_birth }}
                +
                {{ contact.date_of_birth }}
                {% endif %} {% if contact.email %} -
                +
                {% if contact.email|lower == form.cleaned_data.email|lower %} {{ contact.email }} {% else %} @@ -71,12 +71,12 @@ {% endif %}
                {% if subject.blocked %} - {{ subject|verbose_name:'blocked' }} + {{ subject|verbose_name:'blocked' }} {% endif %} {% endif %} {% else %} -

                {{ contact.full_name }}

                -
                {% translate 'access denied' %}
                +

                {{ contact.full_name }}

                +
                {% translate 'access denied' %}
                {% endif %}
                @@ -94,9 +94,9 @@ {% for participation, can_recruit, can_conduct in participations %}
              • - {{ participation.study }} - {{ participation.study.contact_person }} - {{ participation|display:'status' }} + {{ participation.study }} + {{ participation.study.contact_person }} + {{ participation|display:'status' }}
                {% if can_recruit %} @@ -143,7 +143,7 @@