From 3b0c361b17abcb039a50ccc5e019984baae59244 Mon Sep 17 00:00:00 2001
From: Tobias Bengfort <bengfort@mpib-berlin.mpg.de>
Date: Tue, 11 Jan 2022 12:35:34 +0100
Subject: [PATCH 01/10] update bootstrap

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e6bea5a..a1cbefd 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,6 @@
   "name": "scheduler",
   "version": "1.0.0",
   "dependencies": {
-    "bootstrap": "^4.6.1"
+    "bootstrap": "^5.1.3"
   }
 }
-- 
GitLab


From 3cbf262816e2ef00efa2c1f16d3d977671052af2 Mon Sep 17 00:00:00 2001
From: Tobias Bengfort <bengfort@mpib-berlin.mpg.de>
Date: Tue, 11 Jan 2022 12:38:57 +0100
Subject: [PATCH 02/10] switch to django-bootstrap5

---
 scheduler/main/templates/base.html | 2 +-
 scheduler/settings/default.py      | 5 ++---
 setup.cfg                          | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/scheduler/main/templates/base.html b/scheduler/main/templates/base.html
index aa9e306..27fdec0 100644
--- a/scheduler/main/templates/base.html
+++ b/scheduler/main/templates/base.html
@@ -31,7 +31,7 @@
     </header>
     <main class="container py-3">
         {% for message in messages %}
-            <div class="{{ message|bootstrap_message_classes }}" role="alert">
+            <div class="alert alert-{{ message|bootstrap_message_alert_type }}" role="alert">
                 {{ message }}
             </div>
         {% endfor %}
diff --git a/scheduler/settings/default.py b/scheduler/settings/default.py
index 474362d..bf142bc 100644
--- a/scheduler/settings/default.py
+++ b/scheduler/settings/default.py
@@ -14,7 +14,7 @@ INSTALLED_APPS = [
     'django.contrib.staticfiles',
     'django.contrib.sites',
     'django.contrib.flatpages',
-    'bootstrap4',
+    'django_bootstrap5',
     'scheduler.main',
 ]
 
@@ -115,9 +115,8 @@ NPM_FILE_PATTERNS = {
     ],
 }
 
-BOOTSTRAP4 = {
+BOOTSTRAP5 = {
     'set_placeholder': False,
-    'success_css_class': None,
 }
 
 TITLE = 'Scheduler'
diff --git a/setup.cfg b/setup.cfg
index c96eced..6fe70fc 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -9,7 +9,7 @@ include_package_data = True
 packages = find:
 install_requires =
     Django == 3.2.11
-    django-bootstrap4 == 21.2
+    django-bootstrap5 == 21.3
     django-npm == 1.0.0
 
 [options.extras_require]
-- 
GitLab


From 3b864636ab81aa2a9259f284e9061436d7936ae0 Mon Sep 17 00:00:00 2001
From: Tobias Bengfort <bengfort@mpib-berlin.mpg.de>
Date: Tue, 11 Jan 2022 12:39:09 +0100
Subject: [PATCH 03/10] create migration script

---
 migrate.sh | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100755 migrate.sh

diff --git a/migrate.sh b/migrate.sh
new file mode 100755
index 0000000..0780269
--- /dev/null
+++ b/migrate.sh
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+sed -i 's/\(load.*\)bootstrap4/\1django_bootstrap5/g' `git grep -l 'bootstrap4' scheduler`
+git commit -a -m "auto-adapt bootstrap template library"
+
+sed -i 's/var(--/var(--bs-/g' `git ls-files scheduler | grep 'css'`
+git commit -a -m "auto-adapt CSS variables"
+
+sed -i 's/data-\(toggle\|dismiss\)/data-bs-\1/g' `git grep -l 'data-' scheduler`
+sed -i 's/\(data-bs.*\)data-target/\1data-bs-target/g' `git grep -l 'data-' scheduler`
+git commit -a -m "auto-adapt data-* hooks"
+
+sed -i 's/mr-/me-/g' `git grep -l 'mr-' scheduler`
+sed -i 's/ml-/ms-/g' `git grep -l 'ml-' scheduler`
+sed -i 's/text-right/text-end/g' `git grep -l 'text-right' scheduler`
+sed -i 's/text-left/text-start/g' `git grep -l 'text-left' scheduler`
+sed -i 's/float-right/float-end/g' `git grep -l 'float-right' scheduler`
+sed -i 's/float-left/float-start/g' `git grep -l 'float-left' scheduler`
+git commit -a -m "auto-adapt utilities"
+
+sed -i 's/sr-only/visually-hidden/g' `git grep -l 'sr-only' scheduler`
+git commit -a -m "auto-adapt sr-only"
+
+sed -i 's/btn-block/d-block w-100/g' `git grep -l 'btn-block' scheduler`
+git commit -a -m "auto-adapt btn-block"
+
+sed -i 's/form-row/row gx-2/g' `git grep -l 'form-row' scheduler`
+git commit -a -m "auto-adapt form row"
+
+sed -i 's/form-group/mb-3/g' `git grep -l 'form-group' scheduler`
+git commit -a -m "auto-adapt form-group"
+
+sed -i 's/form_group_class=/wrapper_class=/g' `git grep -l 'form_group_class' scheduler`
+git commit -a -m "auto-adapt form_group_class"
+
+sed -i 's/badge-light/bg-light text-body/g' `git grep -l 'badge-light' scheduler`
+sed -i 's/badge-warning/bg-warning text-dark/g' `git grep -l 'badge-warning' scheduler`
+sed -i 's/badge-info/bg-info text-dark/g' `git grep -l 'badge-info' scheduler`
+sed -i 's/badge-/bg-/g' `git grep -l 'badge-' scheduler`
+git commit -a -m "auto-adapt badges"
+
+rm migrate.sh
+git commit -a -m "rm migrate script"
-- 
GitLab


From 2a68a63b1b6d837802c394339aeb8387d3aa0454 Mon Sep 17 00:00:00 2001
From: Tobias Bengfort <bengfort@mpib-berlin.mpg.de>
Date: Tue, 11 Jan 2022 12:45:08 +0100
Subject: [PATCH 04/10] auto-adapt bootstrap template library

---
 scheduler/main/templates/base.html                 | 2 +-
 scheduler/main/templates/main/invitation_form.html | 2 +-
 scheduler/main/templates/main/schedule_form.html   | 2 +-
 scheduler/main/templates/main/schedule_list.html   | 2 +-
 scheduler/main/templates/registration/login.html   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scheduler/main/templates/base.html b/scheduler/main/templates/base.html
index 27fdec0..b14386a 100644
--- a/scheduler/main/templates/base.html
+++ b/scheduler/main/templates/base.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-{% load i18n static bootstrap4 %}
+{% load i18n static django_bootstrap5 %}
 {% get_current_language as LANGUAGE_CODE %}
 <html lang="{{ LANGUAGE_CODE }}">
 <head>
diff --git a/scheduler/main/templates/main/invitation_form.html b/scheduler/main/templates/main/invitation_form.html
index 838011f..72feedf 100644
--- a/scheduler/main/templates/main/invitation_form.html
+++ b/scheduler/main/templates/main/invitation_form.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load static i18n bootstrap4 %}
+{% load static i18n django_bootstrap5 %}
 
 {% block title %}{% translate "Schedule appointment" %}{% endblock %}
 
