From 5ee653643097bc5c6b24826245821e412bb23f26 Mon Sep 17 00:00:00 2001
From: Alex Tselegidis <alextselegidis@gmail.com>
Date: Tue, 4 Jun 2024 12:24:01 +0200
Subject: [PATCH] Apply the form-select class to select dropdown elements

---
 application/views/components/appointments_modal.php |  8 ++++----
 application/views/components/booking_type_step.php  |  4 ++--
 application/views/components/ldap_import_modal.php  |  2 +-
 .../views/components/unavailabilities_modal.php     |  2 +-
 application/views/pages/account.php                 |  4 ++--
 application/views/pages/admins.php                  |  4 ++--
 application/views/pages/customers.php               |  2 +-
 application/views/pages/general_settings.php        | 13 +++++++------
 application/views/pages/installation.php            |  2 +-
 application/views/pages/providers.php               |  4 ++--
 application/views/pages/secretaries.php             |  4 ++--
 application/views/pages/services.php                |  4 ++--
 assets/css/layouts/backend_layout.scss              |  1 +
 13 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/application/views/components/appointments_modal.php b/application/views/components/appointments_modal.php
index 879a1aac..55a401ad 100644
--- a/application/views/components/appointments_modal.php
+++ b/application/views/components/appointments_modal.php
@@ -39,7 +39,7 @@
                                         <?= lang('service') ?>
                                         <span class="text-danger">*</span>
                                     </label>
-                                    <select id="select-service" class="required form-control">
+                                    <select id="select-service" class="required form-select">
                                         <?php
                                         // Group services by category, only if there is at least one service
                                         // with a parent category.
@@ -115,7 +115,7 @@
                                         <?= lang('provider') ?>
                                         <span class="text-danger">*</span>
                                     </label>
-                                    <select id="select-provider" class="required form-control"></select>
+                                    <select id="select-provider" class="required form-select"></select>
                                 </div>
 
                                 <?php slot('after_select_appointment_provider'); ?>
@@ -135,7 +135,7 @@
                                     <label for="appointment-status" class="form-label">
                                         <?= lang('status') ?>
                                     </label>
-                                    <select id="appointment-status" class="form-control">
+                                    <select id="appointment-status" class="form-select">
                                         <?php foreach ($appointment_status_options as $appointment_status_option): ?>
                                             <option value="<?= e($appointment_status_option) ?>">
                                                 <?= e($appointment_status_option) ?>
@@ -276,7 +276,7 @@
                                         <?= lang('language') ?>
                                         <span class="text-danger" hidden>*</span>
                                     </label>
-                                    <select id="language" class="form-control required">
+                                    <select id="language" class="form-select required">
                                         <?php foreach (vars('available_languages') as $available_language): ?>
                                             <option value="<?= $available_language ?>">
                                                 <?= ucfirst($available_language) ?>
diff --git a/application/views/components/booking_type_step.php b/application/views/components/booking_type_step.php
index 496ac6ca..eeb1a218 100644
--- a/application/views/components/booking_type_step.php
+++ b/application/views/components/booking_type_step.php
@@ -17,7 +17,7 @@
                         <strong><?= lang('service') ?></strong>
                     </label>
 
-                    <select id="select-service" class="form-control">
+                    <select id="select-service" class="form-select">
                         <?php
                         // Group services by category, only if there is at least one service with a parent category.
                         $has_category = false;
@@ -82,7 +82,7 @@
                         <strong><?= lang('provider') ?></strong>
                     </label>
 
-                    <select id="select-provider" class="form-control"></select>
+                    <select id="select-provider" class="form-select"></select>
                 </div>
 
                 <?php slot('after_select_provider'); ?>
diff --git a/application/views/components/ldap_import_modal.php b/application/views/components/ldap_import_modal.php
index 4468140e..37d3a190 100644
--- a/application/views/components/ldap_import_modal.php
+++ b/application/views/components/ldap_import_modal.php
@@ -28,7 +28,7 @@
                         <?= lang('role') ?>
                         <span class="text-danger">*</span>
                     </label>
-                    <select id="ldap-import-role-slug" class="form-control required">
+                    <select id="ldap-import-role-slug" class="form-select required">
                         <?php foreach ($roles as $role): ?>
                             <option value="<?= $role['slug'] ?>">
                                 <?= $role['name'] ?>
diff --git a/application/views/components/unavailabilities_modal.php b/application/views/components/unavailabilities_modal.php
index 359197e0..5594fafc 100644
--- a/application/views/components/unavailabilities_modal.php
+++ b/application/views/components/unavailabilities_modal.php
@@ -25,7 +25,7 @@
                             <label for="unavailability-provider" class="form-label">
                                 <?= lang('provider') ?>
                             </label>
-                            <select id="unavailability-provider" class="form-control"></select>
+                            <select id="unavailability-provider" class="form-select"></select>
                         </div>
 
                         <?php slot('after_select_appointment_provider'); ?>
