From be5773cf5958ae99bab73ec12988e4d1a79b032f Mon Sep 17 00:00:00 2001
From: Claas Kazzer <kazzer@uni-leipzig.de>
Date: Tue, 20 Jun 2023 13:03:02 +0200
Subject: [PATCH] refs #23949 finc: Result list fixes
* fixes Saved in container by changing <p> to <div> (contains ul!)
* fixes search controls alignment by introducing variable
---
themes/finc/scss/_customVariables.scss | 1 +
themes/finc/scss/components/_search-control-elements.scss | 1 +
.../templates/RecordDriver/DefaultRecord/result-list.phtml | 7 ++++---
.../finc/templates/RecordDriver/SolrAI/result-list.phtml | 7 ++++---
themes/finc/templates/search/controls/sort.phtml | 4 ++--
5 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/themes/finc/scss/_customVariables.scss b/themes/finc/scss/_customVariables.scss
index c33d0c1c577..6bb4a396ee7 100644
--- a/themes/finc/scss/_customVariables.scss
+++ b/themes/finc/scss/_customVariables.scss
@@ -1082,6 +1082,7 @@ $limit-label-text-align: left !default;
$sort-select-max-width: 12em !default;
$sort-select-max-width-below-410px: 9em !default;
+$sort-select-text-align: right !default;
$sort-inner-form-display: block !default;
$limit-sort-inner-element-display: inline-block !default;
diff --git a/themes/finc/scss/components/_search-control-elements.scss b/themes/finc/scss/components/_search-control-elements.scss
index 17e0fe47d0f..46480dd0a1d 100644
--- a/themes/finc/scss/components/_search-control-elements.scss
+++ b/themes/finc/scss/components/_search-control-elements.scss
@@ -103,6 +103,7 @@
// inner sort by-form element
.search-sort {
display: $sort-inner-form-display;
+ text-align: $sort-select-text-align;
}
// 'limit-inner' and 'sort-inner' contain the select elements _and_ buttons for '.limit' and '.sort'
diff --git a/themes/finc/templates/RecordDriver/DefaultRecord/result-list.phtml b/themes/finc/templates/RecordDriver/DefaultRecord/result-list.phtml
index 58228af1830..bb774a1e01a 100644
--- a/themes/finc/templates/RecordDriver/DefaultRecord/result-list.phtml
+++ b/themes/finc/templates/RecordDriver/DefaultRecord/result-list.phtml
@@ -240,10 +240,11 @@ if ($cover):
<?php elseif ($block = $this->permission()->getAlternateContent('feature.Favorites')): ?>
<?=$block?>
<?php endif; ?>
- <?php /* Saved lists */ ?>
- <p class="savedLists" aria-live="polite">
+ <?php /* Saved lists */
+ /* finc uses div to accommodate lists inside '.savedLists' */ ?>
+ <div class="savedLists" aria-live="polite">
<strong><?=$this->transEsc("Saved in")?>:</strong>
- </p>
+ </div>
<?php endif; ?>
<?php /* Hierarchy tree link;
diff --git a/themes/finc/templates/RecordDriver/SolrAI/result-list.phtml b/themes/finc/templates/RecordDriver/SolrAI/result-list.phtml
index df20380b382..c313dd51c3e 100644
--- a/themes/finc/templates/RecordDriver/SolrAI/result-list.phtml
+++ b/themes/finc/templates/RecordDriver/SolrAI/result-list.phtml
@@ -223,10 +223,11 @@ if ($cover):
<?php elseif ($block = $this->permission()->getAlternateContent('feature.Favorites')): ?>
<?=$block?>
<?php endif; ?>
- <?php /* Saved lists */ ?>
- <p class="savedLists" aria-live="polite">
+ <?php /* Saved lists */
+ /* finc uses div to accommodate lists inside '.savedLists' */ ?>
+ <div class="savedLists" aria-live="polite">
<strong><?=$this->transEsc("Saved in")?>:</strong>
- </p>
+ </div>
<?php /* endif; */ ?>
<?php /* Hierarchy tree link;
diff --git a/themes/finc/templates/search/controls/sort.phtml b/themes/finc/templates/search/controls/sort.phtml
index 0ab1c6f4322..a5cf00045c9 100644
--- a/themes/finc/templates/search/controls/sort.phtml
+++ b/themes/finc/templates/search/controls/sort.phtml
@@ -1,7 +1,7 @@
<!-- finc: search - controls - sort -->
<?php $list = $this->params->getSortList(); if (!empty($list)): ?>
- <?php /* finc: we use class 'text-right' */ ?>
- <form class="search-sort text-right" action="<?=$this->currentPath()?>" method="get" name="sort">
+ <?php /* finc: we do not use class '.text-right' but variable '$sort-select-text-align' */ ?>
+ <form class="search-sort" action="<?=$this->currentPath()?>" method="get" name="sort">
<?=$this->results->getUrlQuery()->asHiddenFields(['sort' => '/.*/']);?>
<label for="sort_options_1"><?=$this->transEsc('Sort')?></label>
<div class="sort-inner">
--
GitLab