diff --git a/scheduler/main/templates/main/schedule_form.html b/scheduler/main/templates/main/schedule_form.html
index 4ca63f2..0585a36 100644
--- a/scheduler/main/templates/main/schedule_form.html
+++ b/scheduler/main/templates/main/schedule_form.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load static i18n bootstrap4 %}
+{% load static i18n django_bootstrap5 %}
 
 {% block title %}
     {% if object %}
diff --git a/scheduler/main/templates/main/schedule_list.html b/scheduler/main/templates/main/schedule_list.html
index 6967317..c467c46 100644
--- a/scheduler/main/templates/main/schedule_list.html
+++ b/scheduler/main/templates/main/schedule_list.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n bootstrap4 %}
+{% load i18n django_bootstrap5 %}
 
 {% block title %}{% translate "Start" %} &middot; {{ block.super }}{% endblock %}
 
diff --git a/scheduler/main/templates/registration/login.html b/scheduler/main/templates/registration/login.html
index 0613b35..8929089 100644
--- a/scheduler/main/templates/registration/login.html
+++ b/scheduler/main/templates/registration/login.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n bootstrap4 %}
+{% load i18n django_bootstrap5 %}
 
 {% block title %}{% translate "Log in" %} &middot; {{ block.super }}{% endblock %}
 
-- 
GitLab


From 14f02c1d6baf32a275ffcb365ae4386219224f0a Mon Sep 17 00:00:00 2001
From: Tobias Bengfort <bengfort@mpib-berlin.mpg.de>
Date: Tue, 11 Jan 2022 12:45:08 +0100
Subject: [PATCH 05/10] auto-adapt CSS variables

---
 scheduler/main/static/style.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scheduler/main/static/style.css b/scheduler/main/static/style.css
index 8dbf9a9..452ee09 100644
--- a/scheduler/main/static/style.css
+++ b/scheduler/main/static/style.css
@@ -1,5 +1,5 @@
 .container {
-    max-width: var(--breakpoint-md, 768px);
+    max-width: var(--bs-breakpoint-md, 768px);
 }
 
 .full-width {
@@ -40,8 +40,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;
 }
-- 
GitLab


