diff --git a/.eslintrc.js b/.eslintrc.js index 143db2401a0f5b17cabd500a8874b22f086d7260..6731d86136e327a5bd9e2a773c057b9419502f3b 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -7,9 +7,9 @@ module.exports = { }, "extends": "eslint:recommended", "globals": { - "$": "readonly", "$$": "readonly", "django": "readonly", + "bootstrap": "readonly", "FullCalendar": "readonly", "Datepicker": "readonly" } 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..c343cfd024b2793407c4aed376f0b35725e2256f 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 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..ea0e6150deb0e41d36c28997276f57fc6dcbd18f 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 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..713db468c9bcdc83817e9d3a1af0086f520d228e 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 bootstrap5 %} {% block title %} {% if object %} diff --git a/castellum/execution/templates/execution/participation_appointments.html b/castellum/execution/templates/execution/participation_appointments.html index a28766e14656f341cf6e4fe0bcdd8cd2c3b40989..055b46bb25bcc64ad0896e6dae55a33174e45aa3 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 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 show_label=False form_group_class='me-2' %} +
{% else %} diff --git a/castellum/execution/templates/execution/participation_appointments_form.html b/castellum/execution/templates/execution/participation_appointments_form.html index f18546e07441015bb7ac90376f358fd0f73b2e6a..2672e43eafc59f8faac155d67ad268fa16616f31 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 bootstrap5 utils %} {% block content %} {% if study.session_instructions %} @@ -23,7 +23,7 @@
{% for entry in form.appointments %} -
+
{% bootstrap_field entry.field form_group_class="" %} {% if entry.invitation_url == 'not-invited' %}

diff --git a/castellum/execution/templates/execution/participation_news.html b/castellum/execution/templates/execution/participation_news.html index b1cd24bde8c0217d7ad46c067bfaf0b0ee5c6760..e67d1b1117b82e906238f3090bceb29ebeb37248 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 bootstrap5 %} {% block content %}

