diff --git a/Controls/DatePickerSetupControl.php b/Controls/DatePickerSetupControl.php index 4b1638a81..a5a22b9ee 100644 --- a/Controls/DatePickerSetupControl.php +++ b/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) diff --git a/Web/css/librebooking.css b/Web/css/librebooking.css index 4c3e4562c..8ab5b0f3f 100644 --- a/Web/css/librebooking.css +++ b/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; } \ No newline at end of file diff --git a/Web/scripts/admin/blackouts.js b/Web/scripts/admin/blackouts.js index 427d15171..4cededb98 100644 --- a/Web/scripts/admin/blackouts.js +++ b/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(); diff --git a/Web/scripts/admin/configuration.js b/Web/scripts/admin/configuration.js index accbbf4fd..9f482f042 100644 --- a/Web/scripts/admin/configuration.js +++ b/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'); } } diff --git a/Web/scripts/admin/email-templates.js b/Web/scripts/admin/email-templates.js index 3f9ff75b3..fdbdf39bf 100644 --- a/Web/scripts/admin/email-templates.js +++ b/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'); + }); } } diff --git a/Web/scripts/admin/reservations.js b/Web/scripts/admin/reservations.js index 5bfa7c7cd..759d2212d 100644 --- a/Web/scripts/admin/reservations.js +++ b/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); } diff --git a/Web/scripts/admin/schedule.js b/Web/scripts/admin/schedule.js index 67edf091b..6d8365e2a 100644 --- a/Web/scripts/admin/schedule.js +++ b/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'); diff --git a/Web/scripts/ajax-form-submit.js b/Web/scripts/ajax-form-submit.js index da538ad3b..dcc0dcc9b 100644 --- a/Web/scripts/ajax-form-submit.js +++ b/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'); diff --git a/Web/scripts/dashboard.js b/Web/scripts/dashboard.js index c530d239c..c913c5dc2 100644 --- a/Web/scripts/dashboard.js +++ b/Web/scripts/dashboard.js @@ -2,14 +2,13 @@ function Dashboard(opts) { var options = opts; var ShowReservationAjaxResponse = function () { - $('.blockUI').css('cursor', 'default'); - + //$('.blockUI').css('cursor', 'default'); $('#creatingNotification').hide(); $('#result').show(); }; var CloseSaveDialog = function () { - $.unblockUI(); + $('#wait-box').modal('hide'); }; Dashboard.prototype.init = function () { /*function setIcon(dash, targetIcon) { @@ -52,37 +51,40 @@ function Dashboard(opts) { var reservations = $(".reservation"); - reservations.qtip({ - position: { - my: 'bottom left', at: 'top left', effect: false - }, - - content: { - text: function (event, api) { - var refNum = $(this).attr('id'); - $.ajax({ url: options.summaryPopupUrl, data: { id: refNum } }) - .done(function (html) { - api.set('content.text', html) - }) - .fail(function (xhr, status, error) { - api.set('content.text', status + ': ' + error) - }); - - return 'Loading...'; - } - }, + function attachReservationTooltip(reservations, options) { + reservations.on('mouseenter', function () { + var me = $(this); + var refNum = me.attr('id'); + + me.attr('data-bs-toggle', 'tooltip') + .tooltip('show'); + + $.ajax({ + url: options.summaryPopupUrl, + data: { id: refNum } + }) + .done(function (html) { + me.attr('data-bs-original-title', html).tooltip('show'); + }) + .fail(function (xhr, status, error) { + me.attr('data-bs-original-title', status + ': ' + error).tooltip('show'); + }); + }); - show: { - delay: 700, effect: false - }, + reservations.on('mouseleave', function () { + $(this).tooltip('hide'); + }); + } - hide: { - fixed: true, delay: 500 - }, + $(document).ready(function () { + var reservations = $('.reservation'); + var options = { + summaryPopupUrl: 'ajax/respopup.php' + }; - style: { - classes: 'qtip-light qtip-bootstrap' - } + attachReservationTooltip(reservations, options); + + $('[data-bs-toggle="tooltip"]').tooltip(); }); reservations.hover(function () { @@ -117,7 +119,8 @@ function Dashboard(opts) { var form = $('#form-checkin'); var refNum = $(this).attr('data-referencenumber'); $('#referenceNumber').val(refNum); - $.blockUI({ message: $('#wait-box') }); + $('#wait-box').modal('show'); + //$.blockUI({ message: $('#wait-box') }); ajaxPost(form, $(this).data('url'), null, function (data) { $('button[data-referencenumber="' + refNum + '"]').addClass('d-none'); $('#result').html(data); @@ -138,7 +141,7 @@ function Dashboard(opts) { var form = $('#form-checkout'); var refNum = $(this).attr('data-referencenumber'); $('#referenceNumber').val(refNum); - $.blockUI({ message: $('#wait-box') }); + //$.blockUI({ message: $('#wait-box') }); ajaxPost(form, null, null, function (data) { $('button[data-referencenumber="' + refNum + '"]').addClass('d-none'); $('#result').html(data); diff --git a/Web/scripts/profile.js b/Web/scripts/profile.js index 7df39be0e..648d8fe9a 100644 --- a/Web/scripts/profile.js +++ b/Web/scripts/profile.js @@ -39,13 +39,13 @@ function Profile() { $('#profileUpdatedMessage').addClass('d-none'); - $.blockUI({ message: $('#wait-box') }); + $('#waitModal').modal('show'); return true; } function hideModal() { - $.unblockUI(); + $('#waitModal').modal('hide'); var top = $("#profile-box").scrollTop(); $('html, body').animate({ scrollTop: top }, 'slow'); diff --git a/Web/scripts/registration.js b/Web/scripts/registration.js index c126b3ece..07aca6fe7 100644 --- a/Web/scripts/registration.js +++ b/Web/scripts/registration.js @@ -50,13 +50,13 @@ function Registration() { $('#profileUpdatedMessage').hide(); - $.blockUI({ message: $('#modalDiv') }); + $('#waitModal').modal('show'); return true; } function hideModal() { - $.unblockUI(); + $('#waitModal').modal('hide'); var top = $("#registrationbox").scrollTop(); $('html, body').animate({ scrollTop: top }, 'slow'); @@ -68,10 +68,8 @@ function Registration() { var src = captchaImg.attr('src') + '?' + Math.random(); captchaImg.attr('src', src); $('#captchaValue').val(''); - } else if (window.grecaptcha) - { - grecaptcha.execute(grecaptcha.public_key, { action: 'reload' }).then(function (token) - { + } else if (window.grecaptcha) { + grecaptcha.execute(grecaptcha.public_key, { action: 'reload' }).then(function (token) { var captcha = document.getElementById('g-recaptcha-response'); captcha.value = token; }); diff --git a/Web/scripts/reports/canned-reports.js b/Web/scripts/reports/canned-reports.js index 6e79860e8..3672d3466 100644 --- a/Web/scripts/reports/canned-reports.js +++ b/Web/scripts/reports/canned-reports.js @@ -2,15 +2,15 @@ function CannedReports(reportOptions) { var opts = reportOptions; var elements = { - indicator:$('#indicator'), - resultsDiv:$('#resultsDiv') + indicator: $('#indicator'), + resultsDiv: $('#resultsDiv') }; this.init = function () { wireUpReportLinks(); - $(document).on('click', '#btnPrint',function (e) { + $(document).on('click', '#btnPrint', function (e) { e.preventDefault(); var url = opts.printUrl + reportId; @@ -26,7 +26,7 @@ function CannedReports(reportOptions) { // $(document).on('click', '#btnChart', function(e) { // e.preventDefault(); - // + // // var chart = new Chart(); // chart.generate(); // $('#report-results').hide(); @@ -37,21 +37,21 @@ function CannedReports(reportOptions) { $(this).closest('.dialog').dialog('close'); }); -// elements.sendEmailButton.click(function (e) { -// e.preventDefault(); -// var before = function () { -// elements.sendEmailButton.hide(); -// elements.emailIndicator.show() -// }; -// var after = function (data) { -// $('#emailSent').show().delay(3000).fadeOut(1000); -// elements.emailIndicator.hide(); -// elements.sendEmailButton.show(); -// $('#emailDiv').dialog('close'); -// }; -// -// ajaxPost(elements.emailForm, opts.emailUrl + reportId, before, after); -// }); + // elements.sendEmailButton.click(function (e) { + // e.preventDefault(); + // var before = function () { + // elements.sendEmailButton.hide(); + // elements.emailIndicator.show() + // }; + // var after = function (data) { + // $('#emailSent').show().delay(3000).fadeOut(1000); + // elements.emailIndicator.hide(); + // elements.sendEmailButton.show(); + // $('#emailDiv').dialog('close'); + // }; + // + // ajaxPost(elements.emailForm, opts.emailUrl + reportId, before, after); + // }); }; var wireUpReportLinks = function () { @@ -62,12 +62,12 @@ function CannedReports(reportOptions) { $('.runNow').click(function (e) { var before = function () { - elements.indicator.show().insertBefore(elements.resultsDiv); + elements.indicator.removeClass('d-none').insertBefore(elements.resultsDiv); elements.resultsDiv.html(''); }; var after = function (data) { - elements.indicator.hide(); + elements.indicator.addClass('d-none'); elements.resultsDiv.html(data) }; @@ -75,7 +75,7 @@ function CannedReports(reportOptions) { }); $('.emailNow').click(function (e) { - $('#emailDiv').dialog({modal:true}); + $('#emailDiv').dialog({ modal: true }); }); }; } \ No newline at end of file diff --git a/Web/scripts/reports/common.js b/Web/scripts/reports/common.js index c518e40ed..537d5538a 100644 --- a/Web/scripts/reports/common.js +++ b/Web/scripts/reports/common.js @@ -3,13 +3,20 @@ function ReportsCommon(opts) { init: function () { $(document).on('click', '#btnChart', function (e) { e.preventDefault(); + $('#approveDiv').modal('show'); - var chart = new Chart(opts.chartOpts); - chart.generate(); - $('#report-results').hide(); + // Use a small delay to ensure the modal is displayed sooner + setTimeout(function () { + var chart = new Chart(opts.chartOpts); + chart.generate(); + + $('#report-results').hide(); + $('#approveDiv').modal('hide'); + + }, 500); }); - $('body').click(function(e){ + $('body').click(function (e) { if (!$(e.target).closest('#customize-columns').length && !$(e.target).closest('#btnCustomizeColumns').length) { $('#customize-columns').hide(); } @@ -21,27 +28,24 @@ function ReportsCommon(opts) { var allCells = th.closest('tr').children(); var normalIndex = allCells.index(th) + 1; var colSelector = 'td:nth-child(' + normalIndex + ')'; - var col = reportResults.find(colSelector ); + var col = reportResults.find(colSelector); - if (show) - { + if (show) { th.show(); col.show(); } - else - { + else { th.hide(); col.hide(); } } - function initColumns(savedColumns){ + function initColumns(savedColumns) { if (savedColumns.length == 0) { return; } - $.each(getAllColumnTitles(), function(i, title){ - if (savedColumns.length < 1) - { + $.each(getAllColumnTitles(), function (i, title) { + if (savedColumns.length < 1) { showColumn(title, false); } else if ($.inArray(title, savedColumns) == -1) { @@ -51,7 +55,7 @@ function ReportsCommon(opts) { } function getAllColumnTitles() { - return $.map($('#report-results').find('th'), function(v) { + return $.map($('#report-results').find('th'), function (v) { return $(v).attr('data-columnTitle'); }); } @@ -59,7 +63,7 @@ function ReportsCommon(opts) { function saveSelectedCols(selectedColumns) { $('#selectedColumns').val(selectedColumns); - ajaxPost($('#saveSelectedColumns'), null, null, function(){}); + ajaxPost($('#saveSelectedColumns'), null, null, function () { }); } $(document).on('loaded', '#report-results', function (e) { @@ -71,32 +75,32 @@ function ReportsCommon(opts) { var items = []; var allColumns = getAllColumnTitles(); - $.each(allColumns, function(i, title){ + $.each(allColumns, function (i, title) { var checked = savedCols.length == 0 || $.inArray(title, savedCols) != -1 ? ' checked="checked" ' : ''; items.push('
'); }); var customizeColumns = $('#customize-columns'); customizeColumns.empty(); - $('
', {'class': '', html: items.join('')}).appendTo(customizeColumns); + $('
', { 'class': '', html: items.join('') }).appendTo(customizeColumns); var btnCustomizeColumns = $('#btnCustomizeColumns'); customizeColumns.find(':checkbox').unbind('click'); - customizeColumns.on('click', ':checkbox', function(e) { + customizeColumns.on('click', ':checkbox', function (e) { showColumn($(this).val(), $(this).is(':checked')); - var columnsToSave = $.map(customizeColumns.find(':checked'), function(checkbox){ + var columnsToSave = $.map(customizeColumns.find(':checked'), function (checkbox) { return $(checkbox).val(); }); saveSelectedCols(columnsToSave.join(separator)); }); - btnCustomizeColumns.unbind('click').on('click', function(e) { + btnCustomizeColumns.unbind('click').on('click', function (e) { e.preventDefault(); - customizeColumns.position({my:'right top', at:'right bottom', of: btnCustomizeColumns, collision: 'fit'}); + customizeColumns.position({ my: 'right top', at: 'right bottom', of: btnCustomizeColumns, collision: 'fit' }); customizeColumns.show(); }); }); diff --git a/Web/scripts/reports/generate-reports.js b/Web/scripts/reports/generate-reports.js index 228e74b37..a9638029a 100644 --- a/Web/scripts/reports/generate-reports.js +++ b/Web/scripts/reports/generate-reports.js @@ -17,7 +17,7 @@ function GenerateReports(reportOptions) { if (selectedItem == 'results_list') { $('#listOfDiv').show(); } - else if (selectedItem != 'results_utilization'){ + else if (selectedItem != 'results_utilization') { $('#aggregateDiv').show(); } }); @@ -32,12 +32,12 @@ function GenerateReports(reportOptions) { e.preventDefault(); var before = function () { - elements.indicator.show().insertBefore(elements.resultsDiv); + elements.indicator.removeClass('d-none').insertBefore(elements.resultsDiv); elements.resultsDiv.html(''); }; var after = function (data) { - elements.indicator.hide(); + elements.indicator.addClass('d-none'); elements.resultsDiv.html(data); }; @@ -80,11 +80,11 @@ function GenerateReports(reportOptions) { }); $('#saveReportForm').submit(function (e) { - handleSave(e); + handleSave(e); }); $('#btnSaveReport').click(function (e) { - handleSave(e); + handleSave(e); }); }; @@ -107,14 +107,14 @@ function GenerateReports(reportOptions) { var handleSave = function (e) { - e.preventDefault(); - var before = function () { - }; - - var after = function (data) { - elements.saveDialog.modal('hide'); - $('#saveMessage').show().delay(3000).fadeOut(1000); - }; + e.preventDefault(); + var before = function () { + }; + + var after = function (data) { + elements.saveDialog.modal('hide'); + $('#saveMessage').show().delay(3000).fadeOut(1000); + }; ajaxPost($('#customReportInput, #saveReportForm'), opts.saveUrl, before, after); }; diff --git a/Web/scripts/reports/saved-reports.js b/Web/scripts/reports/saved-reports.js index ab1a5fb92..3fadb3c1b 100644 --- a/Web/scripts/reports/saved-reports.js +++ b/Web/scripts/reports/saved-reports.js @@ -2,13 +2,13 @@ function SavedReports(reportOptions) { var opts = reportOptions; var elements = { - indicator:$('#indicator'), - resultsDiv:$('#resultsDiv'), - emailForm:$('#emailForm'), - deleteForm:$('#deleteForm'), - sendEmailButton:$('#btnSendEmail'), - emailIndicator:$('#sendEmailIndicator'), - deleteReportButton:$('#btnDeleteReport') + indicator: $('#indicator'), + resultsDiv: $('#resultsDiv'), + emailForm: $('#emailForm'), + deleteForm: $('#deleteForm'), + sendEmailButton: $('#btnSendEmail'), + emailIndicator: $('#sendEmailIndicator'), + deleteReportButton: $('#btnDeleteReport') }; var reportId = 0; @@ -16,17 +16,17 @@ function SavedReports(reportOptions) { this.init = function () { ConfigureAsyncForm(elements.emailForm, - function(){return opts.emailUrl + reportId;}, - function (data) { - $('#emailSent').show().delay(3000).fadeOut(1000); - $('#emailDiv').modal('hide'); - }); + function () { return opts.emailUrl + reportId; }, + function (data) { + $('#emailSent').show().delay(3000).fadeOut(1000); + $('#emailDiv').modal('hide'); + }); - ConfigureAsyncForm(elements.deleteForm, function(){return opts.deleteUrl + reportId;}); + ConfigureAsyncForm(elements.deleteForm, function () { return opts.deleteUrl + reportId; }); wireUpReportLinks(); - $(document).on('click', '#btnPrint',function (e) { + $(document).on('click', '#btnPrint', function (e) { e.preventDefault(); var url = opts.printUrl + reportId; @@ -39,16 +39,16 @@ function SavedReports(reportOptions) { var url = opts.csvUrl + reportId; window.open(url); }); - // + // // $(document).on('click', '#btnChart', function(e) { // e.preventDefault(); - // + // // var chart = new Chart(); // chart.generate(); // $('#report-results').hide(); // }); - $('.save').on('click', function() { + $('.save').on('click', function () { $(this).closest('form').submit(); }); }; @@ -61,12 +61,12 @@ function SavedReports(reportOptions) { $('.runNow').click(function (e) { var before = function () { - elements.indicator.show().insertBefore(elements.resultsDiv); + elements.indicator.removeClass('d-none').insertBefore(elements.resultsDiv); elements.resultsDiv.html(''); }; var after = function (data) { - elements.indicator.hide(); + elements.indicator.addClass('d-none'); elements.resultsDiv.html(data) }; @@ -77,8 +77,7 @@ function SavedReports(reportOptions) { $('#emailDiv').modal('show'); }); - $('.delete').click(function(e) - { + $('.delete').click(function (e) { $('#deleteDiv').modal('show'); }); diff --git a/Web/scripts/reservation.js b/Web/scripts/reservation.js index 48c98a2b3..49215e781 100644 --- a/Web/scripts/reservation.js +++ b/Web/scripts/reservation.js @@ -168,7 +168,7 @@ function Reservation(opts) { }); $('#btnWaitList').unbind().click(function () { - $.blockUI({ message: $('#wait-box') }); + $('#wait-box').modal('show'); JoinWaitList(); }); @@ -203,12 +203,12 @@ function Reservation(opts) { } Reservation.prototype.preSubmit = function (formData, jqForm, options) { - $.blockUI({ message: $('#wait-box') }); + $('#wait-box').modal('show'); - $('#creatingNotification').find('h3').addClass('no-show'); - $('#createUpdateMessage').removeClass('no-show'); - $('#result').hide(); - $('#creatingNotification').show(); + $('#creatingNotification').find('h3').addClass('d-none'); + $('#createUpdateMessage').removeClass('d-none'); + $('#result').addClass('d-none'); + //$('#creatingNotification').show(); return true; }; @@ -635,7 +635,6 @@ function Reservation(opts) { }; var ShowReservationAjaxResponse = function () { - $('.blockUI').css('cursor', 'default'); $('#btnSaveSuccessful').unbind().click(function (e) { window.location = options.returnUrl.replace(/&/g, '&'); @@ -658,18 +657,18 @@ function Reservation(opts) { elements.reservationForm.submit(); }); - $('#creatingNotification').hide(); - $('#result').show(); + $('#creatingNotification').addClass('d-none'); + $('#result').removeClass('d-none'); }; var CloseSaveDialog = function () { - $.unblockUI(); + $('#wait-box').modal('hide') }; var JoinWaitList = function () { - $('#result').hide(); - $('#creatingNotification').show(); - $('#joiningWaitingList').removeClass('no-show'); + $('#result').addClass('d-none'); + //$('#creatingNotification').show(); + $('#joiningWaitingList').removeClass('d-none'); ajaxPost(elements.reservationForm, opts.waitlistUrl, null, function (data) { $('#result').html(data); @@ -684,20 +683,20 @@ function Reservation(opts) { $('.update').click(function () { SetDeleteReason(); - elements.deleteRecurringButtons.addClass('no-show'); + elements.deleteRecurringButtons.addClass('d-none'); $('form').attr("action", options.updateUrl); }); $('.delete').click(function () { SetDeleteReason(); - elements.deleteRecurringButtons.removeClass('no-show'); + elements.deleteRecurringButtons.removeClass('d-none'); $('form').attr("action", options.deleteUrl); }); $('.btnCheckin').click(function () { - $('#creatingNotification').find('h3').addClass('no-show'); - $('#checkingInMessage').removeClass('no-show'); - $.blockUI({ message: $('#wait-box') }); + $('#creatingNotification').find('h3').addClass('d-none'); + $('#checkingInMessage').removeClass('d-none'); + $('#wait-box').modal('show'); ajaxPost(elements.reservationForm, opts.checkinUrl, null, function (data) { $('#result').html(data); @@ -706,9 +705,9 @@ function Reservation(opts) { }); $('.btnCheckout').click(function () { - $('#creatingNotification').find('h3').addClass('no-show'); - $('#checkingOutMessage').removeClass('no-show'); - $.blockUI({ message: $('#wait-box') }); + $('#creatingNotification').find('h3').addClass('d-none'); + $('#checkingOutMessage').removeClass('d-none'); + $('#wait-box').modal('show'); ajaxPost(elements.reservationForm, opts.checkoutUrl, null, function (data) { $('#result').html(data); diff --git a/Web/scripts/reservationPopup.js b/Web/scripts/reservationPopup.js index 83fc6e4ce..89c8ef935 100644 --- a/Web/scripts/reservationPopup.js +++ b/Web/scripts/reservationPopup.js @@ -4,37 +4,23 @@ $.fn.attachReservationPopup = function (refNum, detailsUrl) { detailsUrl = "ajax/respopup.php"; } - me.qtip({ - position: { - my: 'bottom left', at: 'top left', effect: false, viewport: $(window), adjust: { - mouse: 'flip' - } - }, - - content: { - text: function (event, api) { - $.ajax({ url: detailsUrl, data: { id: refNum } }) - .done(function (html) { - api.set('content.text', html) - }) - .fail(function (xhr, status, error) { - api.set('content.text', status + ': ' + error) - }); - - return 'Loading...'; - } - }, - - show: { - delay: 700, effect: false - }, - - hide: { - fixed: true, delay: 500 - }, + me.on('mouseenter', function () { + $.ajax({ url: detailsUrl, data: { id: refNum } }) + .done(function (html) { + me.attr('data-bs-toggle', 'tooltip') + .attr('data-bs-html', 'true') + .attr('data-bs-custom-class', 'respopup-tooltip') + .attr('data-bs-title', html) + .tooltip('show'); + }) + .fail(function (xhr, status, error) { + me.attr('data-bs-toggle', 'tooltip') + .attr('title', status + ': ' + error) + .tooltip('show'); + }); + }); - style: { - classes: 'qtip-light qtip-bootstrap' - } + me.on('mouseleave', function () { + me.tooltip('hide'); }); }; \ No newline at end of file diff --git a/Web/scripts/resourceDisplay.js b/Web/scripts/resourceDisplay.js index 223483269..967d95ab3 100644 --- a/Web/scripts/resourceDisplay.js +++ b/Web/scripts/resourceDisplay.js @@ -27,13 +27,13 @@ function ResourceDisplay(opts) { } function activateResourceDisplay(resourceId) { - $.blockUI({ message: $('#wait-box') }); + $('#waitModal').modal('show'); ajaxPost(elements.activateResourceDisplayForm, null, null, function (data) { if (data.location) { window.location = data.location; } else { - $.unblockUI(); + $('#waitModal').modal('hide'); } }); } @@ -65,7 +65,7 @@ function ResourceDisplay(opts) { refreshResource(); - //setInterval(refreshResource, 60000); + setInterval(refreshResource, 60000); elements.placeholder.on('click', '.reservePrompt', function (e) { var emailAddress = $('#emailAddress'); @@ -94,7 +94,7 @@ function ResourceDisplay(opts) { var beforeReserve = function () { $('#validationErrors').addClass('d-none'); - //showWait(); + showWait(); }; var afterReserve = function (data) { @@ -131,7 +131,7 @@ function ResourceDisplay(opts) { e.stopPropagation(); var beforeCheckin = function () { - //showWait(); + showWait(); }; var afterCheckin = function () { @@ -148,7 +148,7 @@ function ResourceDisplay(opts) { }); elements.startDate.on('change', function () { - //showWait(); + showWait(); refreshResource(hideWait); }); @@ -247,17 +247,16 @@ function ResourceDisplay(opts) { }; function showWait() { - // $('#waitIndicator').removeClass('no-show'); - // $.blockUI({ message: $('#wait-box') }); + $('#wait-modal').modal('show'); } function hideWait() { - // $.unblockUI(); + $('#wait-modal').modal('hide'); } elements.loginButton.click(function (e) { e.preventDefault(); - //showWait(); + showWait(); elements.loginForm.submit(); }); diff --git a/lang/en_us/AccountCreation-custom.tpl b/lang/en_us/AccountCreation-custom.tpl index d814a8a22..cc63b5c67 100644 --- a/lang/en_us/AccountCreation-custom.tpl +++ b/lang/en_us/AccountCreation-custom.tpl @@ -1,11 +1,11 @@

{$To},

-

A new user has registered with the following information:
-Email: {$EmailAddress}
-Name: {$FullName}
-Phone: {$Phone}
-Organization: {$Organization}
-Position: {$Position}

+

A new user has registered with the following information:
+ Email: {$EmailAddress}
+ Name: {$FullName}
+ Phone: {$Phone}
+ Organization: {$Organization}
+ Position: {$Position}

{if !empty($CreatedBy)} Created by: {$CreatedBy} {/if} \ No newline at end of file diff --git a/tpl/Admin/Blackouts/manage_blackouts.tpl b/tpl/Admin/Blackouts/manage_blackouts.tpl index 8b07ee487..3ea6d11a3 100644 --- a/tpl/Admin/Blackouts/manage_blackouts.tpl +++ b/tpl/Admin/Blackouts/manage_blackouts.tpl @@ -1,7 +1,6 @@ {include file='globalheader.tpl' Timepicker=true DataTable=true}

{translate key=ManageBlackouts}

-
@@ -17,23 +16,23 @@
- +
- + @@ -119,16 +118,17 @@
-
- +
@@ -238,7 +238,7 @@