From 938c537ae31fff7b183e2f2c09bd94ec43a5ddd6 Mon Sep 17 00:00:00 2001
From: Tobias Bengfort <bengfort@mpib-berlin.mpg.de>
Date: Tue, 11 Jan 2022 12:45:08 +0100
Subject: [PATCH 06/10] auto-adapt utilities

---
 scheduler/main/templates/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scheduler/main/templates/base.html b/scheduler/main/templates/base.html
index b14386a..5ea312b 100644
--- a/scheduler/main/templates/base.html
+++ b/scheduler/main/templates/base.html
@@ -14,7 +14,7 @@
 <body>
     <header class="bg-dark">
         <nav class="container navbar navbar-expand-sm navbar-dark">
-            <ul class="navbar-nav mr-auto">
+            <ul class="navbar-nav me-auto">
                 <li class="nav-item">
                     <a {% if user.is_authenticated %}href="/" rel="home"{% endif %} class="navbar-brand">{{ TITLE }}</a>
                 </li>
-- 
GitLab


From 4885b04d516e7f9a76c1fbc8cfd5a59a69ba6c12 Mon Sep 17 00:00:00 2001
From: Tobias Bengfort <bengfort@mpib-berlin.mpg.de>
Date: Tue, 11 Jan 2022 12:45:08 +0100
Subject: [PATCH 07/10] auto-adapt form row

---
 scheduler/main/templates/main/schedule_form.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scheduler/main/templates/main/schedule_form.html b/scheduler/main/templates/main/schedule_form.html
index 0585a36..a6e7bae 100644
--- a/scheduler/main/templates/main/schedule_form.html
+++ b/scheduler/main/templates/main/schedule_form.html
@@ -22,7 +22,7 @@
         <fieldset>
             <legend>{% translate 'Timeslots' %}</legend>
 
-            <div class="form-row">
+            <div class="row gx-2">
                 <div class="form-group col col-sm-4">
                     <input type="date" form="add_date" name="input" class="form-control" required>
                 </div>
@@ -30,7 +30,7 @@
                     <button form="add_date" class="btn btn-secondary">{% translate 'Add date' %}</button>
                 </div>
             </div>
-            <div class="form-row">
+            <div class="row gx-2">
                 <div class="form-group col col-sm-4">
                     <input type="time" form="add_time" name="input" class="form-control" required>
                 </div>
-- 
GitLab


From 0408e886c4c4c54b14e04a24f59e175b5d82d278 Mon Sep 17 00:00:00 2001
From: Tobias Bengfort <bengfort@mpib-berlin.mpg.de>
Date: Tue, 11 Jan 2022 12:45:08 +0100
Subject: [PATCH 08/10] auto-adapt form-group

---
 scheduler/main/templates/main/schedule_form.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scheduler/main/templates/main/schedule_form.html b/scheduler/main/templates/main/schedule_form.html
index a6e7bae..335b9e8 100644
--- a/scheduler/main/templates/main/schedule_form.html
+++ b/scheduler/main/templates/main/schedule_form.html
@@ -23,7 +23,7 @@
             <legend>{% translate 'Timeslots' %}</legend>
 
             <div class="row gx-2">
-                <div class="form-group col col-sm-4">
+                <div class="mb-3 col col-sm-4">
                     <input type="date" form="add_date" name="input" class="form-control" required>
                 </div>
                 <div class="col">
@@ -31,7 +31,7 @@
                 </div>
             </div>
             <div class="row gx-2">
-                <div class="form-group col col-sm-4">
+                <div class="mb-3 col col-sm-4">
                     <input type="time" form="add_time" name="input" class="form-control" required>
                 </div>
                 <div class="col">
@@ -66,7 +66,7 @@
         </fieldset>
 
         {% if object %}
-            <div class="form-group">
+            <div class="mb-3">
                 <label for="id_schedule_id">{% translate 'Schedule ID' %}</label>
                 <div class="input-group">
                     <input id="id_schedule_id" class="form-control" value="{{ object.uuid }}" readonly>
-- 
GitLab


From cbad7f5fc289359628b205837cda65c40630bdc4 Mon Sep 17 00:00:00 2001
From: Tobias Bengfort <bengfort@mpib-berlin.mpg.de>
Date: Tue, 11 Jan 2022 12:45:08 +0100
Subject: [PATCH 09/10] rm migrate script

---
 migrate.sh | 43 -------------------------------------------
 1 file changed, 43 deletions(-)
 delete mode 100755 migrate.sh

