From 6f917ceed788937a88a929c1c11cb63977cb8864 Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Thu, 31 Jul 2014 12:06:16 +0200 Subject: [PATCH] Bug 8995: Consider OPACURLOpenInNewWindow for OpenURL links --- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt | 6 +++++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt | 6 +++++- koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 5 +++++ koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 5 +++++ koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl | 5 +++++ .../opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl | 5 +++++ 6 files changed, 30 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt index e7855ce..f970bde 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt @@ -353,7 +353,11 @@ [% END %] - + [% OpenURLTarget = '_self' %] + [% IF ( OPACURLOpenInNewWindow ) %] + [% OpenURLTarget = '_blank' %] + [% END %] + [% IF openurlimagelocation %] [% ELSIF OpenURLText %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt index 2789493..3b82c1b 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt @@ -173,6 +173,10 @@ [% ELSE %] [% openurlimagelocation = "$OpenURLImageLocation" %] [% END %] + [% OpenURLTarget = '_self' %] + [% IF ( OPACURLOpenInNewWindow ) %] + [% OpenURLTarget = '_blank' %] + [% END %] [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %] @@ -325,7 +329,7 @@   [% END %] [% IF (SEARCH_RESULT.ShowOpenURL && OpenURLResolverURL && SEARCH_RESULT.coins) %] - + [% IF openurlimagelocation %] [% ELSIF OpenURLText %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl index ea19f58..ae19e5e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl @@ -1024,6 +1024,11 @@ OpenURL + + + _blank + + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl index 67b0d30..c42b71b 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl @@ -481,6 +481,11 @@ OpenURL + + + _blank + + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl index b07abb0..781f22b 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl @@ -481,6 +481,11 @@ OpenURL + + + _blank + + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl index 4956b27..544dce7 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl @@ -119,6 +119,11 @@ OpenURL + + + _blank + + -- 1.7.10.4