Merge branch 'release-10.1' into release-10.1-fix-rating-star-selection

EreMaijala · Dec 3, 2024 · 3a4c96f · 3a4c96f
2 parents 09995ec + 4c3408e
commit 3a4c96f
Show file tree

Hide file tree

Showing 21 changed files with 94 additions and 25 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -128,6 +128,7 @@ module.exports = function(grunt) {
           }
         ],
         options: {
+          excludes: ['important'],
           replacements: [
             // Activate SCSS
             {

diff --git a/module/VuFind/src/VuFind/AjaxHandler/GetSideFacets.php b/module/VuFind/src/VuFind/AjaxHandler/GetSideFacets.php
@@ -39,6 +39,7 @@
 use VuFind\Search\SearchRunner;
 use VuFind\Session\Settings as SessionSettings;
 
+use function in_array;
 use function is_callable;
 
 /**
@@ -227,10 +228,10 @@ protected function formatFacets(
     ) {
         $response = [];
         $facetSet = $recommend->getFacetSet();
+        $checkboxFacets = array_column($recommend->getCheckboxFacetSet(), 'filter');
         foreach ($facets as $facet) {
-            if (strpos($facet, ':')) {
-                $response[$facet]['checkboxCount']
-                    = $this->getCheckboxFacetCount($facet, $results);
+            if (in_array($facet, $checkboxFacets)) {
+                $response[$facet]['checkboxCount'] = $this->getCheckboxFacetCount($facet, $results);
             } else {
                 $context['facet'] = $facet;
                 $context['cluster'] = $facetSet[$facet] ?? [

diff --git a/module/VuFind/src/VuFind/ILS/Driver/KohaRest.php b/module/VuFind/src/VuFind/ILS/Driver/KohaRest.php
@@ -2104,14 +2104,14 @@ protected function getItemStatusesForBiblio($id, $patron = null, array $options
         }
         $result = $this->makeRequest($requestParams);
         if (404 == $result['code']) {
-            return [];
+            return $results;
         }
         if (200 != $result['code']) {
             throw new ILSException('Problem with Koha REST API.');
         }
 
         if (empty($result['data']['item_availabilities'])) {
-            return [];
+            return $results;
         }
 
         // Return total number of results for pagination (with fallback for older

diff --git a/themes/bootprint3/css/compiled.css b/themes/bootprint3/css/compiled.css
diff --git a/themes/bootstrap3/css/compiled.css b/themes/bootstrap3/css/compiled.css
diff --git a/themes/bootstrap3/js/facets.js b/themes/bootstrap3/js/facets.js
@@ -430,8 +430,9 @@ VuFind.register('sideFacets', function SideFacets() {
     var facetList = [];
     var $facets = $container.find('div.collapse.in[data-facet], div.collapse.show[data-facet], .checkbox-filters [data-facet]');
     $facets.each(function addFacet() {
-      if (!$(this).data('loaded')) {
+      if (!$(this).data('initialized')) {
         facetList.push($(this).data('facet'));
+        $(this).data('initialized', 'true');
       }
     });
     if (facetList.length === 0) {
@@ -485,7 +486,7 @@ VuFind.register('sideFacets', function SideFacets() {
               activateFacetBlocking($facetContainer);
             }
           }
-          if (isMultiFacetsSelectionEnabled()) {
+          if (isMultiFacetsSelectionEnabled() && $facetContainer.length > 0) {
             VuFind.multiFacetsSelection.initFacetClickHandler($facetContainer.get()[0]);
           }
           $facetContainer.find('.facet-load-indicator').remove();
@@ -509,6 +510,13 @@ VuFind.register('sideFacets', function SideFacets() {
     $('.side-facets-container-ajax').each(activateSingleAjaxFacetContainer);
   }
 
+  /**
+   * Load AJAX side facets with a tiny delay so that all non-collapsed items are available after initialization
+   */
+  function delayLoadAjaxSideFacets() {
+    setTimeout(loadAjaxSideFacets, 50);
+  }
+
   function facetSessionStorage(e, data) {
     var source = $('#result0 .hiddenSource').val();
     var id = e.target.id;
@@ -551,13 +559,13 @@ VuFind.register('sideFacets', function SideFacets() {
     if (VuFind.getBootstrapMajorVersion() === 3) {
       $('.side-facets-container-ajax')
         .find('div.collapse[data-facet]:not(.in)')
-        .on('shown.bs.collapse', loadAjaxSideFacets);
+        .on('shown.bs.collapse', delayLoadAjaxSideFacets);
     } else {
       document.querySelectorAll('.side-facets-container-ajax div[data-facet]').forEach((collapseEl) => {
-        collapseEl.addEventListener('shown.bs.collapse', loadAjaxSideFacets);
+        collapseEl.addEventListener('shown.bs.collapse', delayLoadAjaxSideFacets);
       });
     }
-    loadAjaxSideFacets();
+    delayLoadAjaxSideFacets();
 
     // Keep filter dropdowns on screen
     $(".search-filter-dropdown").on("shown.bs.dropdown", function checkFilterDropdownWidth(e) {

diff --git a/themes/bootstrap3/less/bootstrap.less b/themes/bootstrap3/less/bootstrap.less
@@ -185,6 +185,12 @@ footer {
   padding: 1rem;
 }
 @media (min-width: 768px) {
+  @media (max-width: 991px) {
+    .container {
+      max-width: initial;
+      width: 100%;
+    }
+  }
   .footer-container {
     display: flex;
     width: 100%;
@@ -197,11 +203,15 @@ footer {
   .mainbody.left,
   .sidebar.left {
     float: left;
+  }
+  .mainbody.left {
     padding-right: 1rem;
   }
   .mainbody.right,
   .sidebar.right {
     float: right;
+  }
+  .mainbody.right {
     padding-left: 1rem;
   }
   .mainbody.solo {

diff --git a/themes/bootstrap3/scss/bootstrap.scss b/themes/bootstrap3/scss/bootstrap.scss
@@ -185,6 +185,12 @@ footer {
   padding: 1rem;
 }
 @media (min-width: 768px) {
+  @media (max-width: 991px) {
+    .container {
+      max-width: initial;
+      width: 100%;
+    }
+  }
   .footer-container {
     display: flex;
     width: 100%;
@@ -197,11 +203,15 @@ footer {
   .mainbody.left,
   .sidebar.left {
     float: left;
+  }
+  .mainbody.left {
     padding-right: 1rem;
   }
   .mainbody.right,
   .sidebar.right {
     float: right;
+  }
+  .mainbody.right {
     padding-left: 1rem;
   }
   .mainbody.solo {

diff --git a/themes/bootstrap3/scss/components/cookie-consent/core/components/consent-modal.scss b/themes/bootstrap3/scss/components/cookie-consent/core/components/consent-modal.scss
@@ -689,7 +689,7 @@ $cc-footer-links-gap: 1.3rem !default;
             max-width: none!important;
             min-width: auto!important;
             border-left: none!important;
-            border-top: 1px solid var(--cc-separator-border-color !important);
+            border-top: 1px solid var(--cc-separator-border-color)!important;
         }
 
         .cm__btn + .cm__btn,

diff --git a/themes/bootstrap3/scss/components/cookie-consent/core/components/preferences-modal.scss b/themes/bootstrap3/scss/components/cookie-consent/core/components/preferences-modal.scss
@@ -1000,6 +1000,6 @@ $cc-service-toggle-knob-icon-width: 1.7px !default;
     }
 
     .show--preferences #cc-main .cc--anim .pm{
-        transform: translateY(0 !important);
+        transform: translateY(0)!important;
     }
 }
diff --git a/themes/bootstrap5/css/compiled.css b/themes/bootstrap5/css/compiled.css
diff --git a/themes/bootstrap5/js/facets.js b/themes/bootstrap5/js/facets.js
@@ -430,8 +430,9 @@ VuFind.register('sideFacets', function SideFacets() {
     var facetList = [];
     var $facets = $container.find('div.collapse.in[data-facet], div.collapse.show[data-facet], .checkbox-filters [data-facet]');
     $facets.each(function addFacet() {
-      if (!$(this).data('loaded')) {
+      if (!$(this).data('initialized')) {
         facetList.push($(this).data('facet'));
+        $(this).data('initialized', 'true');
       }
     });
     if (facetList.length === 0) {
@@ -485,7 +486,7 @@ VuFind.register('sideFacets', function SideFacets() {
               activateFacetBlocking($facetContainer);
             }
           }
-          if (isMultiFacetsSelectionEnabled()) {
+          if (isMultiFacetsSelectionEnabled() && $facetContainer.length > 0) {
             VuFind.multiFacetsSelection.initFacetClickHandler($facetContainer.get()[0]);
           }
           $facetContainer.find('.facet-load-indicator').remove();
@@ -509,6 +510,13 @@ VuFind.register('sideFacets', function SideFacets() {
     $('.side-facets-container-ajax').each(activateSingleAjaxFacetContainer);
   }
 
+  /**
+   * Load AJAX side facets with a tiny delay so that all non-collapsed items are available after initialization
+   */
+  function delayLoadAjaxSideFacets() {
+    setTimeout(loadAjaxSideFacets, 50);
+  }
+
   function facetSessionStorage(e, data) {
     var source = $('#result0 .hiddenSource').val();
     var id = e.target.id;
@@ -551,13 +559,13 @@ VuFind.register('sideFacets', function SideFacets() {
     if (VuFind.getBootstrapMajorVersion() === 3) {
       $('.side-facets-container-ajax')
         .find('div.collapse[data-facet]:not(.in)')
-        .on('shown.bs.collapse', loadAjaxSideFacets);
+        .on('shown.bs.collapse', delayLoadAjaxSideFacets);
     } else {
       document.querySelectorAll('.side-facets-container-ajax div[data-facet]').forEach((collapseEl) => {
-        collapseEl.addEventListener('shown.bs.collapse', loadAjaxSideFacets);
+        collapseEl.addEventListener('shown.bs.collapse', delayLoadAjaxSideFacets);
       });
     }
-    loadAjaxSideFacets();
+    delayLoadAjaxSideFacets();
 
     // Keep filter dropdowns on screen
     $(".search-filter-dropdown").on("shown.bs.dropdown", function checkFilterDropdownWidth(e) {

diff --git a/themes/bootstrap5/scss/bootstrap.scss b/themes/bootstrap5/scss/bootstrap.scss
@@ -224,6 +224,12 @@ footer {
   padding: 1rem;
 }
 @media (min-width: 768px) {
+  @media (max-width: 991px) {
+    .container {
+      max-width: initial;
+      width: 100%;
+    }
+  }
   .footer-container {
     display: flex;
     width: 100%;
@@ -236,11 +242,15 @@ footer {
   .mainbody.left,
   .sidebar.left {
     float: left;
+  }
+  .mainbody.left {
     padding-right: 1rem;
   }
   .mainbody.right,
   .sidebar.right {
     float: right;
+  }
+  .mainbody.right {
     padding-left: 1rem;
   }
   .mainbody.solo {

diff --git a/themes/bootstrap5/scss/components/cookie-consent/core/components/consent-modal.scss b/themes/bootstrap5/scss/components/cookie-consent/core/components/consent-modal.scss
@@ -689,7 +689,7 @@ $cc-footer-links-gap: 1.3rem !default;
             max-width: none!important;
             min-width: auto!important;
             border-left: none!important;
-            border-top: 1px solid var(--cc-separator-border-color !important);
+            border-top: 1px solid var(--cc-separator-border-color)!important;
         }
 
         .cm__btn + .cm__btn,

diff --git a/themes/bootstrap5/scss/components/cookie-consent/core/components/preferences-modal.scss b/themes/bootstrap5/scss/components/cookie-consent/core/components/preferences-modal.scss
@@ -1000,6 +1000,6 @@ $cc-service-toggle-knob-icon-width: 1.7px !default;
     }
 
     .show--preferences #cc-main .cc--anim .pm{
-        transform: translateY(0 !important);
+        transform: translateY(0)!important;
     }
 }
diff --git a/themes/local_theme_example/css/compiled.css b/themes/local_theme_example/css/compiled.css
diff --git a/themes/sandal/css/compiled.css b/themes/sandal/css/compiled.css
diff --git a/themes/sandal/less/sandal.less b/themes/sandal/less/sandal.less
@@ -267,3 +267,10 @@ a:hover .login-dropdown-caret {
     .exclude { order: 2; }
   }
 }
+
+@media (max-width: 1399px) {
+  .sidebar {
+    padding-left: 0.5rem;
+    padding-right: 0.5rem;
+  }
+}
diff --git a/themes/sandal/scss/sandal.scss b/themes/sandal/scss/sandal.scss
@@ -267,3 +267,10 @@ a:hover .login-dropdown-caret {
     .exclude { order: 2; }
   }
 }
+
+@media (max-width: 1399px) {
+  .sidebar {
+    padding-left: 0.5rem;
+    padding-right: 0.5rem;
+  }
+}
diff --git a/themes/sandal5/css/compiled.css b/themes/sandal5/css/compiled.css
diff --git a/themes/sandal5/scss/sandal.scss b/themes/sandal5/scss/sandal.scss
@@ -266,3 +266,10 @@ a:hover .login-dropdown-caret {
     .exclude { order: 2; }
   }
 }
+
+@media (max-width: 1399px) {
+  .sidebar {
+    padding-left: 0.5rem;
+    padding-right: 0.5rem;
+  }
+}