From 11fb48cfee082e313480bfbe0d98769bb5ebb700 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 1 Oct 2024 13:33:57 +0100 Subject: [PATCH] Bug 36375: Fix inconsistencies in content warning display As suggested by Fridolin, we move the display into a template to improve consistency and maintanence and whilst doing this we also pick the suggested subfield selection. Signed-off-by: Hannah Prince Signed-off-by: Nick Clemens --- .../en/xslt/MARC21slim2intranetDetail.xsl | 35 ++---------------- .../en/xslt/MARC21slim2intranetResults.xsl | 35 ++---------------- .../prog/en/xslt/MARC21slimUtils.xsl | 36 +++++++++++++++++++ .../en/xslt/MARC21slim2OPACDetail.xsl | 35 ++---------------- .../en/xslt/MARC21slim2OPACResults.xsl | 35 ++---------------- .../bootstrap/en/xslt/MARC21slimUtils.xsl | 36 +++++++++++++++++++ 6 files changed, 84 insertions(+), 128 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl index 1f255b10f14..7080456e095 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl @@ -1114,38 +1114,9 @@ - - - Content warning: - - - - - - - - - - - - - - - - - - - - - - - - bcdefghijklmnopqrstvwxyz - - | - - - + + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl index e40e94a4358..58faae0eacb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl @@ -1024,38 +1024,9 @@ - - - Content warning: - - - - - - - - - - - - - - - - - - - - - - - - abcdefgijklnou - - | - - - + + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl index 45e0ee2252e..cbc6fc603fa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl @@ -691,6 +691,42 @@ + + + + + Content warning: + + + + + + + + + + + + + + + + + + + + + + + + bcdefghijklmnopqrstvwxyz + + | + + + + + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl index 80886efec06..9c61e678982 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl @@ -1322,38 +1322,9 @@ - - - Content warning: - - - - - - - - - - - - - - - - - - - - - - - - bcdefghijklmnopqrstvwyz - - | - - - + + + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl index 02e89e64733..17676f19a50 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl @@ -1182,38 +1182,9 @@ - - - Content warning: - - - - - - - - - - - - - - - - - - - - - - - - bcdefghijklmnopqrstvwyz - - | - - - + + + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl index 9d35b9f94ae..eb8760d98b4 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl @@ -655,6 +655,42 @@ + + + + + Content warning: + + + + + + + + + + + + + + + + + + + + + + + + bcdefghijklmnopqrstvwyz + + | + + + + + -- 2.46.2