From a36b09e4f930048b8cf168c733e3f2bb87a8be27 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sat, 11 May 2019 22:58:45 +0000 Subject: [PATCH] Bug 22884: Remove field ending . from XSLT templates Currently Koha very inconsistently adds a . at the end when outputting MARC fields on the detail views. This patch removes the few cases where we add in . Keeping the end user in mind, I believe it's not needed and the added consistency will be nice. ISBD should be added on cataloguing or by templates, but we should not mix when possible. To test: Catalog the following fields, if repeatable, add more than one: - 020 - 022 - 111 - 242 - 245 - 246 - 250 - 300 - 440 - 490 - 700/710/711 with $i - 700/710/711 ind.2 = 2 Verify both on staff and OPAC detail pages that there is no additional . at the end of the line. Signed-off-by: Hayley Mapley Signed-off-by: frederik Signed-off-by: Hayley Mapley Signed-off-by: Nick Clemens --- .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 18 ++++++------ .../intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl | 9 +----- .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 34 +++++++--------------- 3 files changed, 20 insertions(+), 41 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl index afa2929f38..80e8edf097 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl @@ -207,7 +207,7 @@ - . ; + ; @@ -222,7 +222,7 @@ - .; + ; @@ -439,7 +439,7 @@ - .; + ; @@ -464,7 +464,7 @@ - .; + ; @@ -574,7 +574,7 @@ - . | + | @@ -589,7 +589,7 @@ - .; + ; @@ -656,7 +656,7 @@ - . | + | @@ -698,7 +698,7 @@ - . | + | @@ -1597,7 +1597,7 @@ - . | + | diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl index 898bd8111d..0e1f4a1e6b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl @@ -339,14 +339,7 @@ - - - . - - - ; - - + ; diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl index be74affec9..45fcca7f09 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl @@ -241,7 +241,7 @@ - .; + ; @@ -465,7 +465,7 @@ - .; + ; @@ -492,7 +492,7 @@ - .; + ; @@ -545,14 +545,7 @@ - - - . - - - ; - - + ; @@ -564,14 +557,7 @@ - - - . - - - ; - - + ; @@ -641,7 +627,7 @@ - . | + | @@ -659,7 +645,7 @@ - .; + ; @@ -731,7 +717,7 @@ - . | + | @@ -773,7 +759,7 @@ - . | + | @@ -1745,7 +1731,7 @@ - . | + | -- 2.11.0