diff --git a/castellum/execution/templates/execution/study_detail.html b/castellum/execution/templates/execution/study_detail.html index 547633aa4c78b4e8351aa362aa7d1e40a22939de..1ff5ff0c26b3544560bb54e16d81275c6daa2b6c 100644 --- a/castellum/execution/templates/execution/study_detail.html +++ b/castellum/execution/templates/execution/study_detail.html @@ -6,19 +6,19 @@ {% for participation, can_access in list %}
  • {% if can_access %} -
    +
    {{ participation.subject.contact.full_name }} {% if session_count > 0 %} - + {{ participation.appointment_count }}/{{ session_count }} {% endif %} {% if participation.appointment_today %} - {% translate 'today' %} + {% translate 'today' %} {% endif %} {% if participation.subject.blocked %} - {{ participation.subject|verbose_name:'blocked' }} + {{ participation.subject|verbose_name:'blocked' }} {% endif %} {% with summary=participation.subject|showup_summary %} ● @@ -29,7 +29,7 @@
    {% else %}
    -
    +
    {% translate 'access denied' %}
    diff --git a/castellum/execution/templates/execution/study_news_mail.html b/castellum/execution/templates/execution/study_news_mail.html index 877890c4b9f82918ecd3a868fdb42174b5efdf53..f47f1a6ed54425e3775b28149766190c6fa7df47 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 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 d39ac547ba2f0956ffab3d71cb38c74a0dafae44..2a4ecc3e880aeaeb72b1bb5e95153051840c4460 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 bootstrap5 %} {% block content %} diff --git a/castellum/recruitment/static/js/contact.js b/castellum/recruitment/static/js/contact.js index 6ab78d13e1571e2122ba8e0152cab83741ed40b8..b3f6d0fed28d922119378351fd6748ff114078ef 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.g-3'); 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..d916e2a9f693e7efefe9482a6e2aaf569f55c45b 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 g-3 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.g-3'); 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 494d77137d5933e7c1e4c4154e3afebf133b817f..f088b92a14dde4ce1e50c880a22edbe7bec5c17c 100644 --- a/castellum/recruitment/templates/recruitment/__recruitment_list.html +++ b/castellum/recruitment/templates/recruitment/__recruitment_list.html @@ -7,13 +7,13 @@ {% if participation.status == participation.FOLLOWUP_APPOINTED %}
    - + {% for desc, bucket in buckets %} -
    {{ bucket }}
    +
    {{ bucket }}
    {% endfor %} -
    {{ participation|display:'status' }}
    +
    {{ participation|display:'status' }}
    -
    +
    {% if participation.followup_date|is_today %} {% if participation.followup_time %} @@ -42,15 +42,15 @@ {% elif participation.status_open and participation.last_contacted_elsewhere.date > last_agreeable_contact_time %}
    - + {% for desc, bucket in buckets %} -
    {{ bucket }}
    +
    {{ bucket }}
    {% endfor %} {% if participation.status != participation.NOT_CONTACTED %} -
    {{ participation|display:'status' }}
    +
    {{ participation|display:'status' }}
    {% endif %}
    -
    +
    {% translate 'recently contacted in another recruitment' %}
    @@ -58,13 +58,13 @@ {% elif participation.status == participation.NOT_REACHED or participation.status == participation.AWAITING_RESPONSE %}
    - + {% for desc, bucket in buckets %} -
    {{ bucket }}
    +
    {{ bucket }}
    {% endfor %} -
    {{ participation|display:'status' }}
    +
    {{ participation|display:'status' }}
    -
    +
    {% blocktranslate count attempts=participation.attempts %} {{ attempts }} attempt @@ -78,17 +78,17 @@ {% else %}
    - + {% for desc, bucket in buckets %} -
    {{ bucket }}
    +
    {{ bucket }}
    {% endfor %} {% if participation.status == participation.INVITED and session_count > 0 %} -
    +
    {{ participation.appointment_count }}/{{ session_count }}
    {% if participation.subject.blocked %} - {{ participation.subject|verbose_name:'blocked' }} + {{ participation.subject|verbose_name:'blocked' }} {% endif %} {% endif %}
    @@ -105,8 +105,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..e63396400ee488a86a74b35bca3de68833113ef6 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..e479af9916bf5d6cde46cae4fde3e36323d81033 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 bootstrap5 %} {% block title %}{% translate "Edit attributes" %} · {{ block.super }}{% endblock %} @@ -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/cleanup.html b/castellum/recruitment/templates/recruitment/cleanup.html index b959691ea65365328da2162eacf4a1e68c89ca50..e8b18ebdf77fe0033046c448c423c1b517511143 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 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 a746d7395a2d38f02ad2e275014bfd632e0dd4ac..e7697885786e3609c68f8c86d513350b261e7b44 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 appointments %} +{% load i18n static bootstrap5 utils auth appointments %} {% 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 aaa2761f8e21cea0cd6501a671f296c7f7178eae..af9d447da2f8c245edf74862238f6854045bffec 100644 --- a/castellum/settings/default.py +++ b/castellum/settings/default.py @@ -25,7 +25,9 @@ INSTALLED_APPS = [ 'django.contrib.messages', 'django.contrib.staticfiles', - 'bootstrap4', + 'django-bs5', + 'django.forms', + 'phonenumber_field', 'parler', 'stronghold', @@ -81,6 +83,8 @@ TEMPLATES = [ }, ] +FORM_RENDERER = 'django.forms.renderers.TemplatesSetting' + WSGI_APPLICATION = 'castellum.wsgi.application' @@ -188,8 +192,7 @@ NPM_FILE_PATTERNS = { 'dist/js/locales/de.js', ], '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', @@ -210,11 +213,6 @@ NPM_FILE_PATTERNS = { ], } -BOOTSTRAP4 = { - 'set_placeholder': False, - 'success_css_class': None, -} - AXES_LOCKOUT_TEMPLATE = 'axes-lockout.html' 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/check.svg b/castellum/static/images/bootstrap/check.svg new file mode 100644 index 0000000000000000000000000000000000000000..a9e9d0366ae3ab120cdb8c521dcc0b07133f86c2 --- /dev/null +++ b/castellum/static/images/bootstrap/check.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/style.css b/castellum/static/style.css index d2c1f5c52a123f0073cef8f98cd75c3c3267f2b9..b46411c0b807ed327e69d273ebc886abbbfb9794 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 { @@ -69,12 +81,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; } @@ -86,7 +98,7 @@ top: 0; bottom: 0; width: 0.25rem; - background-color: var(--primary); + background-color: var(--bs-primary); } .breadcrumb { @@ -97,11 +109,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); opacity: 0; transition: opacity 300ms ease; } @@ -143,3 +155,10 @@ display: none !important; } } + +.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 4f41b0e4da1215cc66cc53211ab55d586d4cb9ac..ecce5c9931743ab06ecf643c2d1c51483677bcd4 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 bootstrap5 utils %} {% block title %}{% translate "Filters" %} · {{ block.super }}{% endblock %} @@ -64,7 +64,7 @@
    {% for form in formset %} -
    +
    {{ form.id.as_hidden }} {{ form.DELETE.as_hidden }} @@ -99,7 +99,7 @@
    {% if study.status == study.EDIT %} -
    +
    {% 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 1b224ffe65abaccbb011a0b55de16705f61bac43..bc3a7c29d9d20da00ddbfc818a2746ce229f87b3 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 c39fe63a29a75fd6f0ca139af6c29085f14d5fb4..a0442ad979577c8e6f999d691fc1a9925ced245f 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 bootstrap5 %} {% block title %}{% translate "Excluded studies" %} · {{ block.super }}{% endblock %} @@ -15,7 +15,7 @@

    -
    +
    {{ form.excluded_studies }}
    @@ -23,14 +23,14 @@
    - {% 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..d2b4df49ae57efdf3d279697ec96c841eb46ee29 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 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 f66be0aa29a42a97a70011f5ce4e35aaf5772e15..bd7893aa65c52852af622b3094cd5e001da814e3 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 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..d6bb1376a1146111ebab8e99c5d0652e69766c3f 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 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 2a946095af2c56ae6a53dae11f4b1233214c3bf0..d5e4b23abed9ee772d5c47e0ca409cb7136f1d90 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 bootstrap5 utils %} {% block title %}{% translate "Studies" %} · {{ block.super }}{% endblock %} @@ -68,12 +68,12 @@ {% for study in object_list %}
  • -
    {{ study.name }}
    +
    {{ study.name }}
    {% if study.contact_person %} -
    {{ study.contact_person }}
    +
    {{ study.contact_person }}
    {% endif %} {% 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 3631058a7b0ea7c7104534d98e42874172c6d598..465272bd34266dcbdb53483c63e9d7bce2c67044 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 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 d359713ef7b53f050ecf163123a52d069af11d26..a923183754fa3a5699bd388944c1faa5cfb769e6 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 bootstrap5 %} {% block title %}{% translate "Member management" %} · {{ block.super }}{% endblock %} @@ -19,15 +19,15 @@ {% for membership in object.studymembership_set.all %}
  • -
    {{ membership.user }}
    +
    {{ membership.user }}
      {% 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_recruitmentsettings_form.html b/castellum/studies/templates/studies/study_recruitmentsettings_form.html index 4ee2cfb6e6fc931a612bfc5e7594dd352598a54d..5c9420ad08af280c349053a974c77b5ebcbea548 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 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 2ce72cf0d8129f14d60903c63dea674d0e62f9ab..4ccc596f875c8f422cc527a7709744b0ec674ccc 100644 --- a/castellum/studies/templates/studies/study_sessions.html +++ b/castellum/studies/templates/studies/study_sessions.html @@ -1,5 +1,5 @@ {% extends "studies/study_recruitmentsettings_base.html" %} -{% load static i18n auth bootstrap4 %} +{% load static i18n auth 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 'Update' %} @@ -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..227b0ce760745e8ba936f8c5e64309e8f1c9b54f 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 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 ab05faa6d2b6bfee0124fae7dab2fec05ccfcd87..adc763ca160585c397bf0dede2abf690bea3f0d1 100644 --- a/castellum/studies/templates/studies/studysession_form.html +++ b/castellum/studies/templates/studies/studysession_form.html @@ -1,5 +1,5 @@ {% extends "studies/study_recruitmentsettings_base.html" %} -{% load static i18n bootstrap4 %} +{% load static i18n 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 b8370025c001afb39fdfab3428c246eb43bae65f..6340bc3a67ca5f806ca73638308bf6c351c448de 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 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..ddcf34a4c178e6d6273804f9821b9feffbf483ad 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 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..09f71229b0ceaf1bd8e67763085614edf88fc26c 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 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..d175c8e43149b0d21cecb2d1a4f960dcc9fb33a3 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 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..049bba5dbc383299d5da800d5e8ee1534221eb65 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 bootstrap5 auth %} {% block title %}{% translate "Duplicates" %} · {{ block.super }}{% endblock %} diff --git a/castellum/subjects/templates/subjects/maintenance_showup.html b/castellum/subjects/templates/subjects/maintenance_showup.html index 31e2f51f1fbe4addb87616e266e53976551bda7d..a753901eb3ba8d038cb1709214697ed220e5d300 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 bootstrap5 auth %} {% block title %}{% translate "Waiting for consent" %} · {{ block.super }}{% endblock %} diff --git a/castellum/subjects/templates/subjects/maintenance_waiting.html b/castellum/subjects/templates/subjects/maintenance_waiting.html index 18395b18ba9040dc524ad8ea592128711f659c3d..afe6b22831fd74fff200859ccb6e51dbd9e8d371 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 bootstrap5 auth %} {% block title %}{% translate "Waiting for consent" %} · {{ block.super }}{% endblock %} diff --git a/castellum/subjects/templates/subjects/subject_add_to_study.html b/castellum/subjects/templates/subjects/subject_add_to_study.html index 5cea334b4e3378d549b03a12048ba5182d66ecc6..6580a3eec906aae8d73cb86b62c63c4ed675fab9 100644 --- a/castellum/subjects/templates/subjects/subject_add_to_study.html +++ b/castellum/subjects/templates/subjects/subject_add_to_study.html @@ -7,9 +7,9 @@
          {% for study in studies %}
        • -
          {{ study }}
          +
          {{ study }}
          {% if study.status == study.FINISHED %} - {% translate 'Finished' %} + {% translate 'Finished' %} {% 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..b2658e547df26aa077c419fa61937182f265482f 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 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 d81328ce8cb2bd3fb8c2dc25bd017b7c60a21b97..2f2b9c5269080b9dc6b0d72f0d9b26f7a15c0014 100644 --- a/castellum/subjects/templates/subjects/subject_confirm_delete.html +++ b/castellum/subjects/templates/subjects/subject_confirm_delete.html @@ -19,7 +19,7 @@ {% for participation in object.participation_set.all %} {% has_perm 'studies.view_study' user participation.study as can_view_study %}
        • -
          +
          {{ participation.study }}
          {% if can_view_study %} {{ participation.study.contact_person }} @@ -27,7 +27,7 @@ {% if participation.status == participation.INVITED %} {{ participation.pseudonym }} {% endif %} - {{ participation|display:'status' }} + {{ participation|display:'status' }}
          {% if can_view_study %} diff --git a/castellum/subjects/templates/subjects/subject_data_protection_form.html b/castellum/subjects/templates/subjects/subject_data_protection_form.html index b2153e3d63b8111f96b34763d9f5fa7613c7657a..42cffb811289e2b575ad52dcc053ac1c50d5cff1 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 bootstrap5 utils %} {% block title %} {% translate "Edit subject" %} · {{ block.super }} @@ -13,34 +13,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 46ad6f8dbd04ef3470712db7ad125e4f4483680d..4862f27f87fb96610a56530403335dcd89d94be0 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 bootstrap5 utils auth appointments %} {% block title %}{% translate "Subject details" %} · {{ block.super }}{% endblock %} diff --git a/castellum/subjects/templates/subjects/subject_participationlist.html b/castellum/subjects/templates/subjects/subject_participationlist.html index 8b7779841961076d96e577ae2043540ee86ed663..58e65724ac629a81e626e3648f33f9fa5b935903 100644 --- a/castellum/subjects/templates/subjects/subject_participationlist.html +++ b/castellum/subjects/templates/subjects/subject_participationlist.html @@ -7,7 +7,7 @@
            {% for participation in object_list %}
          • -
            {{ participation.study }}
            +
            {{ participation.study }}
            {% has_perm 'recruitment.conduct_study' user participation.study as can_view_participation_pseudonyms %} {% if can_view_participation_pseudonyms %} @@ -37,7 +37,7 @@
              {% for participation in finished_list %}
            • -
              {{ participation.study }}
              +
              {{ participation.study }}
              • {% empty %} diff --git a/castellum/subjects/templates/subjects/subject_search.html b/castellum/subjects/templates/subjects/subject_search.html index 4e3d12785aab2c39a60861774e16a23f20565a42..a3da3438509db1d097446e477c8e978d3feb946a 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 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 @@
              @@ -63,7 +63,7 @@
              - {% translate "Admin" %} + {% translate "Admin" %}
              • diff --git a/castellum/templates/login.html b/castellum/templates/login.html index 4c9470f67e86368fced58745a7fd5a3e37425676..128e40857e7cbc0ec507d51625db352c644fbc41 100644 --- a/castellum/templates/login.html +++ b/castellum/templates/login.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load i18n bootstrap4 %} +{% load i18n bootstrap5 %} {% block title %}{% translate "Log in" %} · {{ block.super }}{% endblock %} diff --git a/castellum/utils/templates/utils/widgets/splitdatetime.html b/castellum/utils/templates/utils/widgets/splitdatetime.html index 0321e7782944e477cb6fb3d4ca6590d8335ca6dd..8d5ff227eec392c7bad75a0fb6de6ad38e9fb69c 100644 --- a/castellum/utils/templates/utils/widgets/splitdatetime.html +++ b/castellum/utils/templates/utils/widgets/splitdatetime.html @@ -1,4 +1,4 @@ -
              +
              {% for widget in widget.subwidgets %}
              {% include widget.template_name %}
              {% endfor %} diff --git a/package.json b/package.json index 9e17c0de6533fbb82735748ab6b9cbed162e15b6..703ae85c54bde01459b72f3aeeaf60df880ea879 100644 --- a/package.json +++ b/package.json @@ -3,11 +3,10 @@ "license": "AGPL-3.0-or-later", "dependencies": { "@fortawesome/fontawesome-free": "^5.15.2", - "bootstrap": "^4.6.0", + "@popperjs/core": "^2.6.0", + "bootstrap": "^5.0.0-beta1", "fullcalendar-scheduler": "^5.5.1", "jdenticon": "^3.1.0", - "jquery": "^3.5.1", - "popper.js": "^1.16.0", "vanillajs-datepicker": "^1.1.2" }, "devDependencies": { diff --git a/setup.cfg b/setup.cfg index cee100fb7378885928c8a72a059a656d30c850c9..2afe460a7eca8d2ce9914372485602106dcd1417 100644 --- a/setup.cfg +++ b/setup.cfg @@ -11,7 +11,7 @@ install_requires = castellum-pseudonyms == 0.0.1 cologne-phonetics == 1.2.5 Django == 3.1.5 - django-bootstrap4 == 2.3.1 + django-bs5 == 5.0.0b1 django-ical == 1.7.1 django-npm == 1.0.0 django-parler == 2.2.0