From 4a9f5f4a87f381f1711dbcc6dd6bfabb2259aa09 Mon Sep 17 00:00:00 2001
From: Alex Tselegidis <alextselegidis@gmail.com>
Date: Tue, 23 Nov 2021 08:35:39 +0100
Subject: [PATCH] Updated the modal close button

---
 application/views/components/cookie_notice_modal.php          | 2 +-
 application/views/components/manage_appointment_modal.php     | 2 +-
 application/views/components/manage_unavailable_modal.php     | 2 +-
 application/views/components/privacy_policy_modal.php         | 2 +-
 application/views/components/select_google_calendar_modal.php | 2 +-
 application/views/components/terms_and_conditions_modal.php   | 3 +--
 .../views/components/working_plan_exceptions_modal.php        | 4 +---
 7 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/application/views/components/cookie_notice_modal.php b/application/views/components/cookie_notice_modal.php
index 75c80c44..2d98910e 100644
--- a/application/views/components/cookie_notice_modal.php
+++ b/application/views/components/cookie_notice_modal.php
@@ -8,7 +8,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h4 class="modal-title"><?= lang('cookie_notice') ?></h4>
-                <button type="button" class="close" data-dismiss="modal"><span>&times;</span></button>
+                <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
             </div>
             <div class="modal-body">
                 <p><?= $cookie_notice_content ?></p>
diff --git a/application/views/components/manage_appointment_modal.php b/application/views/components/manage_appointment_modal.php
index 58050319..d9d340e6 100644
--- a/application/views/components/manage_appointment_modal.php
+++ b/application/views/components/manage_appointment_modal.php
@@ -9,7 +9,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h3 class="modal-title"><?= lang('edit_appointment_title') ?></h3>
-                <button class="close" data-dismiss="modal">&times;</button>
+                <button class="btn-close" data-bs-dismiss="modal"></button>
             </div>
 
             <div class="modal-body">
diff --git a/application/views/components/manage_unavailable_modal.php b/application/views/components/manage_unavailable_modal.php
index 47f63834..ff380b01 100644
--- a/application/views/components/manage_unavailable_modal.php
+++ b/application/views/components/manage_unavailable_modal.php
@@ -9,7 +9,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h3 class="modal-title"><?= lang('new_unavailable_title') ?></h3>
-                <button class="close" data-dismiss="modal">&times;</button>
+                <button class="btn-close" data-bs-dismiss="modal"></button>
             </div>
             <div class="modal-body">
                 <div class="modal-message alert d-none"></div>
diff --git a/application/views/components/privacy_policy_modal.php b/application/views/components/privacy_policy_modal.php
index b7a8d11c..ccab3084 100644
--- a/application/views/components/privacy_policy_modal.php
+++ b/application/views/components/privacy_policy_modal.php
@@ -9,7 +9,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h4 class="modal-title"><?= lang('privacy_policy') ?></h4>
-                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span>
+                <button type="button" class="btn-close" data-bs-dismiss="modal"><span aria-hidden="true"></span>
                 </button>
             </div>
             <div class="modal-body">
diff --git a/application/views/components/select_google_calendar_modal.php b/application/views/components/select_google_calendar_modal.php
index a671aecb..38733ebc 100644
--- a/application/views/components/select_google_calendar_modal.php
+++ b/application/views/components/select_google_calendar_modal.php
@@ -3,7 +3,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h3 class="modal-title"><?= lang('select_google_calendar') ?></h3>
-                <button class="close" data-dismiss="modal">&times;</button>
+                <button class="btn-close" data-bs-dismiss="modal"></button>
             </div>
             <div class="modal-body">
                 <div class="form-group">
diff --git a/application/views/components/terms_and_conditions_modal.php b/application/views/components/terms_and_conditions_modal.php
index a7fb1bfb..b9295051 100644
--- a/application/views/components/terms_and_conditions_modal.php
+++ b/application/views/components/terms_and_conditions_modal.php
@@ -9,8 +9,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h4 class="modal-title"><?= lang('terms_and_conditions') ?></h4>
-                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span>
-                </button>
+                <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
             </div>
             <div class="modal-body">
                 <p><?= $terms_and_conditions_content ?></p>
diff --git a/application/views/components/working_plan_exceptions_modal.php b/application/views/components/working_plan_exceptions_modal.php
index f876b61a..2f1fc8a6 100644
--- a/application/views/components/working_plan_exceptions_modal.php
+++ b/application/views/components/working_plan_exceptions_modal.php
@@ -4,9 +4,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title"><?= lang('working_plan_exception') ?></h5>
-                <button type="button" class="close" data-dismiss="modal">
-                    <span>&times;</span>
-                </button>
+                <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
             </div>
             <div class="modal-body">
                 <div class="form-group">