From 8749411abd8ba46cf7dba31ab9ff847be0b91638 Mon Sep 17 00:00:00 2001 From: Winona Salesky Date: Thu, 4 Jun 2015 22:30:49 -0400 Subject: [PATCH] Bug 13383: 100/110/111 changes to XSLT Test plan: 1) Apply this patch 2) Ensure you are using the default XSLT setting for the staff and opac search results and record details 3) Find or create a record with MARC tags 100,110,111 4) Perform an opac search that would show the record in the search results. 5) Click title to review record. 6) Note the fields updates 100,110,111 to show subfields a,b,c,d,q and t.Multiple fields are separated by span class=separator |. Includes 100$j and handles multiple relator terms/codes. 7) Repeat steps 4 - 6 for the staff interface Signed-off-by: Nick Clemens Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi --- .../en/xslt/MARC21slim2intranetDetail.xsl | 84 ++++++++---- .../en/xslt/MARC21slim2intranetResults.xsl | 128 +++++++++++------- .../en/xslt/MARC21slim2OPACDetail.xsl | 55 ++++++-- .../en/xslt/MARC21slim2OPACResults.xsl | 111 ++++++++------- 4 files changed, 246 insertions(+), 132 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl index 1b3531ec42..c24a2d0e44 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl @@ -1158,7 +1158,8 @@ - Author(s): + + By: Contributor(s): @@ -1172,9 +1173,25 @@ - - - + + + + + + + + + abcdeqt + abcdjqt + + + + + + :,;/ + + + @@ -1195,26 +1212,45 @@ - - - [ - - - - - , - - - - - - , - - - - ] - - + + + + [ + + + + + + + + , + + + + + + , + + + + + + + + + , + + + + + + , + + + + ] + + . | diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl index 1f82effb87..e913ce5e5c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl @@ -339,57 +339,83 @@

by - - - - - /cgi-bin/koha/catalogue/search.pl?q=an: - - - /cgi-bin/koha/catalogue/search.pl?q=au:"" - - - - - . ; - - - - - - - /cgi-bin/koha/catalogue/search.pl?q=an: - - - /cgi-bin/koha/catalogue/search.pl?q=au:"" - - - - ; - - - - - - - - n - - - - - - - /cgi-bin/koha/catalogue/search.pl?q=an: - - - /cgi-bin/koha/catalogue/search.pl?q=au:"" - - - - . ; - - + + + + + + n + + + + + + + /cgi-bin/koha/catalogue/search.pl?q=an: + + + /cgi-bin/koha/catalogue/search.pl?q=au:"" + + + + + + + + + abcdeqt + abcdjqt + + + + + + :,;/ + + + + + + [ + + + + + + + + , + + + + + + , + + + + + + + + + , + + + + + + , + + + + ] + + + + . | + +

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl index 8c128abe1b..dcfc5212a4 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl @@ -1226,7 +1226,8 @@ - Author(s): + + By: Contributor(s): @@ -1270,9 +1271,25 @@
- - - + + + + + + + + + abcdeqt + abcdjqt + + + + + + :,;/ + + + @@ -1292,11 +1309,29 @@ - - + + [ + + + + + + + , + + + + + + , + + + + + @@ -1325,10 +1360,10 @@ -
- - . | - + + . | + + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl index 167f46d341..4623dff3fc 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl @@ -454,57 +454,74 @@ by - - - - . - - - ; - - - - - - - - -- - - + + + + + + n + + + + + + + + + + abcdeqt + abcdjqt + + + + + + :,;/ + + + + + [ + + + + + + + + , + + + + + + , + + + + + + + + + , + + + + + + , + + + + ] + + - - - - - ; - + . | - - - - -- - - - - - - - n - - - - - - - . - - - ; - - - -- 2.39.5