Merge branch 'release-10.1' into dev

vufind-org · Nov 5, 2024 · 906455d · 906455d
2 parents 74fbd66 + b900949
commit 906455d
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 11 deletions.
diff --git a/themes/bootstrap3/templates/Recommend/SideFacets.phtml b/themes/bootstrap3/templates/Recommend/SideFacets.phtml
@@ -38,7 +38,7 @@
   <?php if ($this->multiFacetsSelection && $this->layout()->sideFacetsInstanceCounter === 1): ?>
     <?= $this->render('Recommend/SideFacets/multiFacetsSelection.phtml'); ?>
   <?php endif; ?>
-  <span class="sr-only"><?=$this->transEscAttr('page_reload_on_select_hint') ?></span>
+  <span class="sr-only"><?=$this->transEsc('page_reload_on_select_hint') ?></span>
 <?php endif; ?>
 <?php if ($hasVisibleCheckboxes): ?>
   <div class="checkboxFilter">

diff --git a/themes/bootstrap3/templates/Recommend/SideFacetsDeferred.phtml b/themes/bootstrap3/templates/Recommend/SideFacetsDeferred.phtml
@@ -46,6 +46,7 @@
   <?php if ($this->multiFacetsSelection && $this->layout()->sideFacetsInstanceCounter === 1): ?>
     <?= $this->render('Recommend/SideFacets/multiFacetsSelection.phtml'); ?>
   <?php endif; ?>
+  <span class="sr-only"><?=$this->transEsc('page_reload_on_select_hint') ?></span>
   <?php
     // We need to pass the current URL query to the Javascript; we use substr() to
     // strip off the leading ? character. The "suppress query" option is used for

diff --git a/themes/bootstrap3/templates/search/filters.phtml b/themes/bootstrap3/templates/search/filters.phtml
@@ -127,21 +127,21 @@
   ?>
   <?php // Normal view ?>
   <div class="active-filters hidden-xs">
-    <span class="sr-only"><?=$this->transEscAttr('page_reload_on_deselect_hint') ?></span>
+    <span class="sr-only"><?=$this->transEsc('page_reload_on_deselect_hint') ?></span>
     <?php if ($resetLink && $options->shouldDisplayResetFilters()): ?>
       <a class="reset-filters-btn" href="<?=$resetLink?>"><?=$this->transEsc('reset_filters_button')?></a>
     <?php elseif ($advancedSearch): ?>
       <p class="adv_search_filters"><?=$this->transEsc('adv_search_filters')?>:</p>
     <?php endif; ?>
     <div class="filters">
-      <span class="sr-only"><?=$this->transEscAttr('applied_filters') ?></span>
+      <span class="sr-only"><?=$this->transEsc('applied_filters') ?></span>
       <?=$filters ?>
     </div>
     <div class="clearfix"></div>
   </div>
   <?php // Narrow view ?>
   <div class="active-filters visible-xs">
-    <span class="sr-only"><?=$this->transEscAttr('page_reload_on_deselect_hint') ?></span>
+    <span class="sr-only"><?=$this->transEsc('page_reload_on_deselect_hint') ?></span>
     <div class="filters-toggle-bar">
       <?php if ($resetLink && $options->shouldDisplayResetFilters()): ?>
         <a class="reset-filters-btn" href="<?=$resetLink?>"><?=$this->transEsc('reset_filters_button')?></a>

diff --git a/themes/bootstrap5/css/compiled.css b/themes/bootstrap5/css/compiled.css
diff --git a/themes/bootstrap5/scss/bs3-compat.scss b/themes/bootstrap5/scss/bs3-compat.scss
@@ -380,6 +380,9 @@ h6, .h6 {
 .navbar-right {
   justify-content: right;
 }
+.navbar-left {
+  justify-content: left;
+}
 
 .media-body, .media-left, .media-right {
   display: table-cell;

diff --git a/themes/bootstrap5/templates/Recommend/SideFacets.phtml b/themes/bootstrap5/templates/Recommend/SideFacets.phtml
@@ -38,7 +38,7 @@
   <?php if ($this->multiFacetsSelection && $this->layout()->sideFacetsInstanceCounter === 1): ?>
     <?= $this->render('Recommend/SideFacets/multiFacetsSelection.phtml'); ?>
   <?php endif; ?>
-  <span class="sr-only"><?=$this->transEscAttr('page_reload_on_select_hint') ?></span>
+  <span class="sr-only"><?=$this->transEsc('page_reload_on_select_hint') ?></span>
 <?php endif; ?>
 <?php if ($hasVisibleCheckboxes): ?>
   <div class="checkboxFilter">

diff --git a/themes/bootstrap5/templates/Recommend/SideFacetsDeferred.phtml b/themes/bootstrap5/templates/Recommend/SideFacetsDeferred.phtml
@@ -46,6 +46,7 @@
   <?php if ($this->multiFacetsSelection && $this->layout()->sideFacetsInstanceCounter === 1): ?>
     <?= $this->render('Recommend/SideFacets/multiFacetsSelection.phtml'); ?>
   <?php endif; ?>
+  <span class="sr-only"><?=$this->transEsc('page_reload_on_select_hint') ?></span>
   <?php
     // We need to pass the current URL query to the Javascript; we use substr() to
     // strip off the leading ? character. The "suppress query" option is used for

diff --git a/themes/bootstrap5/templates/search/filters.phtml b/themes/bootstrap5/templates/search/filters.phtml
@@ -127,21 +127,21 @@
   ?>
   <?php // Normal view ?>
   <div class="active-filters hidden-xs">
-    <span class="sr-only"><?=$this->transEscAttr('page_reload_on_deselect_hint') ?></span>
+    <span class="sr-only"><?=$this->transEsc('page_reload_on_deselect_hint') ?></span>
     <?php if ($resetLink && $options->shouldDisplayResetFilters()): ?>
       <a class="reset-filters-btn" href="<?=$resetLink?>"><?=$this->transEsc('reset_filters_button')?></a>
     <?php elseif ($advancedSearch): ?>
       <p class="adv_search_filters"><?=$this->transEsc('adv_search_filters')?>:</p>
     <?php endif; ?>
     <div class="filters">
-      <span class="sr-only"><?=$this->transEscAttr('applied_filters') ?></span>
+      <span class="sr-only"><?=$this->transEsc('applied_filters') ?></span>
       <?=$filters ?>
     </div>
     <div class="clearfix"></div>
   </div>
   <?php // Narrow view ?>
   <div class="active-filters visible-xs">
-    <span class="sr-only"><?=$this->transEscAttr('page_reload_on_deselect_hint') ?></span>
+    <span class="sr-only"><?=$this->transEsc('page_reload_on_deselect_hint') ?></span>
     <div class="filters-toggle-bar">
       <?php if ($resetLink && $options->shouldDisplayResetFilters()): ?>
         <a class="reset-filters-btn" href="<?=$resetLink?>"><?=$this->transEsc('reset_filters_button')?></a>

diff --git a/themes/local_theme_example/css/compiled.css b/themes/local_theme_example/css/compiled.css
diff --git a/themes/sandal5/css/compiled.css b/themes/sandal5/css/compiled.css