LibreBooking · effgarces · Feb 25, 2025 · Feb 19, 2025 · Feb 20, 2025 · Feb 20, 2025
diff --git a/README.md b/README.md
@@ -48,7 +48,7 @@ This is a community effort to keep the OpenSource [GPLv3](./LICENSE.md) LibreBoo
 ![color scheme](./Web/img/readme/13.png)
 ![color scheme](./Web/img/readme/14.png)
 
-- Use of DataTables (has a negative impact on tables with many records).
+- Use of DataTables.
 
 ![Use of DataTables](./Web/img/readme/15.png)
 

diff --git a/Web/css/librebooking.css b/Web/css/librebooking.css
@@ -115,6 +115,10 @@ img.logo {
     color: #ffffff;
 }
 
+.page-link:focus {
+    color: var(--primary) !important;
+}
+
 .disabled>.page-link {
     border-color: var(--primary);
 }
@@ -231,6 +235,10 @@ fieldset:disabled .btn {
     color: var(--primary) !important;
 }
 
+.accordion-footer button {
+    min-width: 150px;
+}
+
 .noImage {
     min-height: 100px;
 
@@ -315,11 +323,19 @@ li.ui-timepicker-selected,
 }
 
 .carousel-indicators [data-bs-target] {
-    background-color: #291c1c;
+    background-color: var(--primary);
 }
 
 span.searchclear,
 span.searchclear-label {
+    position: absolute;
+    right: 8px;
+    top: 55%;
+    transform: translateY(-50%);
+    color: #666;
+    font-size: 1.2em;
+    background: transparent;
+    padding-left: 3px;
     cursor: pointer;
 }
 
@@ -589,14 +605,16 @@ input.mid-number {
     display: none !important;
 }
 
-.trumbowyg-editor p, .notesValue p, .descriptionValue p {
+.trumbowyg-editor p,
+.notesValue p,
+.descriptionValue p {
     margin: 0;
 }
 
 .editable-container.editable-popup {
     max-width: 50% !important;
-    }
-    
-    .editable-input {
+}
+
+.editable-input {
     max-width: 90%;
-    }
+}
diff --git a/Web/img/readme/03.png b/Web/img/readme/03.png
diff --git a/Web/img/readme/08.png b/Web/img/readme/08.png
diff --git a/Web/scripts/reports/canned-reports.js b/Web/scripts/reports/canned-reports.js
@@ -9,7 +9,7 @@ function CannedReports(reportOptions) {
 	this.init = function () {
 
 		wireUpReportLinks();
-
+/*
 		$(document).on('click', '#btnPrint', function (e) {
 			e.preventDefault();
 
@@ -23,20 +23,20 @@ function CannedReports(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();
 		// });
-
+/*
 		$('.cancel').click(function (e) {
 			e.preventDefault();
 			$(this).closest('.dialog').dialog('close');
 		});
-
+*/
 		//		elements.sendEmailButton.click(function (e) {
 		//			e.preventDefault();
 		//			var before = function () {

diff --git a/Web/scripts/reports/common.js b/Web/scripts/reports/common.js
@@ -15,99 +15,100 @@ function ReportsCommon(opts) {
 
                 }, 500);
             });
