From b217eab28e442d8d54cd49d860572c474ed2d44f Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Thu, 9 Sep 2021 08:56:07 +0000 Subject: [PATCH] Bug 28831: Add choose/when, and change indentation As a first step: [1] Add the new pref OPACResultsUnavailableGroupingBy in the xslt, and pass it via C4/XSLT. [2] Add a choose/when construction in the third part of Availability. [3] Add indentation (8 spaces) of the inner block handling group by branch. Test plan: Make sure that OPACResultsUnavailableGroupingBy eq branch. Verify that OPAC results are still untouched. Signed-off-by: Marcel de Rooy Signed-off-by: David Nind Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart --- C4/XSLT.pm | 2 +- .../en/xslt/MARC21slim2OPACResults.xsl | 65 ++++++++++--------- 2 files changed, 37 insertions(+), 30 deletions(-) diff --git a/C4/XSLT.pm b/C4/XSLT.pm index 010e61cab2..ec8cfe232f 100644 --- a/C4/XSLT.pm +++ b/C4/XSLT.pm @@ -169,7 +169,7 @@ sub get_xslt_sysprefs { TrackClicks opacthemes IdRef OpacSuppression OPACResultsLibrary OPACShowOpenURL OpenURLResolverURL OpenURLImageLocation - OPACResultsMaxItems OPACResultsMaxItemsUnavailable + OPACResultsMaxItems OPACResultsMaxItemsUnavailable OPACResultsUnavailableGroupingBy OpenURLText OPACShowMusicalInscripts OPACPlayMusicalInscripts / ) { my $sp = C4::Context->preference( $syspref ); diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl index 72d7bc889d..8d0d010184 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl @@ -25,6 +25,7 @@ + @@ -1332,35 +1333,41 @@ On hold - - - - - - - - - - - - - - - : - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + : + + + + + + + + + + + + + + + + + + -- 2.39.5