From 1f1bace02d576b4a30939821b06b05d9a15f0268 Mon Sep 17 00:00:00 2001
From: Romain Boissieres <romain.boissieres@makina-corpus.com>
Date: Thu, 11 Apr 2024 16:29:09 +0200
Subject: [PATCH 1/2] [OSIS-9022] osis-async modal migration BS5

---
 osis_async/templates/osis_async/modal_async_progress.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/osis_async/templates/osis_async/modal_async_progress.html b/osis_async/templates/osis_async/modal_async_progress.html
index fc56f31..1df892f 100644
--- a/osis_async/templates/osis_async/modal_async_progress.html
+++ b/osis_async/templates/osis_async/modal_async_progress.html
@@ -36,8 +36,10 @@
      {% endif %}
 >
     <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal">×</button>
-        {% block modal_title %}{% endblock modal_title %}
+        <button type="button" class="close hide-bs3-element" data-dismiss="modal">×</button>
+       {% block modal_title %}{% endblock modal_title %}
+       <button type="button" class="btn-close d-none display-bs5-element"
+       data-dismiss="modal"  data-bs-dismiss="modal" aria-label="{% trans 'close' %}"></button>
     </div>
     <div class="modal-body">
         <div class="progress">
@@ -68,7 +70,7 @@
     </div>
     <div class="modal-footer">
         {% block modal_footer %}
-            <button type="button" class="btn btn-secondary" data-dismiss="modal">{% trans 'Ok' %}</button>
+            <button type="button" class="btn btn-primary" data-dismiss="modal" data-bs-dismiss="modal">{% trans 'Ok' %}</button>
         {% endblock %}
     </div>
 </div>

From 74afbc433bd2c8d22217f4d7616341a4980b3bc8 Mon Sep 17 00:00:00 2001
From: Mathieu Zen <zen.mathieu@gmail.com>
Date: Mon, 6 May 2024 09:58:29 +0200
Subject: [PATCH 2/2] Update modal_async_progress.html

---
 osis_async/templates/osis_async/modal_async_progress.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osis_async/templates/osis_async/modal_async_progress.html b/osis_async/templates/osis_async/modal_async_progress.html
index fc56f31..3cd203b 100644
--- a/osis_async/templates/osis_async/modal_async_progress.html
+++ b/osis_async/templates/osis_async/modal_async_progress.html
@@ -68,7 +68,7 @@
     </div>
     <div class="modal-footer">
         {% block modal_footer %}
-            <button type="button" class="btn btn-secondary" data-dismiss="modal">{% trans 'Ok' %}</button>
+            <button type="button" class="btn btn-secondary" data-dismiss="modal" data-bs-dismiss="modal">{% trans 'Ok' %}</button>
         {% endblock %}
     </div>
 </div>