Dev bootstrap5

.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"
     ]
-}
+}

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;
@@ -490,6 +495,10 @@ input[type=text].user-search {
     width: 250px;
 }
 
+input.mid-number {
+    width: 70px !important;
+}
+
 #participantList,
 #inviteeList {
     height: 100px;
@@ -519,6 +528,10 @@ input[type=text].user-search {
     min-width: 250px;
 }
 
+#panelCustomReport label {
+    min-width: 130px;
+}
+
 .no-show {
     display: none !important;
 }

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);
         });
     }
@@ -155,10 +155,10 @@ function AttributeManagement(opts) {
             handleEntitiesSelected(activeAppliesTo);
         });
 
-        elements.limitScope.change(function (e) {
-            elements.attributeSecondary.addClass('no-show');
+        elements.limitScope.change(function () {
+            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();
         }
     };

Web/scripts/admin/email-templates.js

@@ -32,15 +32,15 @@ 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);
                 ajaxGet(options.scriptUrl + '?dr=template&lang=' + elements.languageOpts.val() + '&tn=' + templateName, null, loadTemplate);
             }
         });
 
-        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');
     }
 }

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');
 			}
 		};
 

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;
 		}

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'));
         });
 

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();

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();