From c3062eb4f95db9145f851a37246b51caf0a9e457 Mon Sep 17 00:00:00 2001
From: labmecanicatec <58854556+labmecanicatec@users.noreply.github.com>
Date: Sat, 31 Aug 2024 12:09:16 -0500
Subject: [PATCH 01/23] Correctly hide the #reservation-box modal after
 creating a reservation in resource-display.php?rid=

---
 Web/scripts/resourceDisplay.js                    | 8 ++++----
 tpl/ResourceDisplay/resource-display-resource.tpl | 7 +++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Web/scripts/resourceDisplay.js b/Web/scripts/resourceDisplay.js
index 6447e0b29..2dc07d2af 100644
--- a/Web/scripts/resourceDisplay.js
+++ b/Web/scripts/resourceDisplay.js
@@ -93,14 +93,14 @@ function ResourceDisplay(opts) {
             e.stopPropagation();
 
             var beforeReserve = function () {
-                $('#validationErrors').addClass('no-show');
+                $('#validationErrors').addClass('d-none');
                 showWait();
             };
 
             var afterReserve = function (data) {
                 var validationErrors = $('#validationErrors');
                 if (data.success) {
-                    validationErrors.find('ul').empty().addClass('no-show');
+                    validationErrors.find('ul').empty().addClass('d-none');
                     hidePopup();
                     resumeRefresh();
                     refreshResource();
@@ -110,9 +110,10 @@ function ResourceDisplay(opts) {
                     validationErrors.find('ul').empty().html($.map(errors, function (item) {
                         return "<li>" + item + "</li>";
                     }));
-                    validationErrors.removeClass('no-show');
+                    validationErrors.removeClass('d-none');
                 }
                 hideWait();
+                $('#reservation-box').modal('hide');
             };
 
             ajaxPost($('#formReserve'), null, beforeReserve, afterReserve);
@@ -251,7 +252,6 @@ function ResourceDisplay(opts) {
     elements.loginButton.click(function (e) {
         e.preventDefault();
         showWait();
-
         elements.loginForm.submit();
     });
 
diff --git a/tpl/ResourceDisplay/resource-display-resource.tpl b/tpl/ResourceDisplay/resource-display-resource.tpl
index ac8009c45..d831ba46b 100644
--- a/tpl/ResourceDisplay/resource-display-resource.tpl
+++ b/tpl/ResourceDisplay/resource-display-resource.tpl
@@ -68,12 +68,11 @@
                         </button>
                     </div>
                     <!-- Modal -->
-                    <div class="modal fade" id="reservation-box" tabindex="-1" aria-labelledby="exampleModalLabel"
-                        aria-hidden="true">
+                    <div class="modal fade" id="reservation-box" tabindex="-1">
                         <div class="modal-dialog modal-fullscreen">
                             <div class="modal-content">
                                 <div class="modal-header">
-                                    <h1 class="modal-title" id="exampleModalLabel">{translate key=Reserve}</h1>
+                                    <h1 class="modal-title">{translate key=Reserve}</h1>
                                     <button type="button" class="btn-close" data-bs-dismiss="modal"
                                         aria-label="Close"></button>
                                 </div>
@@ -83,7 +82,7 @@
                                         <div class="row mt-3">
                                             <div class="col-12">
                                                 <div id="validationErrors"
-                                                    class="validationSummary alert alert-danger no-show">
+                                                    class="validationSummary alert alert-danger d-none">
                                                     <ul></ul>
                                                 </div>
                                                 <div>

From 11a802d7ec6a7d0c6244f8ecc8d484e5337d4021 Mon Sep 17 00:00:00 2001
From: labmecanicatec <58854556+labmecanicatec@users.noreply.github.com>
Date: Sun, 1 Sep 2024 11:42:58 -0500
Subject: [PATCH 02/23] Update reservations.js

A conditional prevents the edit button from working on mobile devices, it is disabled
---
 Web/scripts/admin/reservations.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Web/scripts/admin/reservations.js b/Web/scripts/admin/reservations.js
index b4b412c6a..5bfa7c7cd 100644
--- a/Web/scripts/admin/reservations.js
+++ b/Web/scripts/admin/reservations.js
@@ -117,11 +117,12 @@ function ReservationManagement(opts, approval) {
             viewReservation($(this).attr('data-refnum'));
         });
 
-        elements.reservationTable.delegate('.edit', 'click', function () {
-            if ($(e.target).hasClass('action') || $(e.target).closest('td').hasClass('action')) {
+        elements.reservationTable.delegate('.edit', 'click', function (e) {
+            //This conditional prevents the edit button from working on mobile devices
+            /*if ($(e.target).hasClass('action') || $(e.target).closest('td').hasClass('action')) {
                 e.stopPropagation();
                 return;
-            }
+            }*/
             viewReservation($(this).closest('tr').attr('data-refnum'));
         });
 

From f4b4fb1c91a797e2ae8a66c99628a1010afe42f3 Mon Sep 17 00:00:00 2001
From: labmecanicatec <58854556+labmecanicatec@users.noreply.github.com>
Date: Sun, 1 Sep 2024 11:44:44 -0500
Subject: [PATCH 03/23] The appearance between "a" and "link-primary" elements
 is unified

---
 Web/css/librebooking.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Web/css/librebooking.css b/Web/css/librebooking.css
index 599139c44..43a103d35 100644
--- a/Web/css/librebooking.css
+++ b/Web/css/librebooking.css
@@ -137,6 +137,8 @@ fieldset:disabled .btn {
     border-color: var(--primary-disabled);
 }
 
+a,
+a:visited,
 .link-primary {
     color: var(--primary) !important;
     text-decoration: none;

From 626d7cd65ba6625a276db5f4de3f513b63eb7e34 Mon Sep 17 00:00:00 2001
From: labmecanicatec <58854556+labmecanicatec@users.noreply.github.com>
Date: Sun, 1 Sep 2024 11:45:42 -0500
Subject: [PATCH 04/23] Correcting text strings and indentation

---
 lang/es.php               | 4 ++--
 lib/Common/SmartyPage.php | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lang/es.php b/lang/es.php
index bac6a8466..e698cb562 100644
--- a/lang/es.php
+++ b/lang/es.php
@@ -1024,8 +1024,8 @@ protected function _LoadStrings()
         //End View Resource
 
         //Datatables
-        $strings['Info'] = "Mostrando página _PAGE_ of _PAGES_ de _MAX_";
-        $strings['LengthMenu'] = "Mostrar _MENU_ registros po página";
+        $strings['Info'] = "Mostrando página _PAGE_ de _PAGES_ de _MAX_";
+        $strings['LengthMenu'] = "Mostrar _MENU_ registros";
         //End Datatables
 
         $this->Strings = $strings;
diff --git a/lib/Common/SmartyPage.php b/lib/Common/SmartyPage.php
index f3ccbf6f7..54703ed69 100644
--- a/lib/Common/SmartyPage.php
+++ b/lib/Common/SmartyPage.php
@@ -667,8 +667,7 @@ public function CreateDataTable($params)
                     infoEmpty: "' . $NoResultsFoundText . '",
                     infoFiltered: "",
                     lengthMenu: "' . $lengthMenuText . '",
-                    zeroRecords: "' . $NoResultsFoundText .
-            '"
+                    zeroRecords: "' . $NoResultsFoundText .'",
                 },
                 buttons: [ 
                     {
@@ -677,8 +676,7 @@ public function CreateDataTable($params)
                     },
                     {
                         extend: "excelHtml5",
-                        text: "<i class=\"bi bi-file-earmark-spreadsheet me-1\"></i><div class=\"d-none d-sm-inline-block\">' . $exportText .
-            ' Excel</div>", 
+                        text: "<i class=\"bi bi-file-earmark-spreadsheet me-1\"></i><div class=\"d-none d-sm-inline-block\">' . $exportText .' Excel</div>", 
                     },
                     {
                         extend: "pdfHtml5",

From 9f05a825a94ada0c33f03da8ce836fe6898c5c6d Mon Sep 17 00:00:00 2001
From: labmecanicatec <58854556+labmecanicatec@users.noreply.github.com>
Date: Sun, 1 Sep 2024 11:48:23 -0500
Subject: [PATCH 05/23] Updating an extension

---
 .vscode/extensions.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index d1a5a8e10..441f181d2 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,6 +1,6 @@
 {
     "recommendations": [
-        "imperez.smarty",
+        "aswinkumar863.smarty-template-support",
         "bmewburn.vscode-intelephense-client",
         "felixfbecker.php-debug",
         "tombonnike.vscode-status-bar-format-toggle",
@@ -9,4 +9,4 @@
         "vikyd.vscode-fold-level",
         "pomber.git-file-history"
     ]
-}
+}
\ No newline at end of file

From ce42f32422dedb4308b40ebdb101eeea52727974 Mon Sep 17 00:00:00 2001
From: labmecanicatec <58854556+labmecanicatec@users.noreply.github.com>
Date: Sun, 1 Sep 2024 13:34:17 -0500
Subject: [PATCH 06/23] Update librebooking.css

---
 Web/css/librebooking.css | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Web/css/librebooking.css b/Web/css/librebooking.css
index 43a103d35..e56bd0747 100644
--- a/Web/css/librebooking.css
+++ b/Web/css/librebooking.css
@@ -137,8 +137,6 @@ fieldset:disabled .btn {
     border-color: var(--primary-disabled);
 }
 
-a,
-a:visited,
 .link-primary {
     color: var(--primary) !important;
     text-decoration: none;
@@ -523,4 +521,4 @@ input[type=text].user-search {
 
 .no-show {
     display: none !important;
-}
\ No newline at end of file
+}

From 2edf65d0e524713ddcdfe43c1d83aaaa4b3ecbe7 Mon Sep 17 00:00:00 2001
From: labmecanicatec <58854556+labmecanicatec@users.noreply.github.com>
Date: Mon, 2 Sep 2024 10:19:48 -0500
Subject: [PATCH 07/23] icon fix, also reservationTable is wrapped in a
 responsive table

---
 tpl/Admin/Resources/manage_resources.tpl   |   2 +-
 tpl/Search/search-reservations-results.tpl | 102 +++++++++++----------
 2 files changed, 53 insertions(+), 51 deletions(-)

diff --git a/tpl/Admin/Resources/manage_resources.tpl b/tpl/Admin/Resources/manage_resources.tpl
index cb5c67660..a822a6a7c 100644
--- a/tpl/Admin/Resources/manage_resources.tpl
+++ b/tpl/Admin/Resources/manage_resources.tpl
@@ -615,7 +615,7 @@
 						<label class="fw-bold mb-2" for="resourceImageAdd">{translate key=Image}</label>
 						<div class="dropzone text-center border border-2 rounded-3 bg-light" id="addResourceImage">
 							<div>
-								<i class="bi bi-filetype-pdf fs-1"></i><br />
+								<i class="bi bi-image fs-1"></i><br />
 								{translate key=ChooseOrDropFile}
 							</div>
 							<input id="resourceImageAdd" type="file" {formname key=RESOURCE_IMAGE}
diff --git a/tpl/Search/search-reservations-results.tpl b/tpl/Search/search-reservations-results.tpl
index 8efe908e9..3bcc6644e 100644
--- a/tpl/Search/search-reservations-results.tpl
+++ b/tpl/Search/search-reservations-results.tpl
@@ -1,60 +1,62 @@
 <div class="card shadow mb-2">
 	<div class="card-body">
 		{assign var=tableId value=reservationTable}
-		<table class="table table-striped table-hover border-top pt-3 w-100" id="{$tableId}">
-			<thead>
-				<tr>
-					<th>{translate key=User}</th>
-					<th>{translate key=Resource}</th>
-					<th>{translate key=Title}</th>
-					<th>{translate key=Description}</th>
-					<th>{translate key=BeginDate}</th>
-					<th>{translate key=EndDate}</th>
-					<th>{translate key=Duration}</th>
-					<th>{translate key=ReferenceNumber}</th>
-					<th>{translate key=Created}</th>
-					<th>{translate key=LastModified}</th>
-				</tr>
-			</thead>
-			<tbody>
-				{foreach from=$Reservations item=reservation}
-					{*{cycle values='row0,row1' assign=rowCss}*}
-					{if $reservation->RequiresApproval}
-						{assign var=rowCss value='pending table-warning'}
-					{/if}
-					{assign var=reservationId value=$reservation->ReservationId}
-					<tr class="{$rowCss} editable" data-seriesId="{$reservation->SeriesId}"
-						data-refnum="{$reservation->ReferenceNumber}">
-						<td class="user">
-							{fullname first=$reservation->FirstName last=$reservation->LastName ignorePrivacy=($reservation->OwnerId==$UserId)}
-						</td>
-						<td class="resource">{$reservation->ResourceName}</td>
-						<td class="title">{$reservation->Title}</td>
-						<td class="description">{$reservation->Description}</td>
-						<td class="date">
-							{formatdate date=$reservation->StartDate timezone=$Timezone key=short_reservation_date}</td>
-						<td class="date">
-							{formatdate date=$reservation->EndDate timezone=$Timezone key=short_reservation_date}</td>
-						<td class="duration">{$reservation->GetDuration()->__toString()}</td>
-						<td class="referenceNumber">{$reservation->ReferenceNumber}</td>
-						<td class="created">
-							{formatdate date=$reservation->CreatedDate timezone=$Timezone key=short_datetime}</td>
-						<td class="created">
-							{formatdate date=$reservation->ModifiedDate timezone=$Timezone key=short_datetime}</td>
+		<div class="table-responsive">
+			<table class="table table-striped table-hover border-top pt-3 w-100" id="{$tableId}">
+				<thead>
+					<tr>
+						<th>{translate key=User}</th>
+						<th>{translate key=Resource}</th>
+						<th>{translate key=Title}</th>
+						<th>{translate key=Description}</th>
+						<th>{translate key=BeginDate}</th>
+						<th>{translate key=EndDate}</th>
+						<th>{translate key=Duration}</th>
+						<th>{translate key=ReferenceNumber}</th>
+						<th>{translate key=Created}</th>
+						<th>{translate key=LastModified}</th>
 					</tr>
+				</thead>
+				<tbody>
+					{foreach from=$Reservations item=reservation}
+						{*{cycle values='row0,row1' assign=rowCss}*}
+						{if $reservation->RequiresApproval}
+							{assign var=rowCss value='pending table-warning'}
+						{/if}
+						{assign var=reservationId value=$reservation->ReservationId}
+						<tr class="{$rowCss} editable" data-seriesId="{$reservation->SeriesId}"
+							data-refnum="{$reservation->ReferenceNumber}">
+							<td class="user">
+								{fullname first=$reservation->FirstName last=$reservation->LastName ignorePrivacy=($reservation->OwnerId==$UserId)}
+							</td>
+							<td class="resource">{$reservation->ResourceName}</td>
+							<td class="title">{$reservation->Title}</td>
+							<td class="description">{$reservation->Description}</td>
+							<td class="date">
+								{formatdate date=$reservation->StartDate timezone=$Timezone key=short_reservation_date}</td>
+							<td class="date">
+								{formatdate date=$reservation->EndDate timezone=$Timezone key=short_reservation_date}</td>
+							<td class="duration">{$reservation->GetDuration()->__toString()}</td>
+							<td class="referenceNumber">{$reservation->ReferenceNumber}</td>
+							<td class="created">
+								{formatdate date=$reservation->CreatedDate timezone=$Timezone key=short_datetime}</td>
+							<td class="created">
+								{formatdate date=$reservation->ModifiedDate timezone=$Timezone key=short_datetime}</td>
+						</tr>
 
-					{*<label>{translate key='CheckInTime'}</label> {formatdate date=$reservation->CheckinDate timezone=$Timezone key=short_datetime}*}
-					{*</div>*}
-					{*<div>*}
-					{*<label>{translate key='CheckOutTime'}</label> {formatdate date=$reservation->CheckoutDate timezone=$Timezone key=short_datetime}*}
-					{*</div>*}
-					{*<div>*}
-					{*<label>{translate key='OriginalEndDate'}</label> {formatdate date=$reservation->OriginalEndDate timezone=$Timezone key=short_datetime}*}
+						{*<label>{translate key='CheckInTime'}</label> {formatdate date=$reservation->CheckinDate timezone=$Timezone key=short_datetime}*}
+						{*</div>*}
+						{*<div>*}
+						{*<label>{translate key='CheckOutTime'}</label> {formatdate date=$reservation->CheckoutDate timezone=$Timezone key=short_datetime}*}
+						{*</div>*}
+						{*<div>*}
+						{*<label>{translate key='OriginalEndDate'}</label> {formatdate date=$reservation->OriginalEndDate timezone=$Timezone key=short_datetime}*}
 
 
-				{/foreach}
-			</tbody>
-		</table>
+					{/foreach}
+				</tbody>
+			</table>
+		</div>
 	</div>
 </div>
 {datatable tableId={$tableId}}
\ No newline at end of file

From 1723b225105fa9517c850c8ac1fc914936e868ef Mon Sep 17 00:00:00 2001
From: labmecanicatec <58854556+labmecanicatec@users.noreply.github.com>
Date: Tue, 3 Sep 2024 12:06:42 -0500
Subject: [PATCH 08/23] Update resourceDisplay.js

---
 Web/scripts/resourceDisplay.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Web/scripts/resourceDisplay.js b/Web/scripts/resourceDisplay.js
index 2dc07d2af..514a04ee9 100644
--- a/Web/scripts/resourceDisplay.js
+++ b/Web/scripts/resourceDisplay.js
@@ -104,6 +104,7 @@ function ResourceDisplay(opts) {
                     hidePopup();
                     resumeRefresh();
                     refreshResource();
+                    $('#reservation-box').modal('hide');
                 }
                 else {
                     var errors = data.errors ? data.errors : data.Messages;
@@ -113,7 +114,6 @@ function ResourceDisplay(opts) {
                     validationErrors.removeClass('d-none');
                 }
                 hideWait();
-                $('#reservation-box').modal('hide');
             };
 
             ajaxPost($('#formReserve'), null, beforeReserve, afterReserve);

From d911a18deaca95e046ebae6318b59833fa930b16 Mon Sep 17 00:00:00 2001
From: labmecanicatec <58854556+labmecanicatec@users.noreply.github.com>
Date: Tue, 3 Sep 2024 16:23:21 -0500
Subject: [PATCH 09/23] Empty functions are disabled

---
 Web/scripts/resourceDisplay.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Web/scripts/resourceDisplay.js b/Web/scripts/resourceDisplay.js
index 514a04ee9..934a7390c 100644
--- a/Web/scripts/resourceDisplay.js
+++ b/Web/scripts/resourceDisplay.js
@@ -79,11 +79,11 @@ function ResourceDisplay(opts) {
 
         elements.placeholder.on('click', '#reservePopup', function (e) {
             pauseRefresh();
-            showPopup();
+            //showPopup();
         });
 
         elements.placeholder.on('click', '#reserveCancel', function (e) {
-            hidePopup();
+            //hidePopup();
             resumeRefresh();
             refreshResource();
         });
@@ -94,14 +94,14 @@ function ResourceDisplay(opts) {
 
             var beforeReserve = function () {
                 $('#validationErrors').addClass('d-none');
-                showWait();
+                //showWait();
             };
 
             var afterReserve = function (data) {
                 var validationErrors = $('#validationErrors');
                 if (data.success) {
                     validationErrors.find('ul').empty().addClass('d-none');
-                    hidePopup();
+                    //hidePopup();
                     resumeRefresh();
                     refreshResource();
                     $('#reservation-box').modal('hide');
@@ -131,7 +131,7 @@ function ResourceDisplay(opts) {
             e.stopPropagation();
 
             var beforeCheckin = function () {
-                showWait();
+                //showWait();
             };
 
             var afterCheckin = function () {
@@ -142,7 +142,7 @@ function ResourceDisplay(opts) {
         });
 
         elements.startDate.on('change', function () {
-            showWait();
+            //showWait();
             refreshResource(hideWait);
         });
 
@@ -241,17 +241,17 @@ function ResourceDisplay(opts) {
     };
 
     function showWait() {
-        $('#waitIndicator').removeClass('no-show');
-        $.blockUI({ message: $('#wait-box') });
+        // $('#waitIndicator').removeClass('no-show');
+        // $.blockUI({ message: $('#wait-box') });
     }
 
     function hideWait() {
-        $.unblockUI();
+        // $.unblockUI();
     }
 
     elements.loginButton.click(function (e) {
         e.preventDefault();
-        showWait();
+        //showWait();
         elements.loginForm.submit();
     });
 

From 85f49262d5fccd268fb16d114c512dfc3c9a21a6 Mon Sep 17 00:00:00 2001
From: labmecanicatec <58854556+labmecanicatec@users.noreply.github.com>
Date: Tue, 3 Sep 2024 16:45:51 -0500
Subject: [PATCH 10/23] <a> elements that look like buttons are now <button>

---
 tpl/Dashboard/resource_availability.tpl | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/tpl/Dashboard/resource_availability.tpl b/tpl/Dashboard/resource_availability.tpl
index c5fc02a9a..e5c4f208e 100644
--- a/tpl/Dashboard/resource_availability.tpl
+++ b/tpl/Dashboard/resource_availability.tpl
@@ -35,9 +35,11 @@
                                     <span class="no-data fst-italic">{translate key=AllNoUpcomingReservations args=30}</span>
                                 {/if}
                             </div>
-                            <div class="reserveButton col-12 col-sm-3">
-                                <a class="btn btn-sm btn-success col-12"
-                                    href="{$Path}{Pages::RESERVATION}?{QueryStringKeys::RESOURCE_ID}={$i->ResourceId()}">{translate key=Reserve}</a>
+                            <div class="reserveButton col-12 col-sm-3 d-grid gap-2">
+                                <button class="btn btn-sm btn-success"
+                                    onclick="window.location.href='{$Path}{Pages::RESERVATION}?{QueryStringKeys::RESOURCE_ID}={$i->ResourceId()}'">
+                                    {translate key=Reserve}
+                                </button>
                             </div>
                         </div>
                     {/foreach}
@@ -72,9 +74,11 @@
                                 {translate key=AvailableBeginningAt}
                                 {format_date date=$i->ReservationEnds() timezone=$Timezone key=dashboard}
                             </div>
-                            <div class="reserveButton col-12 col-sm-3">
-                                <a class="btn btn-sm btn-success col-12"
-                                    href="{$Path}{Pages::RESERVATION}?{QueryStringKeys::RESOURCE_ID}={$i->ResourceId()}&{QueryStringKeys::START_DATE}={format_date date=$i->ReservationEnds() timezone=$Timezone key=url_full}">{translate key=Reserve}</a>
+                            <div class="reserveButton col-12 col-sm-3 d-grid gap-2">
+                                <button class="btn btn-sm btn-success"
+                                    onclick="window.location.href='{$Path}{Pages::RESERVATION}?{QueryStringKeys::RESOURCE_ID}={$i->ResourceId()}&{QueryStringKeys::START_DATE}={format_date date=$i->ReservationEnds() timezone=$Timezone key=url_full}'">
+                                    {translate key=Reserve}
+                                </button>
                             </div>
                         </div>
                     {/foreach}
@@ -107,9 +111,11 @@
                                 {translate key=AvailableAt}
                                 {format_date date=$i->ReservationEnds() timezone=$Timezone key=dashboard}
                             </div>
-                            <div class="reserveButton col-12 col-sm-3">
-                                <a class="btn btn-sm btn-success col-12"
-                                    href="{$Path}{Pages::RESERVATION}?{QueryStringKeys::RESOURCE_ID}={$i->ResourceId()}&{QueryStringKeys::START_DATE}={format_date date=$i->ReservationEnds() timezone=$Timezone key=url_full}">{translate key=Reserve}</a>
+                            <div class="reserveButton col-12 col-sm-3 d-grid gap-2">
+                                <button class="btn btn-sm btn-success"
+                                    onclick="window.location.href='{{$Path}}{{Pages::RESERVATION}}?{{QueryStringKeys::RESOURCE_ID}}={{$i->ResourceId()}}&{{QueryStringKeys::START_DATE}}={{format_date date=$i->ReservationEnds() timezone=$Timezone key=url_full}}'">
+                                    {{translate key=Reserve}}
+                                </button>
                             </div>
                         </div>
                     {/foreach}

From 719ed255e4c1c799232b0ee96b73f51cbd255f7c Mon Sep 17 00:00:00 2001
From: labmecanicatec <58854556+labmecanicatec@users.noreply.github.com>
Date: Tue, 3 Sep 2024 16:48:12 -0500
Subject: [PATCH 11/23] #announcement links take primary color var(--primary)

---
 Web/css/librebooking.css | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Web/css/librebooking.css b/Web/css/librebooking.css
index e56bd0747..e29c81097 100644
--- a/Web/css/librebooking.css
+++ b/Web/css/librebooking.css
@@ -410,6 +410,11 @@ span.searchclear-label {
     font-family: "bootstrap-icons";
 }
 
+.announcement a,
+.announcement a:visited {
+    color: var(--primary);
+}
+
 .resource-draggable {
     cursor: move;
     border: solid 1px transparent;
@@ -521,4 +526,4 @@ input[type=text].user-search {
 
 .no-show {
     display: none !important;
-}
+}
\ No newline at end of file

From 2712afa886c9abe1f294886fd308d0b517dcc315 Mon Sep 17 00:00:00 2001
From: labmecanicatec <58854556+labmecanicatec@users.noreply.github.com>
Date: Wed, 4 Sep 2024 12:43:40 -0500
Subject: [PATCH 12/23] no-show class changed to d-none

---
 Web/scripts/admin/email-templates.js               | 12 +++++-------
 tpl/Admin/Configuration/change_theme.tpl           |  2 +-
 tpl/Admin/Configuration/manage_configuration.tpl   |  3 +--
 tpl/Admin/Configuration/manage_email_templates.tpl |  2 +-
 tpl/Admin/Resources/manage_resource_groups.tpl     |  2 +-
 tpl/Admin/Resources/manage_resource_types.tpl      |  2 +-
 6 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/Web/scripts/admin/email-templates.js b/Web/scripts/admin/email-templates.js
index fa5814fb0..3f9ff75b3 100644
--- a/Web/scripts/admin/email-templates.js
+++ b/Web/scripts/admin/email-templates.js
@@ -32,7 +32,7 @@ function EmailTemplateManagement(opts) {
         elements.templateOpts.on('change', function (e) {
             var templateName = elements.templateOpts.val();
             if (templateName == '') {
-                elements.editEmailSection.addClass('no-show');
+                elements.editEmailSection.addClass('d-none');
             }
             else {
                 elements.templatePath.val(templateName);
@@ -40,7 +40,7 @@ function EmailTemplateManagement(opts) {
             }
         });
 
-        elements.reloadEmailContents.on('click', function(e){
+        elements.reloadEmailContents.on('click', function (e) {
             e.preventDefault();
             var templateName = elements.templateOpts.val();
             ajaxGet(options.scriptUrl + '?dr=originalTemplate&lang=' + elements.languageOpts.val() + '&tn=' + templateName, null, loadTemplate);
@@ -51,18 +51,16 @@ function EmailTemplateManagement(opts) {
     };
 
     function updatedEmail(data) {
-        if (data.saveResult == true)
-        {
+        if (data.saveResult == true) {
             elements.updateSuccess.show().delay(2000).fadeOut(200);
         }
-        else
-        {
+        else {
             elements.updateFailed.show().delay(2000).fadeOut(200);
         }
     }
 
     function loadTemplate(data) {
         elements.templateContents.val(data);
-        elements.editEmailSection.removeClass('no-show');
+        elements.editEmailSection.removeClass('d-none');
     }
 }
diff --git a/tpl/Admin/Configuration/change_theme.tpl b/tpl/Admin/Configuration/change_theme.tpl
index fd3058db2..13144e385 100644
--- a/tpl/Admin/Configuration/change_theme.tpl
+++ b/tpl/Admin/Configuration/change_theme.tpl
@@ -11,7 +11,7 @@
 
             <form id="elementForm" action="{$smarty.server.SCRIPT_NAME}" ajaxAction="update" method="post"
                 enctype="multipart/form-data">
-                <div class="validationSummary alert alert-danger no-show" id="validationErrors">
+                <div class="validationSummary alert alert-danger d-none" id="validationErrors">
                     <ul>
                         {async_validator id="logoFileExt"}
                         {async_validator id="cssFileExt"}
diff --git a/tpl/Admin/Configuration/manage_configuration.tpl b/tpl/Admin/Configuration/manage_configuration.tpl
index c64c7194b..7961569ed 100644
--- a/tpl/Admin/Configuration/manage_configuration.tpl
+++ b/tpl/Admin/Configuration/manage_configuration.tpl
@@ -205,8 +205,7 @@
             });
         </script>
         <div id="wait-box" class="wait-box">
-            <h3>{translate key=Working}</h3>
-            {html_image src="reservation_submitting.gif"}
+            {include file="wait-box.tpl"}
         </div>
     {/if}
 </div>
diff --git a/tpl/Admin/Configuration/manage_email_templates.tpl b/tpl/Admin/Configuration/manage_email_templates.tpl
index 765e0443e..c7db93147 100644
--- a/tpl/Admin/Configuration/manage_email_templates.tpl
+++ b/tpl/Admin/Configuration/manage_email_templates.tpl
@@ -25,7 +25,7 @@
                 </select>
             </div>
 
-            <div id="editEmailSection" class="no-show">
+            <div id="editEmailSection" class="d-none">
                 <div class="mb-2">
                     <form role="form" id="updateEmailForm" ajaxAction="{EmailTemplatesActions::Update}" method="post">
                         <div class="form-group">
diff --git a/tpl/Admin/Resources/manage_resource_groups.tpl b/tpl/Admin/Resources/manage_resource_groups.tpl
index 62d7d9696..a20fdf522 100644
--- a/tpl/Admin/Resources/manage_resource_groups.tpl
+++ b/tpl/Admin/Resources/manage_resource_groups.tpl
@@ -4,7 +4,7 @@
 
 	{include file='Admin/Resources/manage_resource_menu.tpl' ResourcePageTitleKey='ManageResourceGroups'}
 
-	<div id="globalError" class="alert alert-danger no-show"></div>
+	<div id="globalError" class="alert alert-danger d-none"></div>
 
 	<div id="manage-resource-groups-container bg-dark">
 		<div class="card shadow mb-3">
diff --git a/tpl/Admin/Resources/manage_resource_types.tpl b/tpl/Admin/Resources/manage_resource_types.tpl
index 9d0e7af0f..eda64a485 100644
--- a/tpl/Admin/Resources/manage_resource_types.tpl
+++ b/tpl/Admin/Resources/manage_resource_types.tpl
@@ -18,7 +18,7 @@
 				</h2>
 				<div id="collapse-add-contents" class="accordion-collapse collapse show">
 					<div class="accordion-body add-contents">
-						<div id="addResults" class="error no-show"></div>
+						<div id="addResults" class="error d-none"></div>
 						<div class="d-flex align-items-center gap-2 mb-2">
 							<label class="fw-bold" for="resourceTypeName">{translate key='Name'}<i
 									class="bi bi-asterisk text-danger align-top" style="font-size: 0.5rem;"></i></label>

From ec20456a9cfb62a8cc68ab6050a3953cc7292b86 Mon Sep 17 00:00:00 2001
From: labmecanicatec <58854556+labmecanicatec@users.noreply.github.com>
Date: Wed, 4 Sep 2024 12:44:42 -0500
Subject: [PATCH 13/23] Corrected use of collapse

---
 Web/scripts/admin/attributes.js          | 2 +-
 tpl/Admin/Resources/manage_resources.tpl | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Web/scripts/admin/attributes.js b/Web/scripts/admin/attributes.js
index 6f0afe7f7..3d4bc4650 100644
--- a/Web/scripts/admin/attributes.js
+++ b/Web/scripts/admin/attributes.js
@@ -155,7 +155,7 @@ function AttributeManagement(opts) {
             handleEntitiesSelected(activeAppliesTo);
         });
 
-        elements.limitScope.change(function (e) {
+        elements.limitScope.change(function () {
             elements.attributeSecondary.addClass('no-show');
             if (elements.limitScope.is(':checked')) {
                 elements.attributeSecondary.removeClass('no-show');
diff --git a/tpl/Admin/Resources/manage_resources.tpl b/tpl/Admin/Resources/manage_resources.tpl
index a822a6a7c..88d5bca17 100644
--- a/tpl/Admin/Resources/manage_resources.tpl
+++ b/tpl/Admin/Resources/manage_resources.tpl
@@ -488,7 +488,7 @@
 														<div class="mb-4">
 															<span class="fs-6 fw-bold">{translate key='Capacity'}</span>
 															<a href="#" class="inline update changeCapacity link-primary">
-																<span class="no-show">{translate key=Capacity}</span>
+																<span class="visually-hiden">{translate key=Capacity}</span>
 																<span class="bi bi-pencil-square"></span>
 															</a>
 
@@ -794,7 +794,7 @@
 									<input type='hidden' id='bufferTime' class='interval' {formname key=BUFFER_TIME} />
 								</div>
 							{/capture}
-							<div id='bufferInputs'>
+							<div id="bufferInputs" class="collapse">
 								<div class="d-flex align-items-center flex-wrap gap-1 ms-2">
 									{translate key=ResourceBufferTime args=$txtBufferTime}
 								</div>

From 21582dd33e66da6fa54527ee960f32cbf7b57cf6 Mon Sep 17 00:00:00 2001
From: labmecanicatec <58854556+labmecanicatec@users.noreply.github.com>
Date: Thu, 5 Sep 2024 10:59:38 -0500
Subject: [PATCH 14/23] The hilite class is added when the hover state occurs
 over the reservable slots

---
 Web/scripts/resourceDisplay.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Web/scripts/resourceDisplay.js b/Web/scripts/resourceDisplay.js
index 934a7390c..223483269 100644
--- a/Web/scripts/resourceDisplay.js
+++ b/Web/scripts/resourceDisplay.js
@@ -141,6 +141,12 @@ function ResourceDisplay(opts) {
             ajaxPost($('#formCheckin'), null, beforeCheckin, afterCheckin);
         });
 
+        elements.placeholder.on('mouseenter', '.reservable', function (e) {
+            $(this).addClass('hilite');
+        }).on('mouseleave', '.reservable', function () {
+            $(this).removeClass('hilite');
+        });
+
         elements.startDate.on('change', function () {
             //showWait();
             refreshResource(hideWait);

From b21c81378fb8d95a0d4e89cdc9ec4602fd664046 Mon Sep 17 00:00:00 2001
From: labmecanicatec <58854556+labmecanicatec@users.noreply.github.com>
Date: Thu, 5 Sep 2024 11:02:06 -0500
Subject: [PATCH 15/23] An unnecessary class is removed

---
 tpl/ResourceDisplay/resource-display-shell.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tpl/ResourceDisplay/resource-display-shell.tpl b/tpl/ResourceDisplay/resource-display-shell.tpl
index 5ff34c096..6f23ebb0b 100644
--- a/tpl/ResourceDisplay/resource-display-shell.tpl
+++ b/tpl/ResourceDisplay/resource-display-shell.tpl
@@ -1,6 +1,6 @@
 {include file='globalheader.tpl' HideNavBar=true cssFiles='css/schedule.css'}
 
-<div id="page-resource-display-resource" class="h-100">
+<div id="page-resource-display-resource">
 
         <div class="resource-display date-picker ms-4">
                 <div class="date form-group w-50">

From 996941aa2270e969e44cca854b3d6660e04b88b2 Mon Sep 17 00:00:00 2001
From: labmecanicatec <58854556+labmecanicatec@users.noreply.github.com>
Date: Thu, 5 Sep 2024 13:13:05 -0500
Subject: [PATCH 16/23] Use of the no-show class is replaced by d-none

---
 .htaccess                          |  8 ++++++--
 Web/css/librebooking.css           |  4 ++++
 Web/scripts/admin/group.js         |  4 ++--
 Web/scripts/admin/quota.js         | 32 ++++++++++++------------------
 Web/scripts/recurrence.js          |  2 +-
 tpl/Admin/manage_announcements.tpl |  2 +-
 tpl/Admin/manage_groups.tpl        |  4 ++--
 tpl/Admin/manage_quotas.tpl        | 11 +++++-----
 tpl/Reports/generate-report.tpl    |  6 +++---
 9 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/.htaccess b/.htaccess
index 56e7ec445..250d363f5 100644
--- a/.htaccess
+++ b/.htaccess
@@ -5,8 +5,12 @@ RewriteEngine On
 #RewriteCond %{HTTPS} off
 #RewriteRule .* https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
 
-RewriteCond %{REQUEST_URI} !^/Web/
-RewriteRule ^(.*)$ /Web/$1 [R]
+#RewriteCond %{REQUEST_URI} !^/Web/
+#RewriteRule ^(.*)$ /Web/$1 [R]
+RewriteRule ^Web - [L,NC]
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^(.*)$ Web/$1 [QSA,L]
 
 #Header Set Access-Control-Allow-Origin "*"
 #Header add Access-Control-Allow-Headers "origin, x-requested-with, content-type"
diff --git a/Web/css/librebooking.css b/Web/css/librebooking.css
index e29c81097..4b5f3aa1f 100644
--- a/Web/css/librebooking.css
+++ b/Web/css/librebooking.css
@@ -495,6 +495,10 @@ input[type=text].user-search {
     width: 250px;
 }
 
+input.mid-number {
+    width: 70px !important;
+}
+
 #participantList,
 #inviteeList {
     height: 100px;
diff --git a/Web/scripts/admin/group.js b/Web/scripts/admin/group.js
index 6c3b6eaf6..1a9cc73f7 100644
--- a/Web/scripts/admin/group.js
+++ b/Web/scripts/admin/group.js
@@ -200,13 +200,13 @@ function GroupManagement(opts) {
 
 			$('#importCount').text(responseText.importCount);
 			$('#importSkipped').text(responseText.skippedRows.length > 0 ? responseText.skippedRows.join(',') : '0');
-			$('#importResult').removeClass('no-show');
+			$('#importResult').removeClass('d-none');
 
 			var errors = $('#importErrors');
 			errors.empty();
 			if (responseText.messages && responseText.messages.length > 0) {
 				var messages = responseText.messages.join('</li><li>');
-				errors.html('<div>' + messages + '</div>').removeClass('no-show');
+				errors.html('<div>' + messages + '</div>').removeClass('d-none');
 			}
 		};
 
diff --git a/Web/scripts/admin/quota.js b/Web/scripts/admin/quota.js
index bb55624f6..e03dddb4b 100644
--- a/Web/scripts/admin/quota.js
+++ b/Web/scripts/admin/quota.js
@@ -39,7 +39,7 @@ function QuotaManagement(opts) {
 			handleEnforceEveryDayToggle(e);
 		});
 
-		ConfigureAsyncForm(elements.addForm, getSubmitCallback(options.actions.addQuota), null, handleAddError, {onBeforeSubmit: validateTimes});
+		ConfigureAsyncForm(elements.addForm, getSubmitCallback(options.actions.addQuota), null, handleAddError, { onBeforeSubmit: validateTimes });
 		ConfigureAsyncForm(elements.deleteForm, getSubmitCallback(options.actions.deleteQuota), null, handleAddError);
 	};
 
@@ -62,38 +62,32 @@ function QuotaManagement(opts) {
 	};
 
 	var handleEnforceAllDayToggle = function (e) {
-		if (elements.enforceAllDayToggle.is(':checked'))
-		{
-			elements.enforceHoursTimes.addClass('no-show');
+		if (elements.enforceAllDayToggle.is(':checked')) {
+			elements.enforceHoursTimes.addClass('d-none');
 		}
-		else
-		{
-			elements.enforceHoursTimes.removeClass('no-show');
+		else {
+			elements.enforceHoursTimes.removeClass('d-none');
 		}
 	};
 
 	var handleEnforceEveryDayToggle = function (e) {
-		if (elements.enforceEveryDayToggle.is(':checked'))
-		{
-			elements.enforceDays.addClass('no-show');
+		if (elements.enforceEveryDayToggle.is(':checked')) {
+			elements.enforceDays.addClass('d-none');
 		}
-		else
-		{
-			elements.enforceDays.removeClass('no-show');
+		else {
+			elements.enforceDays.removeClass('d-none');
 		}
 	};
 
 	var validateTimes = function () {
-		$('#timeError').addClass('no-show');
-		if (!elements.enforceAllDayToggle.is(':checked'))
-		{
+		$('#timeError').addClass('d-none');
+		if (!elements.enforceAllDayToggle.is(':checked')) {
 			var start = moment('2010-01-01 ' + elements.enforceStartTime.val(), 'YYYY-MM-DD hh:mm a');
 			var end = moment('2010-01-01 ' + elements.enforceEndTime.val(), 'YYYY-MM-DD hh:mm a');
 			var valid = start.isBefore(end) || (end.hour() == 0 && end.minute() == 0);
 
-			if (!valid)
-			{
-				$('#timeError').removeClass('no-show');
+			if (!valid) {
+				$('#timeError').removeClass('d-none');
 			}
 			return valid;
 		}
diff --git a/Web/scripts/recurrence.js b/Web/scripts/recurrence.js
index 8b220c79f..ca52c10e6 100644
--- a/Web/scripts/recurrence.js
+++ b/Web/scripts/recurrence.js
@@ -198,7 +198,7 @@ function Recurrence(recurOptions, recurElements, prefix) {
                 elements.repeatOptions.trigger('change');
             }
             elements.repeatOptions.find("option[value='daily']").prop("disabled", "disabled");
-            elements.repeatOnWeeklyDiv.addClass('no-show');
+            elements.repeatOnWeeklyDiv.addClass('d-none');
         }
         else {
             if (repeatToggled) {
diff --git a/tpl/Admin/manage_announcements.tpl b/tpl/Admin/manage_announcements.tpl
index 3bde7d3b2..fd8ffe5ac 100644
--- a/tpl/Admin/manage_announcements.tpl
+++ b/tpl/Admin/manage_announcements.tpl
@@ -16,7 +16,7 @@
 				<div id="add-announcement-content" class="accordion-collapse collapse">
 					<div class="accordion-body add-contents">
 						<div class="row gy-2 mb-2">
-							<div id="addResults" class="error no-show"></div>
+							<div id="addResults" class="error d-none"></div>
 							<div class="form-group col-12">
 								<label class="fw-bold" for="addAnnouncement">{translate key='Announcement'}<i
 										class="bi bi-asterisk text-danger align-top form-control-feedback"
diff --git a/tpl/Admin/manage_groups.tpl b/tpl/Admin/manage_groups.tpl
index 8830aa2c4..2d2236aa2 100644
--- a/tpl/Admin/manage_groups.tpl
+++ b/tpl/Admin/manage_groups.tpl
@@ -508,8 +508,8 @@
                                 {async_validator id="fileExtensionValidator" key=""}
                             </ul>
                         </div>
-                        <div id="importErrors" class="alert alert-danger no-show"></div>
-                        <div id="importResult" class="alert alert-success no-show">
+                        <div id="importErrors" class="alert alert-danger d-none"></div>
+                        <div id="importResult" class="alert alert-success d-none">
                             <span>{translate key=RowsImported}</span>
 
                             <span id="importCount" class="inline fw-bold">0</span>
diff --git a/tpl/Admin/manage_quotas.tpl b/tpl/Admin/manage_quotas.tpl
index 1a5240b44..1adfd0a54 100644
--- a/tpl/Admin/manage_quotas.tpl
+++ b/tpl/Admin/manage_quotas.tpl
@@ -45,7 +45,7 @@
 						{/capture}
 
 						{capture name="amount" assign="amount"}
-							<input type='number' step='any' class='form-control form-control-sm w-auto mid-number' min='0'
+							<input type='number' step='any' class='form-control form-control-sm mid-number' min='0'
 								max='10000' value='0' {formname key=LIMIT} title='Quota number' />
 						{/capture}
 
@@ -72,11 +72,12 @@
 									value='1' {formname key=ENFORCE_ALL_DAY} />
 								<label class='form-check-label' for='enforce-all-day'>{translate key=AllDay}</label>
 							</div>
-							<div id='enforce-hours-times' class='no-show'>
+							<div id='enforce-hours-times' class='d-none'>
 								<div class='form-group form-group-sm d-flex align-items-center'>
 									<span class='me-1'>{translate key=Between}</span>
-									<label for='enforce-time-start' class='no-show'>{translate key=StartTime}</label>
-									<label for='enforce-time-end' class='no-show'>{translate key=EndTime}</label>
+									<label for='enforce-time-start'
+										class='visually-hidden'>{translate key=StartTime}</label>
+									<label for='enforce-time-end' class='visually-hidden'>{translate key=EndTime}</label>
 									<input type='text' class='form-control form-control-sm time' id='enforce-time-start'
 										size='6' value='12:00am' {formname key=BEGIN_TIME} />
 									-
@@ -92,7 +93,7 @@
 									value='1' {formname key=ENFORCE_EVERY_DAY} />
 								<label class='form-check-label' for='enforce-every-day'>{translate key=Everyday}</label>
 							</div>
-							<div id='enforce-days' class='inline no-show'>
+							<div id='enforce-days' class='inline d-none'>
 								<div class='btn-group-sm' data-bs-toggle='buttons'>
 									<input type='checkbox' class='btn-check' id='enforce-sun' value='0'
 										{formname key=DAY multi=true} />
diff --git a/tpl/Reports/generate-report.tpl b/tpl/Reports/generate-report.tpl
index 2b6d2fdfa..bb552a056 100644
--- a/tpl/Reports/generate-report.tpl
+++ b/tpl/Reports/generate-report.tpl
@@ -155,7 +155,7 @@
 									</select>
 								</div>
 								<div class="form-group no-margin no-padding">
-									<label for="accessoryId" class="no-show">{translate key=Accessory}</label>
+									<label for="accessoryId" class="visually-hidden">{translate key=Accessory}</label>
 									<select class="form-control" {formname key=ACCESSORY_ID multi=true}
 										multiple="multiple" id="accessoryId">
 										{foreach from=$Accessories item=accessory}
@@ -164,7 +164,7 @@
 									</select>
 								</div>
 								<div class="form-group no-margin no-padding">
-									<label for="scheduleId" class="no-show">{translate key=Schedule}</label>
+									<label for="scheduleId" class="visually-hidden">{translate key=Schedule}</label>
 									<select class="form-control" {formname key=SCHEDULE_ID multi=true}
 										multiple="multiple" id="scheduleId">
 										{foreach from=$Schedules item=schedule}
@@ -173,7 +173,7 @@
 									</select>
 								</div>
 								<div class="form-group no-margin no-padding">
-									<label for="groupId" class="no-show">{translate key=Group}</label>
+									<label for="groupId" class="visually-hidden">{translate key=Group}</label>
 									<select class="form-control" {formname key=GROUP_ID multi=true} multiple="multiple"
 										id="groupId">
 										{foreach from=$Groups item=group}

From 4ec8d097ae84c27f8e42be67d7e343bb71bf3e1b Mon Sep 17 00:00:00 2001
From: labmecanicatec <58854556+labmecanicatec@users.noreply.github.com>
Date: Fri, 6 Sep 2024 08:04:06 -0500
Subject: [PATCH 17/23] A class is added for a link inside an alert, the
 closing of a button is corrected

---
 tpl/Reports/generate-report.tpl | 2 +-
 tpl/Reports/saved-reports.tpl   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tpl/Reports/generate-report.tpl b/tpl/Reports/generate-report.tpl
index bb552a056..f1786b296 100644
--- a/tpl/Reports/generate-report.tpl
+++ b/tpl/Reports/generate-report.tpl
@@ -230,7 +230,7 @@
 </div>
 
 <div id="saveMessage" class="alert alert-success" style="display:none;">
-	<strong>{translate key=ReportSaved}</strong> <a
+	<strong>{translate key=ReportSaved}</strong> <a class="alert-link"
 		href="{$Path}reports/{Pages::REPORTS_SAVED}">{translate key=MySavedReports}</a>
 </div>
 
diff --git a/tpl/Reports/saved-reports.tpl b/tpl/Reports/saved-reports.tpl
index fe4e2966c..f0a351957 100644
--- a/tpl/Reports/saved-reports.tpl
+++ b/tpl/Reports/saved-reports.tpl
@@ -108,7 +108,7 @@
 				<div class="modal-content">
 					<div class="modal-header">
 						<h5 class="modal-title" id="deleteLabel">{translate key=Delete}</h5>
-						<button type="button" class="btn-close" data-bs-dismiss="modal" aria-hidden=</button>
+						<button type="button" class="btn-close" data-bs-dismiss="modal" aria-hidden="true"></button>
 					</div>
 					<div class="modal-body">
 						<div class="alert alert-danger">

From b9dee1d488191b4a21de74671ef082896e3783cc Mon Sep 17 00:00:00 2001
From: labmecanicatec <58854556+labmecanicatec@users.noreply.github.com>
Date: Fri, 6 Sep 2024 13:30:57 -0500
Subject: [PATCH 18/23] Pending status is highlighted in respopup and
 manage_reservations

---
 tpl/Admin/Reservations/manage_reservations.tpl | 15 +++++++--------
 tpl/Ajax/respopup.tpl                          |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/tpl/Admin/Reservations/manage_reservations.tpl b/tpl/Admin/Reservations/manage_reservations.tpl
index a738c207b..7dec5a2ec 100644
--- a/tpl/Admin/Reservations/manage_reservations.tpl
+++ b/tpl/Admin/Reservations/manage_reservations.tpl
@@ -219,7 +219,7 @@
 						{foreach from=$reservations item=reservation}
 							{cycle values='row0,row1' assign=rowCss}
 							{if $reservation->RequiresApproval}
-								{assign var=rowCss value='pending'}
+								{assign var=rowCss value='table-warning pending'}
 							{/if}
 							{assign var=reservationId value=$reservation->ReservationId}
 							<tr class="{$rowCss} {if $IsDesktop}editable{/if}" data-seriesId="{$reservation->SeriesId}"
@@ -263,8 +263,7 @@
 								{/if}
 								<td class="action">
 									{if $reservation->RequiresApproval}
-										<a href="#" class="update approve link-primary"><i
-												class="bi bi-pencil-fill fs-6"></i></a>
+										<a href="#" class="update approve link-success"><i class="bi bi-check-lg fs-4"></i></a>
 									{else}
 										-
 									{/if}
@@ -291,23 +290,23 @@
 								<td>
 									<div class="reservation-list-dates d-flex">
 										<div>
-											<label>{translate key='Created'}</label>
+											<label class="fw-bold">{translate key='Created'}</label>
 											{formatdate date=$reservation->CreatedDate timezone=$Timezone key=short_datetime}
 										</div>
 										<div>
-											<label>{translate key='LastModified'}</label>
+											<label class="fw-bold">{translate key='LastModified'}</label>
 											{formatdate date=$reservation->ModifiedDate timezone=$Timezone key=short_datetime}
 										</div>
 										<div>
-											<label>{translate key='CheckInTime'}</label>
+											<label class="fw-bold">{translate key='CheckInTime'}</label>
 											{formatdate date=$reservation->CheckinDate timezone=$Timezone key=short_datetime}
 										</div>
 										<div>
-											<label>{translate key='CheckOutTime'}</label>
+											<label class="fw-bold">{translate key='CheckOutTime'}</label>
 											{formatdate date=$reservation->CheckoutDate timezone=$Timezone key=short_datetime}
 										</div>
 										<div>
-											<label>{translate key='OriginalEndDate'}</label>
+											<label class="fw-bold">{translate key='OriginalEndDate'}</label>
 											{formatdate date=$reservation->OriginalEndDate timezone=$Timezone key=short_datetime}
 										</div>
 									</div>
diff --git a/tpl/Ajax/respopup.tpl b/tpl/Ajax/respopup.tpl
index 19c2d0dc3..6c1c0bd79 100644
--- a/tpl/Ajax/respopup.tpl
+++ b/tpl/Ajax/respopup.tpl
@@ -131,7 +131,7 @@
 
         {capture "pending"}
             {if $requiresApproval}
-                <div class="pendingApproval">{translate key=PendingApproval}</div>
+                <div class="pendingApproval text-warning">{translate key=PendingApproval}</div>
             {/if}
         {/capture}
         {$formatter->Add('pending', $smarty.capture.pending)}

From cc8a6d9995d9c4c22d1309eab099d820e8d3100b Mon Sep 17 00:00:00 2001
From: labmecanicatec <58854556+labmecanicatec@users.noreply.github.com>
Date: Fri, 6 Sep 2024 15:34:43 -0500
Subject: [PATCH 19/23] Update .htaccess

---
 .htaccess | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.htaccess b/.htaccess
index 250d363f5..56e7ec445 100644
--- a/.htaccess
+++ b/.htaccess
@@ -5,12 +5,8 @@ RewriteEngine On
 #RewriteCond %{HTTPS} off
 #RewriteRule .* https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
 
-#RewriteCond %{REQUEST_URI} !^/Web/
-#RewriteRule ^(.*)$ /Web/$1 [R]
-RewriteRule ^Web - [L,NC]
-RewriteCond %{REQUEST_FILENAME} !-d
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^(.*)$ Web/$1 [QSA,L]
+RewriteCond %{REQUEST_URI} !^/Web/
+RewriteRule ^(.*)$ /Web/$1 [R]
 
 #Header Set Access-Control-Allow-Origin "*"
 #Header add Access-Control-Allow-Headers "origin, x-requested-with, content-type"

From ab6377cab45dc642c7481345c7d406090ca8a93c Mon Sep 17 00:00:00 2001
From: labmecanicatec <58854556+labmecanicatec@users.noreply.github.com>
Date: Fri, 6 Sep 2024 21:06:51 -0500
Subject: [PATCH 20/23] The no-show class is changed to d-none or
 visually-hidden, the checkin and checkout buttons are styled

---
 Web/scripts/admin/attributes.js               | 14 ++--
 Web/scripts/admin/resource.js                 | 24 +++---
 Web/scripts/dashboard.js                      | 80 ++++++++++---------
 tpl/Admin/Attributes/manage_attributes.tpl    | 12 +--
 tpl/Admin/Blackouts/manage_blackouts.tpl      | 11 +--
 .../Reservations/manage_reservations.tpl      |  2 +-
 tpl/Admin/Resources/manage_resources.tpl      | 10 +--
 .../manage_resources_group_permissions.tpl    |  2 +-
 .../manage_resources_user_permissions.tpl     |  2 +-
 tpl/Dashboard/dashboard_reservation.tpl       |  3 +-
 10 files changed, 84 insertions(+), 76 deletions(-)

diff --git a/Web/scripts/admin/attributes.js b/Web/scripts/admin/attributes.js
index 3d4bc4650..2e3a65603 100644
--- a/Web/scripts/admin/attributes.js
+++ b/Web/scripts/admin/attributes.js
@@ -37,11 +37,11 @@ function AttributeManagement(opts) {
 
         $.ajax({
             url: opts.changeCategoryUrl + categoryId, cache: false, beforeSend: function () {
-                $('#indicator').removeClass('no-show').insertBefore(elements.attributeList);
+                $('#indicator').removeClass('d-none').insertBefore(elements.attributeList);
                 $(elements.attributeList).html('');
             }
         }).done(function (data) {
-            $('#indicator').addClass('no-show');
+            $('#indicator').addClass('d-none');
             $(elements.attributeList).html(data);
         });
     }
@@ -156,9 +156,9 @@ function AttributeManagement(opts) {
         });
 
         elements.limitScope.change(function () {
-            elements.attributeSecondary.addClass('no-show');
+            elements.attributeSecondary.addClass('d-none');
             if (elements.limitScope.is(':checked')) {
-                elements.attributeSecondary.removeClass('no-show');
+                elements.attributeSecondary.removeClass('d-none');
             }
         });
 
@@ -321,14 +321,14 @@ function AttributeManagement(opts) {
         if (elements.attributeCategory.val() == options.categories.reservation) {
             $('.attributeUnique').hide();
             $('.attributeAdminOnly').show();
-            $('.secondaryEntities, .attributeSecondary').addClass('no-show');
-            $('.secondaryEntities').removeClass('no-show');
+            $('.secondaryEntities, .attributeSecondary').addClass('d-none');
+            $('.secondaryEntities').removeClass('d-none');
             $('.attributeIsPrivate').show();
         }
         else {
             $('.attributeUnique').show();
             //$('.attributeAdminOnly').hide();
-            $('.secondaryEntities, .attributeSecondary').addClass('no-show');
+            $('.secondaryEntities, .attributeSecondary').addClass('d-none');
             $('.attributeIsPrivate').hide();
         }
     };
diff --git a/Web/scripts/admin/resource.js b/Web/scripts/admin/resource.js
index cc3a8a1f1..50414d24b 100644
--- a/Web/scripts/admin/resource.js
+++ b/Web/scripts/admin/resource.js
@@ -326,11 +326,11 @@ function ResourceManagement(opts) {
 
 		$('#bulkEditConcurrent').change(function () {
 			if ($(this).val() == '1') {
-				$('#bulkEditAllowConcurrentDiv').removeClass('no-show');
+				$('#bulkEditAllowConcurrentDiv').removeClass('d-none');
 			}
 
 			if ($(this).val() == '0') {
-				$('#bulkEditAllowConcurrentDiv').addClass('no-show');
+				$('#bulkEditAllowConcurrentDiv').addClass('d-none');
 			}
 		});
 
@@ -461,10 +461,10 @@ function ResourceManagement(opts) {
 
 		elements.toggleStatusChangeMessage.on('change', function (e) {
 			if ($(this).is(":checked")) {
-				elements.sendStatusChangeMessageContent.removeClass('no-show');
+				elements.sendStatusChangeMessageContent.removeClass('d-none');
 			}
 			else {
-				elements.sendStatusChangeMessageContent.addClass('no-show');
+				elements.sendStatusChangeMessageContent.addClass('d-none');
 			}
 		});
 
@@ -833,10 +833,10 @@ function ResourceManagement(opts) {
 		addStatusReason.unbind();
 		addStatusReason.click(function (e) {
 			e.preventDefault();
-			statusForm.find(elements.newStatusReason).toggleClass('no-show');
-			statusForm.find(elements.existingStatusReason).toggleClass('no-show');
+			statusForm.find(elements.newStatusReason).toggleClass('d-none');
+			statusForm.find(elements.existingStatusReason).toggleClass('d-none');
 
-			if (statusForm.find(elements.newStatusReason).hasClass('no-show')) {
+			if (statusForm.find(elements.newStatusReason).hasClass('d-none')) {
 				statusForm.find(elements.statusReasons).data('prev', statusReasons.val());
 				statusForm.find(elements.statusReasons).val('');
 				statusForm.find(elements.resourceStatusReason).focus();
@@ -857,7 +857,7 @@ function ResourceManagement(opts) {
 		//
 
 		elements.toggleStatusChangeMessage.prop('checked', false);
-		elements.sendStatusChangeMessageContent.addClass('no-show');
+		elements.sendStatusChangeMessageContent.addClass('d-none');
 		elements.statusMessageContent.val('');
 
 		elements.statusDialog.modal('show');
@@ -928,12 +928,12 @@ function ResourceManagement(opts) {
 		var resourceId = getActiveResourceId();
 		$.get(opts.permissionsUrl + '?dr=users', { rid: resourceId }, function (data) {
 			elements.resourceUserList.html(data);
-			$('.user-permission-spinner').addClass('no-show');
+			$('.user-permission-spinner').addClass('d-none');
 		});
 	};
 
 	var changeUserPermission = function (userId, type) {
-		$('.user-permission-spinner').removeClass('no-show');
+		$('.user-permission-spinner').removeClass('d-none');
 		$('#changeUserId').val(userId);
 		$('#changeUserType').val(type);
 		elements.changeUserForm.submit();
@@ -955,12 +955,12 @@ function ResourceManagement(opts) {
 		var resourceId = getActiveResourceId();
 		$.get(opts.permissionsUrl + '?dr=groups', { rid: resourceId }, function (data) {
 			elements.resourceGroupList.html(data);
-			$('.group-permission-spinner').addClass('no-show');
+			$('.group-permission-spinner').addClass('d-none');
 		});
 	};
 
 	var changeGroupPermission = function (groupId, type) {
-		$('.group-permission-spinner').removeClass('no-show');
+		$('.group-permission-spinner').removeClass('d-none');
 		$('#changeGroupId').val(groupId);
 		$('#changeGroupType').val(type);
 		elements.changeGroupForm.submit();
diff --git a/Web/scripts/dashboard.js b/Web/scripts/dashboard.js
index 3af6f320f..c530d239c 100644
--- a/Web/scripts/dashboard.js
+++ b/Web/scripts/dashboard.js
@@ -103,43 +103,49 @@ function Dashboard(opts) {
             var refNum = $(this).attr('id');
             window.location = options.reservationUrl + refNum;
         });
-        /* There is no btnCheckin or btnCheckout button, it appears to be unused.
-                $('.btnCheckin').click(function (e) {
-                    e.preventDefault();
-                    e.stopPropagation();
-                    var button = $(this);
-                    button.attr('disabled', 'disabled');
-                    button.find('i').removeClass('fa-sign-in').addClass('fa-spinner');
-        
-                    var form = $('#form-checkin');
-                    var refNum = $(this).attr('data-referencenumber');
-                    $('#referenceNumber').val(refNum);
-                    $.blockUI({ message: $('#wait-box') });
-                    ajaxPost(form, $(this).data('url'), null, function (data) {
-                        $('button[data-referencenumber="' + refNum + '"]').addClass('no-show');
-                        $('#result').html(data);
-                        ShowReservationAjaxResponse();
-                    });
-                });
-        
-                $('.btnCheckout').click(function (e) {
-                    e.preventDefault();
-                    e.stopPropagation();
-                    var button = $(this);
-                    button.attr('disabled', 'disabled');
-                    button.find('i').removeClass('fa-sign-in').addClass('fa-spinner');
-        
-                    var form = $('#form-checkout');
-                    var refNum = $(this).attr('data-referencenumber');
-                    $('#referenceNumber').val(refNum);
-                    $.blockUI({ message: $('#wait-box') });
-                    ajaxPost(form, null, null, function (data) {
-                        $('button[data-referencenumber="' + refNum + '"]').addClass('no-show');
-                        $('#result').html(data);
-                        ShowReservationAjaxResponse();
-                    });
-                });
-        */
+
+        $('.btnCheckin').click(function (e) {
+            e.preventDefault();
+            e.stopPropagation();
+            var button = $(this);
+            button.attr('disabled', 'disabled');
+            button.find('i').removeClass('bi-box-arrow-in-right').addClass('spinner-border').css({
+                'width': '1rem',
+                'height': '1rem'
+            });
+
+            var form = $('#form-checkin');
+            var refNum = $(this).attr('data-referencenumber');
+            $('#referenceNumber').val(refNum);
+            $.blockUI({ message: $('#wait-box') });
+            ajaxPost(form, $(this).data('url'), null, function (data) {
+                $('button[data-referencenumber="' + refNum + '"]').addClass('d-none');
+                $('#result').html(data);
+                ShowReservationAjaxResponse();
+            });
+        });
+
+        $('.btnCheckout').click(function (e) {
+            e.preventDefault();
+            e.stopPropagation();
+            var button = $(this);
+            button.attr('disabled', 'disabled');
+            button.find('i').removeClass('bi-box-arrow-in-left').addClass('spinner-border').css({
+                'width': '1rem',
+                'height': '1rem'
+            });
+
+            var form = $('#form-checkout');
+            var refNum = $(this).attr('data-referencenumber');
+            $('#referenceNumber').val(refNum);
+            $.blockUI({ message: $('#wait-box') });
+            ajaxPost(form, null, null, function (data) {
+                $('button[data-referencenumber="' + refNum + '"]').addClass('d-none');
+                $('#result').html(data);
+                ShowReservationAjaxResponse();
+            });
+        });
+
         $('#wait-box').on('click', '#btnSaveSuccessful', function (e) {
 
             CloseSaveDialog();
diff --git a/tpl/Admin/Attributes/manage_attributes.tpl b/tpl/Admin/Attributes/manage_attributes.tpl
index 1a6d059f6..d6a5444b2 100644
--- a/tpl/Admin/Attributes/manage_attributes.tpl
+++ b/tpl/Admin/Attributes/manage_attributes.tpl
@@ -107,7 +107,7 @@
 								</div>
 							</div>
 
-							<div class="secondaryEntities no-show form-group">
+							<div class="secondaryEntities d-none form-group">
 								<div class="form-check">
 									<input type="checkbox" class="limitScope form-check-input"
 										{formname key=ATTRIBUTE_LIMIT_SCOPE} id="attributeLimitScope" />
@@ -115,7 +115,7 @@
 										for="attributeLimitScope">{translate key=LimitAttributeScope}</label>
 								</div>
 							</div>
-							<div class="attributeSecondary no-show form-group">
+							<div class="attributeSecondary d-none form-group">
 								<label for="attributeSecondaryCategory"
 									class="visually-hidden">{translate key=Category}</label>
 								<select class="secondaryAttributeCategory form-select"
@@ -127,7 +127,7 @@
 										{translate key=ResourceType}</option>
 								</select>
 							</div>
-							<div class="attributeSecondary no-show form-group">
+							<div class="attributeSecondary d-none form-group">
 								<label for="attributeSecondaryEntityDescription">{translate key=CollectFor}</label>
 								<a href="#" class="secondaryPrompt link-primary"
 									id="attributeSecondaryEntityDescription">{translate key=All}</a>
@@ -233,7 +233,7 @@
 								</div>
 							</div>
 
-							<div class="form-group secondaryEntities no-show">
+							<div class="form-group secondaryEntities d-none">
 								<div class="form-check">
 									<input type="checkbox" class="limitScope form-check-input"
 										{formname key=ATTRIBUTE_LIMIT_SCOPE} id="editAttributeLimitScope" />
@@ -242,7 +242,7 @@
 								</div>
 							</div>
 
-							<div class="form-group attributeSecondary no-show">
+							<div class="form-group attributeSecondary d-none">
 								<label for="editAttributeSecondaryCategory"
 									class="visually-hidden">{translate key=Category}</label>
 								<select class="secondaryAttributeCategory form-select"
@@ -255,7 +255,7 @@
 								</select>
 							</div>
 
-							<div class="form-group attributeSecondary no-show">
+							<div class="form-group attributeSecondary d-none">
 								<label for="editAttributeSecondaryEntityDescription">{translate key=CollectFor}</label>
 								<a href="#" class="secondaryPrompt link-primary"
 									id="editAttributeSecondaryEntityDescription">{translate key=All}</a>
diff --git a/tpl/Admin/Blackouts/manage_blackouts.tpl b/tpl/Admin/Blackouts/manage_blackouts.tpl
index eaa3883a5..8b07ee487 100644
--- a/tpl/Admin/Blackouts/manage_blackouts.tpl
+++ b/tpl/Admin/Blackouts/manage_blackouts.tpl
@@ -179,8 +179,9 @@
 								<div class="checkbox checkbox-single form-check">
 									<input class="form-check-input" type="checkbox" id="delete-all"
 										aria-label="{translate key=All}" />
+									<label class="visually-hidden">{translate key=Delete}</label>
 									<a href="#" id="delete-selected" class="link-danger d-none"
-										title="{translate key=Delete}">{translate key=Delete}<i
+										title="{translate key=Delete}"><i
 											class="bi bi-trash3-fill text-danger icon remove"></i>
 								</div>
 							</th>
@@ -222,14 +223,14 @@
 							</tr>
 						{/foreach}
 					</tbody>
-					<tfoot>
+					{*<tfoot>
 						<tr>
 							<td colspan="7"></td>
-							<td class="action-delete"><a href="#" id="delete-selected" class="no-show"
+							<td class="action-delete"><a href="#" id="delete-selected" class="d-none"
 									title="{translate key=Delete}">{translate key=Delete}<span
 										class="bi bi-trash3-fill text-danger icon remove"></span></a></td>
 						</tr>
-					</tfoot>
+					</tfoot>*}
 				</table>
 			</div>
 		</div>
@@ -313,7 +314,7 @@
 						{delete_button}
 						{indicator}
 					</div>
-					<div id="deleteMultiplePlaceHolder" class="no-show"></div>
+					<div id="deleteMultiplePlaceHolder" class="d-none"></div>
 				</div>
 			</div>
 		</form>
diff --git a/tpl/Admin/Reservations/manage_reservations.tpl b/tpl/Admin/Reservations/manage_reservations.tpl
index 7dec5a2ec..41652795c 100644
--- a/tpl/Admin/Reservations/manage_reservations.tpl
+++ b/tpl/Admin/Reservations/manage_reservations.tpl
@@ -326,7 +326,7 @@
 					<tr>
 						<td colspan="{$colCount-1}"></td>
 						<td class="action-delete">
-							<a href="#" id="delete-selected" class="no-show" title="{translate key=Delete}">
+							<a href="#" id="delete-selected" class="d-none" title="{translate key=Delete}">
 								<span class="bi bi-trash3-fill text-danger icon remove"></span>
 								<span class="visually-hidden">{translate key=Delete}</span>
 							</a>
diff --git a/tpl/Admin/Resources/manage_resources.tpl b/tpl/Admin/Resources/manage_resources.tpl
index 88d5bca17..7f882f136 100644
--- a/tpl/Admin/Resources/manage_resources.tpl
+++ b/tpl/Admin/Resources/manage_resources.tpl
@@ -652,7 +652,7 @@
 							</div>
 						</div>
 
-						<label for="resourceImage" class="off-screen no-show">{translate key=Image}</label>
+						<label for="resourceImage" class="visually-hidden">{translate key=Image}</label>
 						<div class="dropzone text-center border border-2 rounded-3 bg-light" id="changeResourceImage">
 							<div class="dropzone-empty">
 								<i class="bi bi-image fs-1"></i><br />
@@ -1092,7 +1092,7 @@
 								</label>
 							</div>
 
-							<div class="form-group no-show newStatusReason mb-3">
+							<div class="form-group d-none newStatusReason mb-3">
 								<label class="clearfix">
 									<div class="fw-bold float-start">{translate key=ReasonText}</div>
 									<a href="#" class="float-end addStatusReason">
@@ -1125,7 +1125,7 @@
 								</div>
 							</div>
 
-							<div id="sendStatusChangeMessageContent" class="no-show border rounded bg-light p-3">
+							<div id="sendStatusChangeMessageContent" class="d-none border rounded bg-light p-3">
 								<div class="form-group mb-2">
 									<label class="fw-bold"
 										for="statusMessageSendDays">{translate key=AllUsersWhoHaveAReservationInTheNext}</label>
@@ -1197,7 +1197,7 @@
 				<div class="modal-body">
 					<form id="bulkUpdateForm" method="post" ajaxAction="{ManageResourcesActions::ActionBulkUpdate}"
 						class="form-vertical" role="form">
-						<div id="bulkUpdateErrors" class="error no-show mb-2">
+						<div id="bulkUpdateErrors" class="error d-none mb-2">
 							{async_validator id="bulkAttributeValidator" key=""}
 						</div>
 						<div class="d-flex align-items-center gap-1 mb-1">
@@ -1660,7 +1660,7 @@
 												{formname key=ALLOW_CONCURRENT_RESERVATIONS}>
 												{html_options options=$YesNoUnchangedOptions}
 											</select>
-											<div class="no-show" id="bulkEditAllowConcurrentDiv">
+											<div class="d-none" id="bulkEditAllowConcurrentDiv">
 												{capture name="txtConcurrentReservations" assign="txtConcurrentReservations"}
 													<label for='bulkEditMaxConcurrentReservations'
 														class='visually-hidden'>Maximum
diff --git a/tpl/Admin/Resources/manage_resources_group_permissions.tpl b/tpl/Admin/Resources/manage_resources_group_permissions.tpl
index fc41d4918..a0ae06ad1 100644
--- a/tpl/Admin/Resources/manage_resources_group_permissions.tpl
+++ b/tpl/Admin/Resources/manage_resources_group_permissions.tpl
@@ -1,6 +1,6 @@
 <h5 class="mt-2">
     <span id="totalGroups">{$Groups|default:array()|count}</span> {translate key=Groups} <span
-        class="no-show group-permission-spinner">
+        class="d-none group-permission-spinner">
         <div class="spinner-border spinner-border-sm" role="status"></div>
     </span>
 </h5>
diff --git a/tpl/Admin/Resources/manage_resources_user_permissions.tpl b/tpl/Admin/Resources/manage_resources_user_permissions.tpl
index dfc588bbf..5e39d4084 100644
--- a/tpl/Admin/Resources/manage_resources_user_permissions.tpl
+++ b/tpl/Admin/Resources/manage_resources_user_permissions.tpl
@@ -1,6 +1,6 @@
 <h5 class="mt-2">
     <span id="totalUsers">{$Users|default:array()|count}</span>
-    {translate key=Users} <span class="no-show user-permission-spinner">
+    {translate key=Users} <span class="d-none user-permission-spinner">
         <div class="spinner-border spinner-border-sm" role="status"></div>
     </span>
 </h5>
diff --git a/tpl/Dashboard/dashboard_reservation.tpl b/tpl/Dashboard/dashboard_reservation.tpl
index e6c55e982..e520bcc7b 100644
--- a/tpl/Dashboard/dashboard_reservation.tpl
+++ b/tpl/Dashboard/dashboard_reservation.tpl
@@ -18,7 +18,8 @@
                 <button title="{translate key=CheckIn}" type="button"
                     class="btn btn-sm col-12 btn-warning text-white btnCheckin"
                     data-referencenumber="{$reservation->ReferenceNumber}"
-                    data-url="ajax/reservation_checkin.php?action={ReservationAction::Checkin}">
+                    data-url="ajax/reservation_checkin.php?action={ReservationAction::Checkin}"><i
+                        class="bi bi-box-arrow-in-right"></i>
                     {translate key=CheckIn}
                 </button>
             </div>

From aa859afdff1f4aa5b7fa6cda5d1f68e8cf7291b9 Mon Sep 17 00:00:00 2001
From: labmecanicatec <58854556+labmecanicatec@users.noreply.github.com>
Date: Fri, 6 Sep 2024 21:09:52 -0500
Subject: [PATCH 21/23] An icon is added to the checkout button

---
 tpl/Dashboard/dashboard_reservation.tpl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tpl/Dashboard/dashboard_reservation.tpl b/tpl/Dashboard/dashboard_reservation.tpl
index e520bcc7b..ebdadbf85 100644
--- a/tpl/Dashboard/dashboard_reservation.tpl
+++ b/tpl/Dashboard/dashboard_reservation.tpl
@@ -31,7 +31,8 @@
                 <button title="{translate key=CheckOut}" type="button"
                     class="btn btn-sm col-12 btn-warning text-white btnCheckin"
                     data-referencenumber="{$reservation->ReferenceNumber}"
-                    data-url="ajax/reservation_checkin.php?action={ReservationAction::Checkout}">
+                    data-url="ajax/reservation_checkin.php?action={ReservationAction::Checkout}"><i
+                        class="bi bi-box-arrow-in-left"></i>
                     {translate key=CheckOut}
                 </button>
             </div>

From aa09397e91b5d7e3e4bd72ff1f9a2bfedc16d473 Mon Sep 17 00:00:00 2001
From: labmecanicatec <58854556+labmecanicatec@users.noreply.github.com>
Date: Tue, 10 Sep 2024 20:38:53 -0500
Subject: [PATCH 22/23] The width of the label and select2 elements in
 generate-reports.tpl is standardized

---
 Web/css/librebooking.css        |  4 ++
 tpl/Reports/generate-report.tpl | 90 ++++++++++++++++-----------------
 2 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/Web/css/librebooking.css b/Web/css/librebooking.css
index 4b5f3aa1f..4c3e4562c 100644
--- a/Web/css/librebooking.css
+++ b/Web/css/librebooking.css
@@ -528,6 +528,10 @@ input.mid-number {
     min-width: 250px;
 }
 
+#panelCustomReport label {
+    min-width: 130px;
+}
+
 .no-show {
     display: none !important;
 }
\ No newline at end of file
diff --git a/tpl/Reports/generate-report.tpl b/tpl/Reports/generate-report.tpl
index f1786b296..f74b98328 100644
--- a/tpl/Reports/generate-report.tpl
+++ b/tpl/Reports/generate-report.tpl
@@ -13,10 +13,11 @@
 				<div id="panelCustomReport" class="accordion-collapse collapse">
 					<div class="accordion-body no-padding">
 						<div id="custom-report-input">
-							<div class="row gy-2 mb-2 input-set" id="selectDiv">
+							<div class="row mb-2 input-set" id="selectDiv">
 								<div class="col-md-1"><span class="fw-bold">{translate key=Select}</span></div>
 
-								<div class="btn-group-sm radio col-md-11" data-bs-toggle="buttons">
+								<div class="col-md-11 btn-group-sm radio d-flex flex-wrap gap-1"
+									data-bs-toggle="buttons">
 									<input type="radio" class="btn-check" {formname key=REPORT_RESULTS}
 										value="{Report_ResultSelection::FULL_LIST}" id="results_list"
 										checked="checked" />
@@ -41,9 +42,9 @@
 							</div>
 						</div>
 
-						<div class="row gy-2 input-set select-toggle mb-2" id="listOfDiv">
+						<div class="row input-set select-toggle mb-2" id="listOfDiv">
 							<div class="col-md-1"><span class="fw-bold">{translate key=Usage}</span></div>
-							<div class="col-md-11 btn-group-sm radio" data-bs-toggle="buttons">
+							<div class="col-md-11 btn-group-sm radio d-flex flex-wrap gap-1" data-bs-toggle="buttons">
 								<input type="radio" class="btn-check" {formname key=REPORT_USAGE}
 									value="{Report_Usage::RESOURCES}" id="usage_resources" checked="checked">
 								<label for="usage_resources" class="btn btn-outline-primary"><i
@@ -56,9 +57,9 @@
 							</div>
 						</div>
 
-						<div class="row gy-2 input-set select-toggle mb-2" id="aggregateDiv" style="display:none;">
+						<div class="row input-set select-toggle mb-2" id="aggregateDiv" style="display:none;">
 							<div class="col-md-1"><span class="fw-bold">{translate key=AggregateBy}</span></div>
-							<div class="col-md-11 btn-group-sm radio">
+							<div class="col-md-11 btn-group-sm radio d-flex flex-wrap align-items-start gap-1">
 								<input type="radio" class="btn-check" {formname key=REPORT_GROUPBY}
 									value="{Report_GroupBy::NONE}" id="groupby_none" checked="checked" />
 								<label for="groupby_none" class="btn btn-outline-primary"><i
@@ -88,10 +89,10 @@
 							</div>
 						</div>
 
-						<div class="row gy-2 mb-2 input-set form-group-sm" id="rangeDiv">
+						<div class="row mb-2 input-set form-group-sm" id="rangeDiv">
 							<div class="col-md-1"><span class="fw-bold">{translate key=Range}</span></div>
-							<div class="col-md-11 d-flex">
-								<div class=" btn-group-sm radio" data-bs-toggle="buttons">
+							<div class="col-md-11">
+								<div class="btn-group-sm radio d-flex flex-wrap gap-1" data-bs-toggle="buttons">
 									<input type="radio" class="btn-check" {formname key=REPORT_RANGE}
 										value="{Report_Range::CURRENT_MONTH}" id="current_month" checked="checked" />
 									<label for="current_month" class="btn btn-outline-primary"><i
@@ -112,49 +113,49 @@
 									<label for="range_all" class="btn btn-outline-primary"><i
 											class="bi bi-calendar3-fill me-1"></i>{translate key=AllTime}</label>
 
-									<input type="radio" class="btn-check" {formname key=REPORT_RANGE}
-										value="{Report_Range::DATE_RANGE}" id="range_within" />
-									<label for="range_within" class="btn btn-outline-primary"><i
-											class="bi bi-calendar3-range me-1"></i>{translate key=Between}</label>
-								</div>
-
-								<div class="d-flex align-items-center gap-1 ms-2">
-									<label for="startDate" class="visually-hidden">{translate key=StartDate}</label>
-									<input type="input" class="form-control form-control-sm w-auto dateinput inline"
-										id="startDate" />
-									-
-									<input type="hidden" id="formattedBeginDate" {formname key=REPORT_START} />
-									<label for="endDate" class="visually-hidden">{translate key=EndDate}</label>
-									<input type="input" class="form-control form-control-sm w-auto dateinput inline"
-										id="endDate" />
-									<input type="hidden" id="formattedEndDate" {formname key=REPORT_END} />
+									<div class="d-inline-flex align-items-center gap-1 btn-group-sm ">
+										<input type="radio" class="btn-check" {formname key=REPORT_RANGE}
+											value="{Report_Range::DATE_RANGE}" id="range_within" />
+										<label for="range_within" class="btn btn-outline-primary"><i
+												class="bi bi-calendar3-range me-1"></i>{translate key=Between}</label>
+
+										<label for="startDate" class="visually-hidden">{translate key=StartDate}</label>
+										<input type="input" class="form-control form-control-sm dateinput inline"
+											id="startDate" />
+										-
+										<input type="hidden" id="formattedBeginDate" {formname key=REPORT_START} />
+										<label for="endDate" class="visually-hidden">{translate key=EndDate}</label>
+										<input type="input" class="form-control form-control-sm dateinput inline"
+											id="endDate" />
+										<input type="hidden" id="formattedEndDate" {formname key=REPORT_END} />
+									</div>
 								</div>
 							</div>
 						</div>
 
-						<div class="row gy-2 input-set form-group-sm">
+						<div class="row input-set form-group-sm">
 							<div class="col-md-1"><span class="fw-bold">{translate key=FilterBy}</span></div>
-							<div class="col-md-11 d-flex flex-wrap">
-								<div class="form-group no-margin no-padding">
+							<div class="col-md-11 d-flex flex-wrap gap-1">
+								<div class="form-group no-margin no-padding col-12 col-md-3">
 									<label for="resourceId" class="visually-hidden">{translate key=Resource}</label>
-									<select class="form-control w-auto" {formname key=RESOURCE_ID multi=true}
+									<select class="form-control" {formname key=RESOURCE_ID multi=true}
 										multiple="multiple" id="resourceId">
 										{foreach from=$Resources item=resource}
 											<option value="{$resource->GetId()}">{$resource->GetName()}</option>
 										{/foreach}
 									</select>
 								</div>
-								<div class="form-group no-margin no-padding">
+								<div class="form-group no-margin no-padding col-12 col-md-3">
 									<label for="resourceTypeId"
 										class="visually-hidden">{translate key=ResourceType}</label>
-									<select class="form-control w-auto" {formname key=RESOURCE_TYPE_ID multi=true}
+									<select class="form-control" {formname key=RESOURCE_TYPE_ID multi=true}
 										multiple="multiple" id="resourceTypeId">
 										{foreach from=$ResourceTypes item=resourceType}
 											<option value="{$resourceType->Id()}">{$resourceType->Name()}</option>
 										{/foreach}
 									</select>
 								</div>
-								<div class="form-group no-margin no-padding">
+								<div class="form-group no-margin no-padding col-12 col-md-3">
 									<label for="accessoryId" class="visually-hidden">{translate key=Accessory}</label>
 									<select class="form-control" {formname key=ACCESSORY_ID multi=true}
 										multiple="multiple" id="accessoryId">
@@ -163,7 +164,7 @@
 										{/foreach}
 									</select>
 								</div>
-								<div class="form-group no-margin no-padding">
+								<div class="form-group no-margin no-padding col-12 col-md-3">
 									<label for="scheduleId" class="visually-hidden">{translate key=Schedule}</label>
 									<select class="form-control" {formname key=SCHEDULE_ID multi=true}
 										multiple="multiple" id="scheduleId">
@@ -172,7 +173,7 @@
 										{/foreach}
 									</select>
 								</div>
-								<div class="form-group no-margin no-padding">
+								<div class="form-group no-margin no-padding col-12 col-md-3">
 									<label for="groupId" class="visually-hidden">{translate key=Group}</label>
 									<select class="form-control" {formname key=GROUP_ID multi=true} multiple="multiple"
 										id="groupId">
@@ -182,23 +183,20 @@
 									</select>
 								</div>
 							</div>
-							<div class="col-md-11 offset-md-1 d-flex">
-								<div class="form-group no-margin no-padding">
+							<div class="col-md-11 gy-1 offset-md-1  d-flex flex-wrap gap-1">
+								<div class="form-group no-margin no-padding col-12 col-md-3">
 									<div id="user-filter-div">
-										<div class="">
-											<label class="control-label sr-only"
-												for="user-filter">{translate key=AllUsers}</label>
-											<input id="user-filter" type="search" class="form-control form-control-sm"
-												placeholder="{translate key=AllUsers}" />
-											<input id="user_id" class="filter-id" type="hidden"
-												{formname key=USER_ID} />
-										</div>
+										<label class="visually-hidden"
+											for="user-filter">{translate key=AllUsers}</label>
+										<input id="user-filter" type="search" class="form-control form-control-sm"
+											placeholder="{translate key=AllUsers}" />
+										<input id="user_id" class="filter-id" type="hidden" {formname key=USER_ID} />
 									</div>
 								</div>
-								<div class="form-group no-margin no-padding">
+								<div class="form-group no-margin no-padding col-12 col-md-3">
 									<div id="participant-filter-div">
 										<div class="form-group">
-											<label class="control-label sr-only"
+											<label class="visually-hidden"
 												for="participant-filter">{translate key=AllParticipants}</label>
 											<input id="participant-filter" type="search"
 												class="form-control form-control-sm"

From 92f9b0e149a461c8304ad1a55ff90b3f7e8178ee Mon Sep 17 00:00:00 2001
From: labmecanicatec <58854556+labmecanicatec@users.noreply.github.com>
Date: Tue, 10 Sep 2024 20:41:00 -0500
Subject: [PATCH 23/23] Fixed a bug in select2 loading

---
 tpl/globalheader.tpl        | 1 -
 tpl/javascript-includes.tpl | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tpl/globalheader.tpl b/tpl/globalheader.tpl
index 06dd9925b..eba190a43 100644
--- a/tpl/globalheader.tpl
+++ b/tpl/globalheader.tpl
@@ -63,7 +63,6 @@
     {/if}
     {if isset($Select2) && $Select2}
         <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
-        <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
     {/if}
     {if isset($Timepicker) && $Timepicker}
         {cssfile src="scripts/css/timePicker.css" rel="stylesheet"}
diff --git a/tpl/javascript-includes.tpl b/tpl/javascript-includes.tpl
index e8f65c72a..4efb9bf3b 100644
--- a/tpl/javascript-includes.tpl
+++ b/tpl/javascript-includes.tpl
@@ -44,7 +44,8 @@
     {jsfile src="js/wysihtml5/bootstrap3-wysihtml5.all.min.js"}
 {/if}
 {if isset($Select2) && $Select2}
-    {jsfile src="js/select2-4.0.5.min.js"}
+    <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
+    {*jsfile src="js/select2-4.0.5.min.js"*}
 {/if}
 {if isset($Timepicker) && $Timepicker}
     {jsfile src="js/jquery.timePicker.min.js"}