diff --git a/application/views/pages/account.php b/application/views/pages/account.php
index 5f1888c8..1900c4bf 100644
--- a/application/views/pages/account.php
+++ b/application/views/pages/account.php
@@ -129,7 +129,7 @@
                                     <label class="form-label" for="calendar-view"><?= lang('calendar') ?>
                                         <span class="text-danger">*</span>
                                     </label>
-                                    <select id="calendar-view" class="form-control required">
+                                    <select id="calendar-view" class="form-select required">
                                         <option value="default"><?= lang('default') ?></option>
                                         <option value="table"><?= lang('table') ?></option>
                                     </select>
@@ -140,7 +140,7 @@
                                         <?= lang('language') ?>
                                         <span class="text-danger" hidden>*</span>
                                     </label>
-                                    <select id="language" class="form-control required">
+                                    <select id="language" class="form-select required">
                                         <?php foreach (vars('available_languages') as $available_language): ?>
                                             <option value="<?= $available_language ?>">
                                                 <?= ucfirst($available_language) ?>
diff --git a/application/views/pages/admins.php b/application/views/pages/admins.php
index 6a77ff5f..379c7378 100755
--- a/application/views/pages/admins.php
+++ b/application/views/pages/admins.php
@@ -177,7 +177,7 @@
                             <?= lang('calendar') ?>
                             <span class="text-danger" hidden>*</span>
                         </label>
-                        <select id="calendar-view" class="form-control required" disabled>
+                        <select id="calendar-view" class="form-select required" disabled>
                             <option value="default"><?= lang('default') ?></option>
                             <option value="table"><?= lang('table') ?></option>
                         </select>
@@ -188,7 +188,7 @@
                             <?= lang('language') ?>
                             <span class="text-danger" hidden>*</span>
                         </label>
-                        <select id="language" class="form-control required" disabled>
+                        <select id="language" class="form-select required" disabled>
                             <?php foreach (vars('available_languages') as $available_language): ?>
                                 <option value="<?= $available_language ?>">
                                     <?= ucfirst($available_language) ?>
diff --git a/application/views/pages/customers.php b/application/views/pages/customers.php
index 3108e4d8..d3846849 100755
--- a/application/views/pages/customers.php
+++ b/application/views/pages/customers.php
@@ -165,7 +165,7 @@
                             <?= lang('language') ?>
                             <span class="text-danger" hidden>*</span>
                         </label>
-                        <select id="language" class="form-control required" disabled>
+                        <select id="language" class="form-select required" disabled>
                             <?php foreach (vars('available_languages') as $available_language): ?>
                                 <option value="<?= $available_language ?>">
                                     <?= ucfirst($available_language) ?>
diff --git a/application/views/pages/general_settings.php b/application/views/pages/general_settings.php
index ebe12cac..a1e7ba82 100755
--- a/application/views/pages/general_settings.php
+++ b/application/views/pages/general_settings.php
@@ -121,7 +121,7 @@
                                         <?= lang('theme') ?>
                                     </label>
 
-                                    <select id="theme" data-field="theme" class="form-control">
+                                    <select id="theme" data-field="theme" class="form-select">
                                         <?php foreach (vars('available_themes') as $available_theme): ?>
                                             <option value="<?= $available_theme ?>">
                                                 <?= ucfirst($available_theme) ?>
@@ -147,7 +147,7 @@
                                     <label class="form-label" for="date-format">
                                         <?= lang('date_format') ?>
                                     </label>
-                                    <select class="form-control" id="date-format" data-field="date_format">
+                                    <select class="form-select" id="date-format" data-field="date_format">
                                         <option value="DMY">DMY</option>
                                         <option value="MDY">MDY</option>
                                         <option value="YMD">YMD</option>
@@ -162,7 +162,7 @@
                                     <label class="form-label" for="time-format">
                                         <?= lang('time_format') ?>
                                     </label>
-                                    <select class="form-control" id="time-format" data-field="time_format">
+                                    <select class="form-select" id="time-format" data-field="time_format">
                                         <option value="<?= TIME_FORMAT_REGULAR ?>">H:MM AM/PM</option>
                                         <option value="<?= TIME_FORMAT_MILITARY ?>">HH:MM</option>
                                     </select>
@@ -176,7 +176,7 @@
                                     <label class="form-label" for="first-weekday">
                                         <?= lang('first_weekday') ?>
                                     </label>
-                                    <select class="form-control" id="first-weekday" data-field="first_weekday">
+                                    <select class="form-select" id="first-weekday" data-field="first_weekday">
                                         <option value="sunday"><?= lang('sunday') ?></option>
                                         <option value="monday"><?= lang('monday') ?></option>
                                         <option value="tuesday"><?= lang('tuesday') ?></option>
