From 11e603b46f92ca28a736b3e40b477b0d9a59082e Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 24 Jul 2014 12:27:08 -0400 Subject: [PATCH] Bug 12655 - PROG/CCSR deprecation: Correct hard-coded opac-tmpl/prog path in XSLT Content-Type: text/plain; charset="utf-8" Two XSL files in the bootstrap theme contain hard-coded paths to the prog theme directory. This patch adds a query of the opacthemes system preference and builds the path based on the returned value. To test in a MARC21 system: Create or locate a record which contains a subject which is linked to an authority record. View the detail page for that record in the bootstrap OPAC and confirm that there is a magnifying class icon next to the link for that subject heading. Inspect or right-click the image and "View image" [FF. "Open image in new tab" in Chrome] to verify that the image being shown is from the bootstrap theme directory. Also modified: The NORMARC XSL for the detail page which has been changed in the same way. I did not test it in a NORMARC catalog. --- .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 5 +++-- .../bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl | 9 +++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl index fdd5421..ea306ee 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl @@ -28,6 +28,7 @@ + @@ -578,7 +579,7 @@ /cgi-bin/koha/opac-authoritiesdetail.pl?authid= - + @@ -1051,7 +1052,7 @@ /cgi-bin/koha/opac-authoritiesdetail.pl?authid= - + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl index e9fd625..50cc78b 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl @@ -33,6 +33,7 @@ + @@ -105,7 +106,7 @@ /cgi-bin/koha/opac-authoritiesdetail.pl?authid= - + @@ -126,7 +127,7 @@ /cgi-bin/koha/opac-authoritiesdetail.pl?authid= - + .; @@ -146,7 +147,7 @@ /cgi-bin/koha/opac-authoritiesdetail.pl?authid= - + .; @@ -424,7 +425,7 @@ /cgi-bin/koha/opac-authoritiesdetail.pl?authid= - + -- 1.7.9.5