Dev bootstrap5

Controls/DatePickerSetupControl.php

@@ -43,7 +43,11 @@ public function PageLoad()
         $this->SetDefault('MinDate', null);
         $this->SetDefault('MaxDate', null);
 
-        $this->Display('Controls/DatePickerSetup.tpl');
+        if ($controlId == 'datepicker') {
+            $this->Display('Controls/DatePickerSetup.tpl');
+        } else {
+            $this->Display('Controls/DateSetup.tpl');
+        }
     }
 
     private function SetDefault($key, $value)

Web/css/librebooking.css

@@ -10,6 +10,7 @@
     --reservedParticipating: #875cae;
     --reservedPending: #f2dfbf;
     --pasttime: #bdbdbd;
+    --hiliteReservation: #79bf40;
     --bs-body-color: #464d53;
 }
 
@@ -79,10 +80,11 @@ img.logo {
     color: var(--primary-hover) !important;
 }
 
+/*
 .dropdown-toggle.show {
     color: var(--primary-hover) !important;
 }
-
+*/
 .dropdown-menu {
     --bs-dropdown-link-active-bg: var(--primary);
     font-size: 12px;
@@ -273,14 +275,16 @@ li.ui-timepicker-selected,
 }
 
 .form-control.dateinput {
-    width: 90px;
+    width: 120px;
 }
 
 .form-select.dateinput {
     width: 90px;
 }
 
-#add-blackout-panel label {
+#add-blackout-panel label,
+#editRecurrenceModal label,
+#blackoutReasonLabel {
     min-width: 90px;
 }
 
@@ -316,7 +320,7 @@ span.searchclear-label {
     cursor: pointer;
     transition: all 300ms ease;
     transform: scale(0);
-    z-index: 1100;
+    z-index: 1050;
     opacity: 0.9;
 }
 
@@ -532,6 +536,23 @@ input.mid-number {
     min-width: 130px;
 }
 
+.respopup-tooltip .tooltip-inner {
+    font-size: 14px;
+    min-width: 450px;
+    text-align: left;
+}
+
+.fc-past {
+    background-color: var(--pasttime) !important;
+    color: #333;
+}
+
+.fc-future.hover {
+    background-color: var(--hiliteReservation) !important;
+    color: #ffffff;
+    cursor: pointer;
+}
+
 .no-show {
     display: none !important;
 }

Web/scripts/admin/blackouts.js

