diff --git a/templates/Instance/search_all.php b/templates/Instance/search_all.php index 6e2adb8..76c46f6 100644 --- a/templates/Instance/search_all.php +++ b/templates/Instance/search_all.php @@ -1,5 +1,8 @@ '; + } foreach ($data as $tableName => $tableResult) { if (empty($tableResult['amount'])) { continue; @@ -57,6 +60,7 @@ $this->FontAwesome->getClass('search-plus'), __('View all results') ); + $sections[] = ''; } else { echo sprintf('

%s %s

', __('Global search results for:'), h($this->request->getParam('?')['search'] ?? '')); } diff --git a/templates/element/layouts/header/header-right.php b/templates/element/layouts/header/header-right.php index b0a3a6d..92686c6 100644 --- a/templates/element/layouts/header/header-right.php +++ b/templates/element/layouts/header/header-right.php @@ -7,6 +7,7 @@ diff --git a/webroot/js/bootstrap-helper.js b/webroot/js/bootstrap-helper.js index 3bd7cd5..5af6e29 100644 --- a/webroot/js/bootstrap-helper.js +++ b/webroot/js/bootstrap-helper.js @@ -881,7 +881,7 @@ class OverlayFactory { } static overlayWrapper = '
' - static overlayContainer = '
' + static overlayContainer = '
' static overlayBg = '
' static overlaySpinner = '
' static overlayText = '' @@ -897,8 +897,8 @@ class OverlayFactory { } if (this.$node[0]) { const boundingRect = this.$node[0].getBoundingClientRect() - this.$overlayWrapper.css('min-height', boundingRect.height) - this.$overlayWrapper.css('min-width', boundingRect.width) + this.$overlayWrapper.css('min-height', Math.max(boundingRect.height, 20)) + this.$overlayWrapper.css('min-width', Math.max(boundingRect.width, 20)) } this.$overlayContainer = $(OverlayFactory.overlayContainer) this.$overlayBg = $(OverlayFactory.overlayBg) diff --git a/webroot/js/main.js b/webroot/js/main.js index 3459af3..f2a5293 100644 --- a/webroot/js/main.js +++ b/webroot/js/main.js @@ -135,7 +135,7 @@ function performGlobalSearch(evt) { const searchParams = new URLSearchParams({search: value}); const url = endpoint + '?' + searchParams const options = { - statusNode: $resultContainer + statusNode: $resultContainer.find('.search-results-wrapper') } bootstrap.Dropdown.getOrCreateInstance('#dropdownMenuSearchAll').show()