diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 55695feaa..6d214a043 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -56,9 +56,9 @@ Thank you to the following projects and libraries - jqplot - FeedWriter - Slim -- Bootstrap +- [Bootstrap](https://getbootstrap.com/) - Select2 -- Owl -- Font Awesome +- [Trumbowyg](https://alex-d.github.io/Trumbowyg/) +- [Bootstrap Icons](https://icons.getbootstrap.com/) - Gregwar/captcha - Monolog diff --git a/Web/scripts/admin/blackouts.js b/Web/scripts/admin/blackouts.js index 7eb52d7d8..bae264d4c 100644 --- a/Web/scripts/admin/blackouts.js +++ b/Web/scripts/admin/blackouts.js @@ -45,7 +45,7 @@ function BlackoutManagement(opts) { $(this).closest('.modal').modal("hide"); }); - $('#result').on( 'click', '.reload', function (e) { + $('#result').on('click', '.reload', function (e) { location.reload(); }); @@ -78,11 +78,6 @@ function BlackoutManagement(opts) { $(this).closest('form').submit(); }); - /*$('#cancelUpdate').click(function (e) { - $('#update-box').addClass('d-none'); - $.unblockUI(); - });*/ - $('.blackoutResources').click(function (e) { if ($(".blackoutResources input:checked").length == 0) { e.preventDefault(); diff --git a/Web/scripts/ajax-form-submit.js b/Web/scripts/ajax-form-submit.js index dcc0dcc9b..24959d5b8 100644 --- a/Web/scripts/ajax-form-submit.js +++ b/Web/scripts/ajax-form-submit.js @@ -21,17 +21,13 @@ jQuery.fn.bindAjaxSubmit = function (updateButton, successElement, modalDiv) { function onBeforeAddSubmit(formData, jqForm, opts) { successElement.addClass('d-none'); - //$.blockUI({ message: $('#' + modalDiv.attr('id')) }); $('#waitModal').modal('show'); - //modalDiv.show(); return true; } function hideModal() { - //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 c913c5dc2..15cdd5478 100644 --- a/Web/scripts/dashboard.js +++ b/Web/scripts/dashboard.js @@ -2,7 +2,6 @@ function Dashboard(opts) { var options = opts; var ShowReservationAjaxResponse = function () { - //$('.blockUI').css('cursor', 'default'); $('#creatingNotification').hide(); $('#result').show(); }; @@ -11,39 +10,6 @@ function Dashboard(opts) { $('#wait-box').modal('hide'); }; Dashboard.prototype.init = function () { - /*function setIcon(dash, targetIcon) { - var iconSpan = dash.find('.dashboardHeader').find('a>.bi'); - iconSpan.removeClass('bi-chevron-up'); - iconSpan.removeClass('bi-chevron-down'); - iconSpan.addClass(targetIcon); - } - - $(".dashboard").each(function (i, v) { - var dash = $(v); - var id = dash.attr('id'); - var visibility = readCookie(id); - if (visibility == '0') { - dash.find('.dashboardContents').hide(); - setIcon(dash, 'bi-chevron-down'); - } else { - setIcon(dash, 'bi-chevron-up'); - } - - dash.find('.dashboardHeader a').click(function (e) { - e.preventDefault(); - var dashboard = dash.find('.dashboardContents'); - var id = dashboard.parent().attr('id'); - if (dashboard.css('display') == 'none') { - createCookie(id, '1', 30, opts.scriptUrl); - dashboard.show(); - setIcon(dash, 'bi-chevron-up'); - } else { - createCookie(id, '0', 30, opts.scriptUrl); - dashboard.hide(); - setIcon(dash, 'bi-chevron-down'); - } - }); - });*/ $('.resourceNameSelector').each(function () { $(this).bindResourceDetails($(this).attr('resource-id')); @@ -120,7 +86,6 @@ function Dashboard(opts) { var refNum = $(this).attr('data-referencenumber'); $('#referenceNumber').val(refNum); $('#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); @@ -141,7 +106,6 @@ function Dashboard(opts) { 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); diff --git a/Web/scripts/resourcePopup.js b/Web/scripts/resourcePopup.js index 120b4fe5d..c24b07a40 100644 --- a/Web/scripts/resourcePopup.js +++ b/Web/scripts/resourcePopup.js @@ -1,7 +1,6 @@ $.fn.bindResourceDetails = function (resourceId, options) { var opts = $.extend({ preventClick: false, position: 'left bottom' }, options); - /*var owl;*/ var showEvent = $(this).data('show-event'); if (!showEvent) { @@ -88,12 +87,6 @@ $.fn.bindResourceDetails = function (resourceId, options) { hideDiv(); }); tag.position({ my: 'left top', at: opts.position, of: resourceNameElement }); - /*if (typeof '' !== "owlCarousel") { - owl = $(".owl-carousel"); - owl.owlCarousel({ - items: 1 - }); - }*/ } }, 500); }).mouseleave(function () { diff --git a/lang/en_us.php b/lang/en_us.php index 02b28f60f..3356cb122 100755 --- a/lang/en_us.php +++ b/lang/en_us.php @@ -795,6 +795,7 @@ protected function _LoadStrings() $strings['AvailableGroups'] = 'Available Groups'; $strings['CheckingAvailabilityError'] = 'Cannot get resource availability - too many resources'; $strings['ScanToSchedule'] = 'Scan to schedule'; + $strings['MaintenanceNotice'] = 'Currently performing maintenance. We will be back soon.'; // End Strings // Install diff --git a/lang/es.php b/lang/es.php index 75d90da0b..d39449a72 100644 --- a/lang/es.php +++ b/lang/es.php @@ -587,7 +587,7 @@ protected function _LoadStrings() $strings['ApplyToCurrentUsers'] = 'Aplicar a los usuarios actuales'; $strings['ReasonText'] = 'Razón'; $strings['NoAvailableMatchingTimes'] = 'No hay horas disponibles que coincidan con tu búsqueda'; - $strings['Schedules'] = 'Horarios'; + $strings['Schedules'] = 'Planificaciones'; $strings['NotifyUser'] = 'Notificar al usuario'; $strings['UpdateUsersOnImport'] = 'Actualizar el usuario existente si la dirección del correo electrónico ya existe.'; $strings['UpdateResourcesOnImport'] = 'Actualizar los recursos existentes si el nombre ya existe'; @@ -758,6 +758,7 @@ protected function _LoadStrings() $strings['AvailableGroups'] = 'Grupos disponibles'; $strings['CheckingAvailabilityError'] = 'No es posible obtener la disponibilidad de recursos - demasiados recursos'; $strings['ScanToSchedule'] = 'Escanee para reservar'; + $strings['MaintenanceNotice'] = 'Actualmente estamos en mantenimiento. Volveremos pronto.'; // End Strings // Install @@ -917,6 +918,8 @@ protected function _LoadStrings() $strings['ViewCalendar'] = 'Ver Calendario'; $strings['DataCleanup'] = 'Limpiar Datos'; $strings['ManageEmailTemplates'] = 'Administrar Plantillas de Correo Electrónico'; + $strings['CheckResources'] = 'Consultar Recursos'; + $strings['CheckSchedules'] = 'Consultar Planificaciones'; // End Page Titles // Day representations @@ -1019,7 +1022,7 @@ protected function _LoadStrings() //END NEEDS CHECKING //View Resource - $strings['Check'] = 'Comprobar'; + $strings['Check'] = 'Consultar'; $strings['PermissionType'] = 'Tipo de permiso'; $strings['NoResourcesToView'] = 'No hay recursos disponibles'; //End View Resource diff --git a/tpl/Admin/Blackouts/manage_blackouts.tpl b/tpl/Admin/Blackouts/manage_blackouts.tpl index e9aafa6da..0ef516fed 100644 --- a/tpl/Admin/Blackouts/manage_blackouts.tpl +++ b/tpl/Admin/Blackouts/manage_blackouts.tpl @@ -152,8 +152,8 @@
{filter_button class="btn-sm" id="filter"} - +
@@ -369,12 +369,7 @@ var blackoutManagement = new BlackoutManagement(blackoutOpts); blackoutManagement.init(); - //$('#add-blackout-panel').showHidePanel(); }); - - //$.blockUI.defaults.css.width = '80%'; - //$.blockUI.defaults.css.left = '10%'; - //$.blockUI.defaults.css.marginTop = '-5%'; {control type="DatePickerSetupControl" ControlId="startDate" AltId="formattedStartDate"} diff --git a/tpl/Admin/Configuration/change_theme.tpl b/tpl/Admin/Configuration/change_theme.tpl index c78bb0b45..eadfc37de 100644 --- a/tpl/Admin/Configuration/change_theme.tpl +++ b/tpl/Admin/Configuration/change_theme.tpl @@ -1,7 +1,7 @@ {include file='globalheader.tpl' }
-
+

{translate key=LookAndFeel}

diff --git a/tpl/Admin/Configuration/manage_email_templates.tpl b/tpl/Admin/Configuration/manage_email_templates.tpl index 85b6f723a..c3ae20d35 100644 --- a/tpl/Admin/Configuration/manage_email_templates.tpl +++ b/tpl/Admin/Configuration/manage_email_templates.tpl @@ -2,54 +2,29 @@
-
-

{translate key=ManageEmailTemplates}

+
+
+

{translate key=ManageEmailTemplates}

+ +
+ -
- - -
- -
- -
- -
-
-
-
- -
- -
- {indicator} - {update_button submit=true} - -
- - - {csrf_token} -
-