diff --git a/migrate.sh b/migrate.sh
deleted file mode 100755
index 0780269..0000000
--- a/migrate.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-sed -i 's/\(load.*\)bootstrap4/\1django_bootstrap5/g' `git grep -l 'bootstrap4' scheduler`
-git commit -a -m "auto-adapt bootstrap template library"
-
-sed -i 's/var(--/var(--bs-/g' `git ls-files scheduler | grep 'css'`
-git commit -a -m "auto-adapt CSS variables"
-
-sed -i 's/data-\(toggle\|dismiss\)/data-bs-\1/g' `git grep -l 'data-' scheduler`
-sed -i 's/\(data-bs.*\)data-target/\1data-bs-target/g' `git grep -l 'data-' scheduler`
-git commit -a -m "auto-adapt data-* hooks"
-
-sed -i 's/mr-/me-/g' `git grep -l 'mr-' scheduler`
-sed -i 's/ml-/ms-/g' `git grep -l 'ml-' scheduler`
-sed -i 's/text-right/text-end/g' `git grep -l 'text-right' scheduler`
-sed -i 's/text-left/text-start/g' `git grep -l 'text-left' scheduler`
-sed -i 's/float-right/float-end/g' `git grep -l 'float-right' scheduler`
-sed -i 's/float-left/float-start/g' `git grep -l 'float-left' scheduler`
-git commit -a -m "auto-adapt utilities"
-
-sed -i 's/sr-only/visually-hidden/g' `git grep -l 'sr-only' scheduler`
-git commit -a -m "auto-adapt sr-only"
-
-sed -i 's/btn-block/d-block w-100/g' `git grep -l 'btn-block' scheduler`
-git commit -a -m "auto-adapt btn-block"
-
-sed -i 's/form-row/row gx-2/g' `git grep -l 'form-row' scheduler`
-git commit -a -m "auto-adapt form row"
-
-sed -i 's/form-group/mb-3/g' `git grep -l 'form-group' scheduler`
-git commit -a -m "auto-adapt form-group"
-
-sed -i 's/form_group_class=/wrapper_class=/g' `git grep -l 'form_group_class' scheduler`
-git commit -a -m "auto-adapt form_group_class"
-
-sed -i 's/badge-light/bg-light text-body/g' `git grep -l 'badge-light' scheduler`
-sed -i 's/badge-warning/bg-warning text-dark/g' `git grep -l 'badge-warning' scheduler`
-sed -i 's/badge-info/bg-info text-dark/g' `git grep -l 'badge-info' scheduler`
-sed -i 's/badge-/bg-/g' `git grep -l 'badge-' scheduler`
-git commit -a -m "auto-adapt badges"
-
-rm migrate.sh
-git commit -a -m "rm migrate script"
-- 
GitLab


From 0cf8a16409a199067b029e5a91c049d8c1f61c3c Mon Sep 17 00:00:00 2001
From: Tobias Bengfort <bengfort@mpib-berlin.mpg.de>
Date: Tue, 11 Jan 2022 12:52:50 +0100
Subject: [PATCH 10/10] manual adjustments

---
 scheduler/main/templates/base.html               | 4 +---
 scheduler/main/templates/main/schedule_form.html | 8 ++++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/scheduler/main/templates/base.html b/scheduler/main/templates/base.html
index 5ea312b..237cec7 100644
--- a/scheduler/main/templates/base.html
+++ b/scheduler/main/templates/base.html
@@ -14,10 +14,8 @@
 <body>
     <header class="bg-dark">
         <nav class="container navbar navbar-expand-sm navbar-dark">
+            <a {% if user.is_authenticated %}href="/" rel="home"{% endif %} class="navbar-brand">{{ TITLE }}</a>
             <ul class="navbar-nav me-auto">
-                <li class="nav-item">
-                    <a {% if user.is_authenticated %}href="/" rel="home"{% endif %} class="navbar-brand">{{ TITLE }}</a>
-                </li>
                 {% for href, label in NAV %}
                     <li class="nav-item">
                         <a class="nav-link" href="{{ href }}">{{ label }}</a>
diff --git a/scheduler/main/templates/main/schedule_form.html b/scheduler/main/templates/main/schedule_form.html
index 335b9e8..1b4dda5 100644
--- a/scheduler/main/templates/main/schedule_form.html
+++ b/scheduler/main/templates/main/schedule_form.html
@@ -22,16 +22,16 @@
         <fieldset>
             <legend>{% translate 'Timeslots' %}</legend>
 
-            <div class="row gx-2">
-                <div class="mb-3 col col-sm-4">
+            <div class="mb-3 row gx-2">
+                <div class="col col-sm-4">
                     <input type="date" form="add_date" name="input" class="form-control" required>
                 </div>
                 <div class="col">
                     <button form="add_date" class="btn btn-secondary">{% translate 'Add date' %}</button>
                 </div>
             </div>
-            <div class="row gx-2">
-                <div class="mb-3 col col-sm-4">
+            <div class="mb-3 row gx-2">
+                <div class="col col-sm-4">
                     <input type="time" form="add_time" name="input" class="form-control" required>
                 </div>
                 <div class="col">
-- 
GitLab