@@ -51,25 +51,22 @@ function BlackoutManagement(opts) {
 
 		$('#result').delegate('.unblock', 'click', function (e) {
 			$('#result').hide();
-			$.unblockUI();
+			$('#wait-box').modal('hide');
 		});
 
-		elements.blackoutTable.find('.edit').click(function (e) {
-			$('#update-spinner').show();
+		elements.blackoutTable.on('click', '.edit', function (e) {
+			$('#update-spinner').removeClass('d-none');
 			var tr = $(this).parents('tr');
 			var id = tr.attr('data-blackout-id');
 
-			$.blockUI({
-				message: $('#update-box'), css: { textAlign: 'left' }
-			});
+			$('#update-box').modal('show');
 
 			var updateDiv = $('#update-contents');
 
 			updateDiv.empty();
 			updateDiv.load(opts.editUrl + id, function () {
-				$('.blockUI').css('cursor', 'default');
 
-				$('#update-spinner').hide();
+				$('#update-spinner').addClass('d-none');
 
 				ConfigureAsyncForm($('#editBlackoutForm'), getUpdateUrl, onAddSuccess, null, {
 					onBeforeSubmit: onBeforeAddSubmit, target: '#result'
@@ -81,10 +78,10 @@ function BlackoutManagement(opts) {
 					$(this).closest('form').submit();
 				});
 
-				$('#cancelUpdate').click(function (e) {
+				/*$('#cancelUpdate').click(function (e) {
 					$('#update-box').addClass('d-none');
 					$.unblockUI();
-				});
+				});*/
 
 				$('.blackoutResources').click(function (e) {
 					if ($(".blackoutResources input:checked").length == 0) {
@@ -93,7 +90,6 @@ function BlackoutManagement(opts) {
 				});
 				wireUpTimePickers();
 
-				$('#update-box').removeClass('d-none');
 			});
 		});
 
@@ -184,7 +180,8 @@ function BlackoutManagement(opts) {
 	}
 
 	function showWaitBox() {
-		$.blockUI({ message: $('#wait-box') });
+		$('#update-box').modal('hide');
+		$('#wait-box').modal('show');
 
 		$('#result').hide();
 		$('#creatingNotification').show();
@@ -205,7 +202,6 @@ function BlackoutManagement(opts) {
 	}
 
 	function onAddSuccess() {
-		$('.blockUI').css('cursor', 'default');
 		$('#creatingNotification').hide();
 		$('#result').show();
 

Web/scripts/admin/configuration.js

@@ -3,8 +3,8 @@ function Configuration() {
 		form: $('#frmConfigSettings'),
 		configFileSelection: $('#cf'),
 		configFileForm: $('#frmConfigFile'),
-        updateHomepageForm: $('#updateHomepageForm'),
-        updateHomepageButton:$('#applyHomepage')
+		updateHomepageForm: $('#updateHomepageForm'),
+		updateHomepageButton: $('#applyHomepage')
 	};
 
 	Configuration.prototype.init = function () {
@@ -14,51 +14,47 @@ function Configuration() {
 			elements.form.submit();
 		});
 
-		elements.configFileSelection.change(function(e){
+		elements.configFileSelection.change(function (e) {
 			elements.configFileForm.submit();
 		});
 
 		elements.form.bind('onValidationFailed', onValidationFailed);
 
-		elements.updateHomepageButton.click(function(e){
-		    e.preventDefault();
-		    $('#homepage_id').val($("#default__homepage").val());
-		    elements.updateHomepageForm.submit();
-        });
+		elements.updateHomepageButton.click(function (e) {
+			e.preventDefault();
+			$('#homepage_id').val($("#default__homepage").val());
+			elements.updateHomepageForm.submit();
+		});
 
-		ConfigureAsyncForm(elements.form, defaultSubmitCallback, successHandler, null, {onBeforeSubmit: onBeforeAddSubmit});
-		ConfigureAsyncForm(elements.updateHomepageForm, defaultSubmitCallback, function(){}, function(){});
+		ConfigureAsyncForm(elements.form, defaultSubmitCallback, successHandler, null, { onBeforeSubmit: onBeforeAddSubmit });
+		ConfigureAsyncForm(elements.updateHomepageForm, defaultSubmitCallback, function () { }, function () { });
 	};
 
 	var defaultSubmitCallback = function (form) {
 		return form.attr('action') + "?action=" + form.attr('ajaxAction') + "&cf=" + elements.configFileSelection.val();
 	};
 
-	function onValidationFailed(event, data)
-	{
+	function onValidationFailed(event, data) {
 		hideModal();
 	}
 
-	function successHandler(response)
-	{
+	function successHandler(response) {
 		hideModal();
 		$('#updatedMessage').show().delay('3000').fadeOut('slow');
 	}
 
-	function onBeforeAddSubmit(formData, jqForm, opts)
-	{
+	function onBeforeAddSubmit(formData, jqForm, opts) {
 		$('#updatedMessage').hide();
-		$.blockUI({message: $('#wait-box')});
+		$('#waitModal').modal('show');
 
 		return true;
 	}
 
-	function hideModal()
-	{
-		$.unblockUI();
+	function hideModal() {
+		$('#waitModal').modal('hide');
 
 		var top = $("#updatedMessage").scrollTop();
-		$('html, body').animate({scrollTop:top}, 'slow');
+		$('html, body').animate({ scrollTop: top }, 'slow');
 	}
 
 }

Web/scripts/admin/email-templates.js

@@ -52,10 +52,14 @@ function EmailTemplateManagement(opts) {
 
     function updatedEmail(data) {
         if (data.saveResult == true) {
-            elements.updateSuccess.show().delay(2000).fadeOut(200);
+            elements.updateSuccess.css('display', '').removeClass('d-none').delay(2000).fadeOut(200, function () {
+                $(this).addClass('d-none');
+            });
         }
         else {
-            elements.updateFailed.show().delay(2000).fadeOut(200);
+            elements.updateFailed.css('display', '').removeClass('d-none').delay(2000).fadeOut(200, function () {
+                $(this).addClass('d-none');
+            });
         }
     }
 

Web/scripts/admin/reservations.js

@@ -374,7 +374,7 @@ function ReservationManagement(opts, approval) {
     }
 
     function approveReservation(referenceNumber) {
-        $.blockUI({ message: $('#approveDiv') });
+        $('#approveDiv').modal('show');
         approval.Approve(referenceNumber);
     }
 

Web/scripts/admin/schedule.js

@@ -569,15 +569,13 @@ function ScheduleManagement(opts) {
 	var showAvailabilityDialog = function (scheduleId) {
 		var placeholder = $('[data-schedule-id=' + scheduleId + ']').find('.availabilityPlaceHolder');
 		var dates = placeholder.find('.availableDates');
-
+		var startDate = formatDate(dates.data('start-date'));
+		var endDate = formatDate(dates.data('end-date'));
 		var hasAvailability = dates.data('has-availability') == '1';
 
-		// elements.availableAllYear.prop('checked', !hasAvailability);
-		elements.availableStartDateTextbox.datepicker("setDate", dates.data('start-date'));
-		elements.availableStartDate.trigger('change');
-
-		elements.availableEndDateTextbox.datepicker("setDate", dates.data('end-date'));
-		elements.availableEndDate.trigger('change');
+		//elements.availableAllYear.prop('checked', !hasAvailability);
+		elements.availableStartDateTextbox.val(startDate).trigger('change');
+		elements.availableEndDateTextbox.val(endDate).trigger('change');
 
 		if (!hasAvailability) {
 			elements.availableAllYear.trigger('click');
@@ -586,6 +584,14 @@ function ScheduleManagement(opts) {
 		elements.availabilityDialog.modal('show');
 	};
 
+	function formatDate(dateString) {
+		var date = new Date(dateString);
+		var year = date.getFullYear();
+		var month = ('0' + (date.getMonth() + 1)).slice(-2);
+		var day = ('0' + date.getDate()).slice(-2);
+		return year + '-' + month + '-' + day;
+	}
+
 	var refreshAvailability = function (resultHtml) {
 		$('[data-schedule-id=' + getActiveScheduleId() + ']').find('.availabilityPlaceHolder').html(resultHtml);
 		elements.availabilityDialog.modal('hide');

Web/scripts/ajax-form-submit.js

@@ -21,15 +21,17 @@ jQuery.fn.bindAjaxSubmit = function (updateButton, successElement, modalDiv) {
 	function onBeforeAddSubmit(formData, jqForm, opts) {
 		successElement.addClass('d-none');
 
-		$.blockUI({ message: $('#' + modalDiv.attr('id')) });
-		modalDiv.show();
+		//$.blockUI({ message: $('#' + modalDiv.attr('id')) });
+		$('#waitModal').modal('show');
+		//modalDiv.show();
 
 		return true;
 	}
 
 	function hideModal() {
-		modalDiv.hide();
-		$.unblockUI();
+		//modalDiv.hide();
+		$('#waitModal').modal('hide');
+		//$.unblockUI();
 
 		var top = self.scrollTop();
 		$('html, body').animate({ scrollTop: top }, 'slow');