diff --git a/README.md b/README.md index 13bdc634c..74fcaf6ab 100644 --- 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 index 5e16599b6..f80bf04eb 100644 --- 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%; - } \ No newline at end of file +} \ No newline at end of file diff --git a/Web/img/readme/03.png b/Web/img/readme/03.png index 1aaaea1b6..fa7d5f85e 100644 Binary files a/Web/img/readme/03.png and b/Web/img/readme/03.png differ diff --git a/Web/img/readme/08.png b/Web/img/readme/08.png index d46da86ee..4fa90e8b7 100644 Binary files a/Web/img/readme/08.png and b/Web/img/readme/08.png differ diff --git a/Web/scripts/reports/canned-reports.js b/Web/scripts/reports/canned-reports.js index 3672d3466..f6266b84a 100644 --- 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,7 +23,7 @@ function CannedReports(reportOptions) { var url = opts.csvUrl + reportId; window.open(url); }); - +*/ // $(document).on('click', '#btnChart', function(e) { // e.preventDefault(); // @@ -31,12 +31,12 @@ function CannedReports(reportOptions) { // 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 index 537d5538a..dd9bfe112 100644 --- 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('
'); - }); - - var customizeColumns = $('#customize-columns'); - customizeColumns.empty(); - $('
', { '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('
'); + }); + + var customizeColumns = $('#customize-columns'); + customizeColumns.empty(); + $('
', { '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 index a9638029a..c5e1adaf5 100644 --- 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 index fac3646ed..5ae76e3aa 100644 --- 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 index 3187c52bc..02b28f60f 100755 --- 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 index e698cb562..75d90da0b 100644 --- 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 diff --git a/lib/Common/SmartyPage.php b/lib/Common/SmartyPage.php index be64a0298..3a5a3d3af 100644 --- a/lib/Common/SmartyPage.php +++ b/lib/Common/SmartyPage.php @@ -668,7 +668,7 @@ public function CreateDataTable($params) infoEmpty: "' . $NoResultsFoundText . '", infoFiltered: "", lengthMenu: "' . $lengthMenuText . '", - zeroRecords: "' . $NoResultsFoundText .'", + zeroRecords: "' . $NoResultsFoundText . '", }, "buttons": [ { @@ -677,7 +677,7 @@ public function CreateDataTable($params) }, { extend: "excelHtml5", - text: "
' . $exportText .' Excel
", + text: "
' . $exportText . ' Excel
", }, { extend: "pdfHtml5", @@ -731,7 +731,7 @@ public function CreateDataTableFilter($params) infoFiltered: "", lengthMenu: "' . $lengthMenuText . '", zeroRecords: "' . $NoResultsFoundText . - '" + '" }, "drawCallback": function (settings) { if (typeof setUpEditables !== "undefined") { @@ -896,7 +896,7 @@ public function UpdateButton($params, $smarty) $type = isset($params['submit']) ? 'submit' : 'button'; $save = $type == 'submit' ? '' : ' save '; - echo ''; } @@ -910,7 +910,7 @@ public function AddButton($params, $smarty) $type = 'submit'; } - echo ''; } @@ -931,7 +931,7 @@ public function ResetButton($params, $smarty) { $key = isset($params['key']) ? $params['key'] : 'Reset'; $class = isset($params['class']) ? $params['class'] : ''; - echo ''; } @@ -947,7 +947,7 @@ public function OkButton($params, $smarty) { $key = isset($params['key']) ? $params['key'] : 'OK'; $class = isset($params['class']) ? $params['class'] : ''; - echo ''; } diff --git a/tpl/Admin/Blackouts/manage_blackouts.tpl b/tpl/Admin/Blackouts/manage_blackouts.tpl index 3ea6d11a3..e9aafa6da 100644 --- a/tpl/Admin/Blackouts/manage_blackouts.tpl +++ b/tpl/Admin/Blackouts/manage_blackouts.tpl @@ -150,10 +150,10 @@ {object_html_options options=$Resources key='GetId' label="GetName" selected=$ResourceId}
-
+
{filter_button class="btn-sm" id="filter"} + class="btn btn-outline-secondary btn-sm">{translate key=ViewAll}
@@ -274,7 +274,7 @@
-
+ {cancel_button} - {else} - diff --git a/tpl/Admin/Groups/manage_groups.tpl b/tpl/Admin/Groups/manage_groups.tpl index 00f698341..47d613ab9 100644 --- a/tpl/Admin/Groups/manage_groups.tpl +++ b/tpl/Admin/Groups/manage_groups.tpl @@ -137,7 +137,7 @@
- +
diff --git a/tpl/Admin/Import/ics_import.tpl b/tpl/Admin/Import/ics_import.tpl index 16c972c6f..ab59839d7 100644 --- a/tpl/Admin/Import/ics_import.tpl +++ b/tpl/Admin/Import/ics_import.tpl @@ -41,7 +41,7 @@
- {indicator}
diff --git a/tpl/Admin/Import/import.tpl b/tpl/Admin/Import/import.tpl index aea707daf..51f105b41 100644 --- a/tpl/Admin/Import/import.tpl +++ b/tpl/Admin/Import/import.tpl @@ -6,8 +6,8 @@

