From cf7f5ecbea96c91588871bbccd02563754cefde7 Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Tue, 20 Sep 2011 15:27:08 +1200 Subject: [PATCH] Bug 6886 - OPAC XSLT respecting single branch mode This is only for the MARC21 XSLT at this stage, follow up patch for UNIMARC will come Conflicts: C4/XSLT.pm koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref Signed-off-by: Julian Maurice --- C4/XSLT.pm | 1 + .../en/modules/admin/preferences/opac.pref | 2 +- .../prog/en/xslt/MARC21slim2OPACResults.xsl | 33 ++++++++++++++----- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/C4/XSLT.pm b/C4/XSLT.pm index ac97e65a2c..36a3bfcc06 100644 --- a/C4/XSLT.pm +++ b/C4/XSLT.pm @@ -188,6 +188,7 @@ sub XSLTParse4Display { UseAuthoritiesForTracings TraceSubjectSubdivisions Display856uAsImage OPACDisplay856uAsImage UseControlNumber IntranetBiblioDefaultView BiblioDefaultView + singleBranchMode AlternateHoldingsField AlternateHoldingsSeparator / ) { my $sp = C4::Context->preference( $syspref ); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref index 50abfeb11c..4df81b4cc8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -359,7 +359,7 @@ OPAC: choices: yes: "Don't allow" no: Allow - - patrons to select their library on the OPAC. + - patrons to select their branch on the OPAC or show branch names with callnumbers. - - pref: SearchMyLibraryFirst choices: diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl index 2b5aacc063..751c61abee 100644 --- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl +++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl @@ -27,6 +27,7 @@ + @@ -1025,15 +1026,29 @@ Copies available for loan: - - - [] - ( - - ) -. , - - + + + + [] + ( + + ) + . , + + + + + + [] + ( + + ) + . , + + + + + -- 2.39.5