From 79d27030e053b294dc6b38306bb2592b367ff78c Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Fri, 2 Sep 2016 16:00:34 +0200 Subject: [PATCH] Bug 8995: Fix and simplify usage of syspref OpenURLImageLocation There were still references to the OPAC 'prog' theme in XSL files Now, when using a relative URL, we have to give the full path Signed-off-by: Magnus Enger --- .../prog/en/modules/admin/preferences/opac.pref | 6 +++--- .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 16 ++-------------- .../bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 16 ++-------------- .../bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl | 16 ++-------------- .../bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl | 16 ++-------------- 5 files changed, 11 insertions(+), 59 deletions(-) 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 0abf0a9..0698cca 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 @@ -528,11 +528,11 @@ OPAC: - 'Location of image for OpenURL links:' - pref: OpenURLImageLocation class: url - - '
Can be a complete URL starting with http:// or' - - 'https:// or the name of a file in images directory' + - '
Can be an absolute URL starting with http:// or' + - 'https:// or a relative URL' - '
Examples:' - '
- http://www.example.com/img/openurl.png' - - '
- OpenURL/OpenURL.png (file is in opac-tmpl/<opacthemes>/images/OpenURL/OpenURL.png)' + - '
- /opac-tmpl/bootstrap/images/OpenURL.png' - - pref: OPACShowOpenURL choices: diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl index 3f3ac3b..3cc22e2 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl @@ -1265,18 +1265,6 @@ - - - - - - - /opac-tmpl/prog/images/ - - - - - @@ -1293,10 +1281,10 @@ - + - + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl index 53f9f54..5cd7092 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl @@ -462,18 +462,6 @@ - - - - - - - /opac-tmpl/prog/images/ - - - - - @@ -490,10 +478,10 @@ - + - + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl index 9cf3554..b94e9cc 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl @@ -461,18 +461,6 @@ - - - - - - - /opac-tmpl/prog/images/ - - - - - @@ -489,10 +477,10 @@ - + - + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl index 2cebcd0..24db601 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl @@ -102,18 +102,6 @@ - - - - - - - /opac-tmpl/prog/images/ - - - - - @@ -130,10 +118,10 @@ - + - + -- 2.1.4