-
-            $('body').click(function (e) {
-                if (!$(e.target).closest('#customize-columns').length && !$(e.target).closest('#btnCustomizeColumns').length) {
-                    $('#customize-columns').hide();
-                }
-            });
-
-            function showColumn(title, show) {
-                var reportResults = $('#report-results');
-                var th = reportResults.find('th[data-columnTitle="' + title + '"]');
-                var allCells = th.closest('tr').children();
-                var normalIndex = allCells.index(th) + 1;
-                var colSelector = 'td:nth-child(' + normalIndex + ')';
-                var col = reportResults.find(colSelector);
-
-                if (show) {
-                    th.show();
-                    col.show();
-                }
-                else {
-                    th.hide();
-                    col.hide();
-                }
-            }
-
-            function initColumns(savedColumns) {
-                if (savedColumns.length == 0) {
-                    return;
-                }
-                $.each(getAllColumnTitles(), function (i, title) {
-                    if (savedColumns.length < 1) {
-                        showColumn(title, false);
-                    }
-                    else if ($.inArray(title, savedColumns) == -1) {
-                        showColumn(title, false);
-                    }
-                });
-            }
-
-            function getAllColumnTitles() {
-                return $.map($('#report-results').find('th'), function (v) {
-                    return $(v).attr('data-columnTitle');
-                });
-            }
-
-            function saveSelectedCols(selectedColumns) {
-                $('#selectedColumns').val(selectedColumns);
-
-                ajaxPost($('#saveSelectedColumns'), null, null, function () { });
-            }
-
-            $(document).on('loaded', '#report-results', function (e) {
-                $('#chartdiv').empty();
-                var separator = '!s!';
-                var selectedCols = $('#selectedColumns').val();
-                var savedCols = selectedCols ? selectedCols.split(separator) : [];
-                initColumns(savedCols);
-
-                var items = [];
-                var allColumns = getAllColumnTitles();
-                $.each(allColumns, function (i, title) {
-                    var checked = savedCols.length == 0 || $.inArray(title, savedCols) != -1 ? ' checked="checked" ' : '';
-                    items.push('<div><label><input type="checkbox"' + checked + 'value="' + title + '"/> ' + title + '</label></div>');
-                });
-
-                var customizeColumns = $('#customize-columns');
-                customizeColumns.empty();
-                $('<div/>', { 'class': '', html: items.join('') }).appendTo(customizeColumns);
-
-                var btnCustomizeColumns = $('#btnCustomizeColumns');
-
-                customizeColumns.find(':checkbox').unbind('click');
-
-                customizeColumns.on('click', ':checkbox', function (e) {
-                    showColumn($(this).val(), $(this).is(':checked'));
-
-                    var columnsToSave = $.map(customizeColumns.find(':checked'), function (checkbox) {
-                        return $(checkbox).val();
-                    });
-
-                    saveSelectedCols(columnsToSave.join(separator));
-                });
-
-                btnCustomizeColumns.unbind('click').on('click', function (e) {
-                    e.preventDefault();
-                    customizeColumns.position({ my: 'right top', at: 'right bottom', of: btnCustomizeColumns, collision: 'fit' });
-                    customizeColumns.show();
-                });
-            });
-
-            $('.dialog .cancel').click(function (e) {
-                $(this).closest('.dialog').dialog("close");
-            });
+            /*
+                        $('body').click(function (e) {
+                            if (!$(e.target).closest('#customize-columns').length && !$(e.target).closest('#btnCustomizeColumns').length) {
+                                $('#customize-columns').hide();
+                            }
+                        });
+
+                        function showColumn(title, show) {
+                            var reportResults = $('#report-results');
+                            var th = reportResults.find('th[data-columnTitle="' + title + '"]');
+                            var allCells = th.closest('tr').children();
+                            var normalIndex = allCells.index(th) + 1;
+                            var colSelector = 'td:nth-child(' + normalIndex + ')';
+                            var col = reportResults.find(colSelector);
+
+                            if (show) {
+                                th.show();
+                                col.show();
+                            }
+                            else {
+                                th.hide();
+                                col.hide();
+                            }
+                        }
+
+                        function initColumns(savedColumns) {
+                            if (savedColumns.length == 0) {
+                                return;
+                            }
+                            $.each(getAllColumnTitles(), function (i, title) {
+                                if (savedColumns.length < 1) {
+                                    showColumn(title, false);
+                                }
+                                else if ($.inArray(title, savedColumns) == -1) {
+                                    showColumn(title, false);
+                                }
+                            });
+                        }
+
+                        function getAllColumnTitles() {
+                            return $.map($('#report-results').find('th'), function (v) {
+                                return $(v).attr('data-columnTitle');
+                            });
+                        }
+
+                        function saveSelectedCols(selectedColumns) {
+                            $('#selectedColumns').val(selectedColumns);
+
+                            ajaxPost($('#saveSelectedColumns'), null, null, function () { });
+                        }
+
+                        $(document).on('loaded', '#report-results', function (e) {
+                            $('#chartdiv').empty();
+                            var separator = '!s!';
+                            var selectedCols = $('#selectedColumns').val();
+                            var savedCols = selectedCols ? selectedCols.split(separator) : [];
+                            initColumns(savedCols);
+
+                            var items = [];
+                            var allColumns = getAllColumnTitles();
+                            $.each(allColumns, function (i, title) {
+                                var checked = savedCols.length == 0 || $.inArray(title, savedCols) != -1 ? ' checked="checked" ' : '';
+                                items.push('<div><label><input type="checkbox"' + checked + 'value="' + title + '"/> ' + title + '</label></div>');
+                            });
+
+                            var customizeColumns = $('#customize-columns');
+                            customizeColumns.empty();
+                            $('<div/>', { 'class': '', html: items.join('') }).appendTo(customizeColumns);
+
+                            var btnCustomizeColumns = $('#btnCustomizeColumns');
+
+                            customizeColumns.find(':checkbox').unbind('click');
+
+                            customizeColumns.on('click', ':checkbox', function (e) {
+                                showColumn($(this).val(), $(this).is(':checked'));
+
+                                var columnsToSave = $.map(customizeColumns.find(':checked'), function (checkbox) {
+                                    return $(checkbox).val();
+                                });
+
+                                saveSelectedCols(columnsToSave.join(separator));
+                            });
+
+                            btnCustomizeColumns.unbind('click').on('click', function (e) {
+                                e.preventDefault();
+                                customizeColumns.position({ my: 'right top', at: 'right bottom', of: btnCustomizeColumns, collision: 'fit' });
+                                customizeColumns.show();
+                            });
+                        });
+
+                        $('.dialog .cancel').click(function (e) {
+                            $(this).closest('.dialog').dialog("close");
+                        });
+                        */
         }
     };
 }