{translate key=Import}

- {translate key=ImportICS} - {translate key=ImportQuartzy} + {translate key=ImportICS} + {translate key=ImportQuartzy}
diff --git a/tpl/Admin/Import/quartzy_import.tpl b/tpl/Admin/Import/quartzy_import.tpl index d8c82671a..a63a855b5 100644 --- a/tpl/Admin/Import/quartzy_import.tpl +++ b/tpl/Admin/Import/quartzy_import.tpl @@ -54,7 +54,7 @@
- {indicator}
diff --git a/tpl/Admin/Reservations/manage_reservations.tpl b/tpl/Admin/Reservations/manage_reservations.tpl index 7fec876aa..e7dc98f04 100644 --- a/tpl/Admin/Reservations/manage_reservations.tpl +++ b/tpl/Admin/Reservations/manage_reservations.tpl @@ -77,11 +77,12 @@
- - - {**} +
+ + + +
@@ -108,25 +109,28 @@
- - {**} +
+ + +
- - {**} +
+ + +
- - {**} +
+ + +
@@ -705,5 +709,5 @@
- +{jsfile src="search-clear.js"} {include file='globalfooter.tpl'} \ No newline at end of file diff --git a/tpl/Admin/Resources/manage_resource_types.tpl b/tpl/Admin/Resources/manage_resource_types.tpl index eda64a485..5c9901455 100644 --- a/tpl/Admin/Resources/manage_resource_types.tpl +++ b/tpl/Admin/Resources/manage_resource_types.tpl @@ -33,7 +33,7 @@
- diff --git a/tpl/Admin/Resources/manage_resources.tpl b/tpl/Admin/Resources/manage_resources.tpl index 06217c36a..9a15241e8 100644 --- a/tpl/Admin/Resources/manage_resources.tpl +++ b/tpl/Admin/Resources/manage_resources.tpl @@ -8,20 +8,24 @@ {translate key="AddResource"} - @@ -61,7 +68,9 @@

-

@@ -73,8 +82,12 @@
- - {**} +
+ + +
@@ -92,49 +105,61 @@
- +
- - -
- + {**}
- - {html_options options=$YesNoOptions selected=$RequiresApprovalFilter}
- - {html_options options=$YesNoOptions selected=$AutoPermissionFilter}
- - {html_options options=$YesNoOptions selected=$AllowMultiDayFilter}
-
+
{foreach from=$AttributeFilters item=attribute} {control type="AttributeControl" idPrefix="search" attribute=$attribute searchmode=true class="customAttribute filter-customAttribute{$attribute->Id()} {$groupClass}"} @@ -170,7 +195,9 @@

-

@@ -180,25 +207,34 @@
-
+
{if $resource->HasImage()} -