@@ -197,7 +197,7 @@
                                         <?= lang('default_language') ?>
                                         <span class="text-danger" hidden>*</span>
                                     </label>
-                                    <select id="default-language" class="form-control required" data-field="default_language">
+                                    <select id="default-language" class="form-select required" data-field="default_language">
                                         <?php foreach (vars('available_languages') as $available_language): ?>
                                             <option value="<?= $available_language ?>">
                                                 <?= ucfirst($available_language) ?>
@@ -217,7 +217,8 @@
                                         <span class="text-danger" hidden>*</span>
                                     </label>
                                     <?php component('timezone_dropdown', [
-                                        'attributes' => 'id="default-timezone" data-field="default_timezone" class="form-control required"',
+                                        'attributes' =>
+                                            'id="default-timezone" data-field="default_timezone" class="form-control required"',
                                         'grouped_timezones' => vars('grouped_timezones'),
                                     ]); ?>
                                 </div>
diff --git a/application/views/pages/installation.php b/application/views/pages/installation.php
index e80289dd..bdbdbf91 100755
--- a/application/views/pages/installation.php
+++ b/application/views/pages/installation.php
@@ -106,7 +106,7 @@
                     <?= lang('language') ?>
                     <span class="text-danger">*</span>
                 </label>
-                <select id="language" class="form-control required">
+                <select id="language" class="form-select required">
                     <?php
                     $config_lang = config('language');
                     foreach (vars('available_languages') as $lang): ?>
diff --git a/application/views/pages/providers.php b/application/views/pages/providers.php
index 54e5ff1b..45dbb834 100755
--- a/application/views/pages/providers.php
+++ b/application/views/pages/providers.php
@@ -199,7 +199,7 @@
                                     <?= lang('calendar') ?>
                                     <span class="text-danger" hidden>*</span>
                                 </label>
-                                <select id="calendar-view" class="form-control required" disabled>
+                                <select id="calendar-view" class="form-select required" disabled>
                                     <option value="default"><?= lang('default') ?></option>
                                     <option value="table"><?= lang('table') ?></option>
                                 </select>
@@ -210,7 +210,7 @@
                                     <?= lang('language') ?>
                                     <span class="text-danger" hidden>*</span>
                                 </label>
-                                <select id="language" class="form-control required" disabled>
+                                <select id="language" class="form-select required" disabled>
                                     <?php foreach (vars('available_languages') as $available_language): ?>
                                         <option value="<?= $available_language ?>">
                                             <?= ucfirst($available_language) ?>
diff --git a/application/views/pages/secretaries.php b/application/views/pages/secretaries.php
index b7a9084f..9c378af6 100755
--- a/application/views/pages/secretaries.php
+++ b/application/views/pages/secretaries.php
@@ -176,7 +176,7 @@
                             <?= lang('calendar') ?>
                             <span class="text-danger" hidden>*</span>
                         </label>
-                        <select id="calendar-view" class="form-control required" disabled>
+                        <select id="calendar-view" class="form-select required" disabled>
                             <option value="default"><?= lang('default') ?></option>
                             <option value="table"><?= lang('table') ?></option>
                         </select>
@@ -187,7 +187,7 @@
                             <?= lang('language') ?>
                             <span class="text-danger" hidden>*</span>
                         </label>
-                        <select id="language" class="form-control required" disabled>
+                        <select id="language" class="form-select required" disabled>
                             <?php foreach (vars('available_languages') as $available_language): ?>
                                 <option value="<?= $available_language ?>">
                                     <?= ucfirst($available_language) ?>
diff --git a/application/views/pages/services.php b/application/views/pages/services.php
index 2799e268..3a86fa6d 100755
--- a/application/views/pages/services.php
+++ b/application/views/pages/services.php
@@ -102,7 +102,7 @@
                 <label class="form-label" for="service-category-id">
                     <?= lang('category') ?>
                 </label>
-                <select id="service-category-id" class="form-control" disabled></select>
+                <select id="service-category-id" class="form-select" disabled></select>
             </div>
 
             <div class="mb-3">
@@ -110,7 +110,7 @@
                     <?= lang('availabilities_type') ?>
 
                 </label>
-                <select id="availabilities-type" class="form-control" disabled>
+                <select id="availabilities-type" class="form-select" disabled>
                     <option value="<?= AVAILABILITIES_TYPE_FLEXIBLE ?>">
                         <?= lang('flexible') ?>
                     </option>
diff --git a/assets/css/layouts/backend_layout.scss b/assets/css/layouts/backend_layout.scss
index 43f0516b..cf47f5f8 100644
--- a/assets/css/layouts/backend_layout.scss
+++ b/assets/css/layouts/backend_layout.scss
@@ -468,6 +468,7 @@ body legend {
 #calendar .fc-event {
     border: 1px solid #4790ca;
     background-color: #4790ca;
+    color: #333;
     min-height: 12px;
 }