diff --git a/Web/scripts/reports/generate-reports.js b/Web/scripts/reports/generate-reports.js
@@ -43,7 +43,7 @@ function GenerateReports(reportOptions) {
 
             ajaxPost(elements.customReportForm, opts.customReportUrl, before, after);
         });
-
+/*
         $('#showHideCustom').click(function (e) {
             e.preventDefault();
             $('#customReportInput-container').toggle();
@@ -62,7 +62,7 @@ function GenerateReports(reportOptions) {
             var url = opts.csvUrl + elements.customReportForm.serialize();
             window.open(url);
         });
-
+*/
         elements.saveDialog.on('shown.bs.modal', function () {
             $('#saveReportName').focus();
         });

diff --git a/Web/scripts/search-clear.js b/Web/scripts/search-clear.js
@@ -1,10 +1,11 @@
-$('.searchclear').click(function(e) {
-	e.preventDefault();
-	e.stopPropagation();
+document.querySelectorAll('.searchclear').forEach(function (element) {
+	element.addEventListener('click', function (e) {
+		e.preventDefault();
+		e.stopPropagation();
 
-	var ref = $(e.target).attr('ref');
-	var refs = ref.split(',');
-	_.each(refs, function(ref) {
-		$('#' + ref).val('');
+		var refs = element.getAttribute('ref').split(',');
+		refs.forEach(function (ref) {
+			document.getElementById(ref).value = '';
+		});
 	});
 });
diff --git a/lang/en_us.php b/lang/en_us.php
@@ -794,6 +794,7 @@ protected function _LoadStrings()
         $strings['GroupMembership'] = 'Group Membership';
         $strings['AvailableGroups'] = 'Available Groups';
         $strings['CheckingAvailabilityError'] = 'Cannot get resource availability - too many resources';
+        $strings['ScanToSchedule'] = 'Scan to schedule';
         // End Strings
 
         // Install
@@ -1062,7 +1063,7 @@ protected function _LoadStrings()
         $strings['NoResourcesToView'] = 'No available resources';
         //End View Resource
 
-         //Datatables
+        //Datatables
         $strings['Info'] = "Showing page _PAGE_ of _PAGES_ of _MAX_";
         $strings['LengthMenu'] = "Display _MENU_ records per page";
         //End Datatables

diff --git a/lang/es.php b/lang/es.php
@@ -757,6 +757,7 @@ protected function _LoadStrings()
         $strings['GroupMembership'] = 'Membresía de grupo';
         $strings['AvailableGroups'] = 'Grupos disponibles';
         $strings['CheckingAvailabilityError'] = 'No es posible obtener la disponibilidad de recursos - demasiados recursos';
+        $strings['ScanToSchedule'] = 'Escanee para reservar';
         // End Strings
 
         // Install