Bugzilla – Attachment 180721 Details for
Bug 28307
Enable BakerTaylorEnabled content in the staff interface with separate system preference
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 28307: (follow-up) Correct OPAC references to OPACBakerTaylorEnabled
Bug-28307-follow-up-Correct-OPAC-references-to-OPA.patch (text/plain), 32.01 KB, created by
Owen Leonard
on 2025-04-08 13:33:48 UTC
(
hide
)
Description:
Bug 28307: (follow-up) Correct OPAC references to OPACBakerTaylorEnabled
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2025-04-08 13:33:48 UTC
Size:
32.01 KB
patch
obsolete
>From 07c6f30c39307eeb11b57f0190aa3d22c3a6f789 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 6 Dec 2024 12:10:49 +0000 >Subject: [PATCH] Bug 28307: (follow-up) Correct OPAC references to > OPACBakerTaylorEnabled > >This patch adds the new OPACBakerTaylorEnabled preferences to OPAC >templates and scripts which were missed in the first patch. The patch >also adds OPACBakerTaylorEnabled to UsageStats.pm and sysprefs.sql. > >Check these pages in the OPAC: > > - Catalog -> Search results > - And search results -> RSS > - Catalog -> Bibliographic details page -> Shelf browser > - Catalog -> Lists -> List contents > - Catalog -> Recent comments > - And recent comments -> RSS > - Your summary -> Checkouts and Overdues >--- > C4/UsageStats.pm | 1 + > installer/data/mysql/mandatory/sysprefs.sql | 3 ++- > .../prog/en/modules/catalogue/detail.tt | 2 +- > .../prog/en/modules/catalogue/results.tt | 10 ++++--- > .../bootstrap/en/includes/opac-bottom.inc | 2 +- > .../bootstrap/en/includes/shelfbrowser.inc | 13 ++++------ > .../bootstrap/en/modules/opac-opensearch.tt | 13 +++++++--- > .../en/modules/opac-readingrecord.tt | 11 +++----- > .../bootstrap/en/modules/opac-results.tt | 2 +- > .../bootstrap/en/modules/opac-shelves.tt | 21 +++++---------- > .../en/modules/opac-showreviews-rss.tt | 4 ++- > .../bootstrap/en/modules/opac-showreviews.tt | 11 +++++--- > .../bootstrap/en/modules/opac-user.tt | 26 ++++++++++--------- > opac/opac-readingrecord.pl | 2 +- > opac/opac-search.pl | 8 +++--- > opac/opac-showreviews.pl | 8 ++++++ > opac/opac-user.pl | 12 ++++----- > 17 files changed, 77 insertions(+), 72 deletions(-) > >diff --git a/C4/UsageStats.pm b/C4/UsageStats.pm >index a8b1b934f23..36325b2cffa 100644 >--- a/C4/UsageStats.pm >+++ b/C4/UsageStats.pm >@@ -229,6 +229,7 @@ sub _shared_preferences { > OPACAmazonCoverImages > Babeltheque > BakerTaylorEnabled >+ OPACBakerTaylorEnabled > GoogleJackets > HTML5MediaEnabled > LibraryThingForLibrariesEnabled >diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql >index 2bf9d0b6486..1f59b7dbc8e 100644 >--- a/installer/data/mysql/mandatory/sysprefs.sql >+++ b/installer/data/mysql/mandatory/sysprefs.sql >@@ -474,6 +474,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` > ('OPACAmazonCoverImages','0','','Display cover images on OPAC from Amazon Web Services','YesNo'), > ('OPACAuthorIdentifiersAndInformation', '', '', 'Display author information on the OPAC detail page','multiple_sortable'), > ('OpacAuthorities','1',NULL,'If ON, enables the search authorities link on OPAC','YesNo'), >+('OPACBakerTaylorEnabled','0','','Enable or disable all Baker & Taylor features in the OPAC.','YesNo'), > ('OPACBaseURL','',NULL,'Specify the Base URL of the OPAC, e.g., http://opac.mylibrary.com, including the protocol (http:// or https://). Otherwise, the http:// will be added automatically by Koha upon saving.','Free'), > ('opacbookbag','1','','If ON, enables display of Cart feature','YesNo'), > ('OpacBrowser','0',NULL,'If ON, enables subject authorities browser on OPAC (needs to set misc/cronjob/sbuild_browser_and_cloud.pl)','YesNo'), >@@ -876,4 +877,4 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` > ('z3950AuthorAuthFields','701,702,700',NULL,'Define the MARC biblio fields for Personal Name Authorities to fill biblio.author','free'), > ('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo'), > ('z3950Status','','','This syspref allows to define custom YAML based rules for marking items unavailable in z3950 results.','Textarea') >-; >+; >\ No newline at end of file >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >index 348e1abf491..2a66c2e7320 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -236,7 +236,7 @@ > </div> > <!-- /.col-xs-* --> > >- [% IF ( CoverImagePlugins || AmazonCoverImages || LocalCoverImages || IntranetCoce || ( SyndeticsCovers ) || (Koha.Preference('CustomCoverImages') && Koha.Preference('CustomCoverImagesURL')) ) %] >+ [% IF ( CoverImagePlugins || AmazonCoverImages || LocalCoverImages || IntranetCoce || ( SyndeticsCovers ) || (Koha.Preference('CustomCoverImages') && Koha.Preference('CustomCoverImagesURL')) || Koha.Preference( "BakerTaylorEnabled" ) ) %] > <div class="col-sm-3 bookcoverimg"> > <div id="biblio-cover-slider" class="cover-slider" data-isbn="[% normalized_isbn | html %]"> > [% IF ( LocalCoverImages ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >index 0363b094844..cec03499d42 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >@@ -46,6 +46,8 @@ > [% CoceHost = Koha.Preference('CoceHost') %] > [% SyndeticsCovers = Koha.Preference('SyndeticsEnabled') && Koha.Preference('SyndeticsCoverImages') %] > [% SyndeticsCoverImageSize = Koha.Preference('SyndeticsCoverImageSize') %] >+[% CustomCoverImages = ( Koha.Preference('CustomCoverImages') && Koha.Preference('CustomCoverImagesURL') ) %] >+[% BakerTaylorEnabled = Koha.Preference('BakerTaylorEnabled') %] > > [% WRAPPER 'sub-header.inc' %] > [% WRAPPER breadcrumbs %] >@@ -569,7 +571,7 @@ > <table> > <thead> > <tr> >- [% IF ( CoverImagePlugins || AmazonCoverImages || LocalCoverImages || IntranetCoce || ( SyndeticsCovers ) || Koha.Preference('BakerTaylorEnabled') || (Koha.Preference('CustomCoverImages') && Koha.Preference('CustomCoverImagesURL')) ) %] >+ [% IF ( CoverImagePlugins || AmazonCoverImages || LocalCoverImages || IntranetCoce || SyndeticsCovers || BakerTaylorEnabled || CustomCoverImages ) %] > <th> </th> > [% END %] > <th colspan="2">Results</th> >@@ -581,7 +583,7 @@ > <tbody> > [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %] > <tr id="row[% SEARCH_RESULT.biblionumber | html %]"> >- [% IF ( CoverImagePlugins || AmazonCoverImages || LocalCoverImages || IntranetCoce || ( SyndeticsCovers ) || Koha.Preference('BakerTaylorEnabled') || (Koha.Preference('CustomCoverImages') && Koha.Preference('CustomCoverImagesURL')) ) %] >+ [% IF ( CoverImagePlugins || AmazonCoverImages || LocalCoverImages || IntranetCoce || SyndeticsCovers || BakerTaylorEnabled || CustomCoverImages ) %] > <td class="bookcoverimg"> > <div > id="cover-slides-[% SEARCH_RESULT.biblionumber | html %]" >@@ -635,7 +637,7 @@ > [% END %] > > [% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) %] >- [% IF ( Koha.Preference('BakerTaylorEnabled') && bt_id ) %] >+ [% IF ( BakerTaylorEnabled && bt_id ) %] > [% SET BakerTaylorImageURL = "https://contentcafe2.btol.com/ContentCafe/Jacket.aspx?UserID=${ Koha.Preference('BakerTaylorUsername') }&Password=${ Koha.Preference('BakerTaylorPassword') }&Options=Y&Return=T&Type=S&Value=$bt_id" %] > <div class="cover-image bakertaylor-coverimg" id="bakertaylor-coverimg"> > [% IF BakerTaylorBookstoreURL %] >@@ -651,7 +653,7 @@ > </div> > [% END %] > >- [% IF Koha.Preference('CustomCoverImages') && Koha.Preference('CustomCoverImagesURL') %] >+ [% IF CustomCoverImages %] > [% SET custom_cover_image_url = SEARCH_RESULT.biblio_object.custom_cover_image_url %] > [% IF custom_cover_image_url %] > <div id="custom-coverimg-[% SEARCH_RESULT.biblionumber | html %]" class="cover-image custom-coverimg"> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >index 76b0e7f4ca7..3dfb24175f4 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc >@@ -161,7 +161,7 @@ > [% Asset.js("js/localcovers.js") | $raw %] > [% END %] > >-[% IF ( BakerTaylorEnabled ) %] >+[% IF ( OPACBakerTaylorEnabled ) %] > [% Asset.js("js/bakertaylorimages.js") | $raw %] > <script> > $(window).load(function () { >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc >index 280e76cfb15..4632e648f52 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc >@@ -32,7 +32,7 @@ > [% img_title = item.biblionumber %] > [% END %] > >- [% IF ( OPACLocalCoverImages || OPACAmazonCoverImages || ( SyndeticsEnabled && SyndeticsCoverImages ) || GoogleJackets || BakerTaylorEnabled || ( Koha.Preference('OpacCoce') && Koha.Preference('CoceProviders') ) || ( Koha.Preference('OPACCustomCoverImages') AND Koha.Preference('CustomCoverImagesURL') ) ) %] >+ [% IF ( OPACLocalCoverImages || OPACAmazonCoverImages || ( SyndeticsEnabled && SyndeticsCoverImages ) || GoogleJackets || Koha.Preference('OPACBakerTaylorEnabled') || ( Koha.Preference('OpacCoce') && Koha.Preference('CoceProviders') ) || ( Koha.Preference('OPACCustomCoverImages') AND Koha.Preference('CustomCoverImagesURL') ) ) %] > <a > class="shelfbrowser_cover" > href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% item.biblionumber | uri %]&shelfbrowse_itemnumber=[% item.itemnumber | uri %]#shelfbrowser" >@@ -73,14 +73,11 @@ > [% coce_id = item.browser_normalized_ean || item.browser_normalized_isbn | html %] > <div title="[% img_title | html %]" class="[% coce_id | html %]" id="coce-thumbnail-preview-[% coce_id | html %]"></div> > [% END %] >- [% IF ( BakerTaylorEnabled ) %] >- [% bt_id = ( item.browser_normalized_upc || item.browser_normalized_isbn ) | html %] >- [% IF ( bt_id ) %] >- <img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /> >- [% ELSE %] >- <span class="no-image">No cover image available</span> >- [% END %] >+ [% bt_id = ( item.browser_normalized_upc || item.browser_normalized_isbn ) %] >+ [% IF ( Koha.Preference('OPACBakerTaylorEnabled') && bt_id ) %] >+ <img alt="Cover image from Baker & Taylor" src="[% BakerTaylorImageURL | url %][% bt_id | uri %]" /> > [% END %] >+ > [% IF Koha.Preference('OPACCustomCoverImages') AND Koha.Preference('CustomCoverImagesURL') %] > [% SET custom_cover_image_url = item.biblio_object.custom_cover_image_url %] > [% IF custom_cover_image_url %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt >index e710ff29889..4db562cd6a0 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt >@@ -81,9 +81,16 @@ > [% END %] > [% END %] > [% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) %] >- [% IF ( BakerTaylorEnabled ) %] >+ [% IF ( Koha.Preference( "OPACBakerTaylorEnabled" ) ) %] >+ [% SET BakerTaylorImageURL = "https://contentcafe2.btol.com/ContentCafe/Jacket.aspx?UserID=${ Koha.Preference('BakerTaylorUsername') }&Password=${ Koha.Preference('BakerTaylorPassword') }&Options=Y&Return=T&Type=S&Value=$bt_id" %] > [% IF bt_id %] >- <![CDATA[ <a href="https://[% BakerTaylorBookstoreURL |url %][% bt_id | uri %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL |url %][% bt_id | uri %]" /></a> ]]> >+ <![CDATA[ >+ [% IF ( Koha.Preference( "BakerTaylorBookstoreURL" ) ) %] >+ <a href="https://[% Koha.Preference( "BakerTaylorBookstoreURL" ) |url %][% bt_id | uri %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL |url %]" /></a> >+ [% ELSE %] >+ <img alt="See Baker & Taylor" src="[% BakerTaylorImageURL |url %]" /> >+ [% END %] >+ ]]> > [% END %] > [% END %] > >@@ -193,7 +200,7 @@ > [% END %] > [% END %] > [% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) %] >- [% IF ( BakerTaylorEnabled ) %] >+ [% IF ( OPACBakerTaylorEnabled ) %] > [% IF bt_id %] > <a href="https://[% BakerTaylorBookstoreURL |url %][% bt_id | uri %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL |url %][% bt_id | uri %]" /></a> > [% END %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt >index a831e0cecac..00adace284d 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt >@@ -157,15 +157,10 @@ > [% END %] > [% END %] > >- [% IF Koha.Preference( "BakerTaylorEnabled" ) || Koha.Preference( "SyndeticsEnabled" ) && Koha.Preference( "SyndeticsCoverImages" ) %] >- [% SET normalized_upc = biblio.normalized_upc %] >- [% END %] >- [% IF Koha.Preference( "BakerTaylorEnabled" ) %] >- [% bt_id = ( normalized_upc || normalized_isbn ) %] >+ [% IF Koha.Preference( "OPACBakerTaylorEnabled" ) %] >+ [% bt_id = ( biblio.normalized_upc || biblio.normalized_isbn ) %] > [% IF ( bt_id ) %] >- <a href="https://[% Koha.Preference( "BakerTaylorBookstoreURL" ) | uri %][% bt_id | uri %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a> >- [% ELSE %] >- <span class="no-image">No cover image available</span> >+ <a href="https://[% BakerTaylorBookstoreURL | uri %][% bt_id | uri %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a> > [% END %] > [% END %] > >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 2cfd946085b..2d284f47799 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt >@@ -20,7 +20,7 @@ > [% SET SyndeticsCoverImages = ( Koha.Preference('SyndeticsEnabled') && Koha.Preference('SyndeticsCoverImages') ) %] > [% SET GoogleJackets = Koha.Preference('GoogleJackets') %] > [% SET OpenLibraryCovers = Koha.Preference('OpenLibraryCovers') %] >-[% SET BakerTaylorEnabled = Koha.Preference('BakerTaylorEnabled') %] >+[% SET BakerTaylorEnabled = Koha.Preference('OPACBakerTaylorEnabled') %] > [% SET OPACCoce = ( Koha.Preference('OPACCoce') && Koha.Preference('CoceProviders') ) %] > [% IF ( CoverImagePlugins || OPACLocalCoverImages || OPACAmazonCoverImages || SyndeticsCoverImages || GoogleJackets || OpenLibraryCovers || BakerTaylorEnabled || OPACCoce || OPACCustomCoverImages ) %] > [% SET CoverImages = 1 %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt >index 22dcb2a5453..45bc11ea02f 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt >@@ -467,23 +467,14 @@ > [% END %] > </a> > <!-- / .p1 --> >- [% IF ( Koha.Preference('BakerTaylorEnabled') && !Koha.Preference('BakerTaylorBookstoreURL') ) %] >- [% bt_id = ( itemsloo.normalized_upc || itemsloo.normalized_isbn ) %] >- [% IF ( bt_id ) %] >- <img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /> >- [% ELSE %] >- <span class="no-image">No cover image available</span> >- [% END %] >- [% END %] >- >- [% IF ( Koha.Preference('BakerTaylorEnabled') && Koha.Preference('BakerTaylorBookstoreURL') ) %] >- [% bt_id = ( itemsloo.normalized_upc || itemsloo.normalized_isbn ) %] >- [% IF ( bt_id ) %] >- <a href="https://[% Koha.Preference('BakerTaylorBookstoreURL') | uri %][% bt_id | uri %]"> >- <img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /> >+ [% bt_id = ( itemsloo.normalized_upc || itemsloo.normalized_isbn ) %] >+ [% IF ( Koha.Preference('OPACBakerTaylorEnabled') && bt_id ) %] >+ [% IF ( BakerTaylorLinkURL ) %] >+ <a href="https://[% BakerTaylorLinkURL | url %][% bt_id | url %]"> >+ <img alt="Cover image from Baker & Taylor" src="[% BakerTaylorImageURL | url %][% bt_id | uri %]" /> > </a> > [% ELSE %] >- <span class="no-image">No cover image available</span> >+ <img alt="Cover image from Baker & Taylor" src="[% BakerTaylorImageURL | url %][% bt_id | uri %]" /> > [% END %] > [% END %] > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt >index 5246b9d3e2c..6c0a3c9da71 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt >@@ -28,7 +28,9 @@ > [% END %][% END %][% END %] > > [% bt_id = ( review.normalized_upc || review.normalized_isbn ) %] >- [% IF ( BakerTaylorEnabled && bt_id ) %]<a href="https://[% BakerTaylorBookstoreURL | uri %][% bt_id | uri %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a>[% END %] >+ [% IF ( Koha.Preference('OPACBakerTaylorEnabled') && bt_id ) %] >+ <a href="https://[% BakerTaylorLinkURL | uri %][% bt_id | uri %]"><img alt="Cover image from Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a> >+ [% END %] > > [% IF Koha.Preference('OPACCustomCoverImages') AND Koha.Preference('CustomCoverImagesURL') %] > [% SET custom_cover_image_url = review.biblio_object.custom_cover_image_url %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt >index 9b8973a84ac..74526a24140 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt >@@ -139,12 +139,15 @@ > [% END %] > [% END %] > </a> >+ > [% bt_id = ( review.normalized_upc || review.normalized_isbn ) %] >- [% IF ( BakerTaylorEnabled ) %] >- [% IF ( bt_id ) %] >- <a href="https://[% review.BakerTaylorBookstoreURL | uri %][% bt_id | uri %]"><img alt="See Baker & Taylor" src="[% review.BakerTaylorImageURL | html %][% bt_id | html %]" /></a> >+ [% IF ( Koha.Preference('OPACBakerTaylorEnabled') && bt_id ) %] >+ [% IF ( BakerTaylorLinkURL ) %] >+ <a href="https://[% BakerTaylorLinkURL | url %][% bt_id | url %]"> >+ <img alt="Cover image from Baker & Taylor" src="[% BakerTaylorImageURL | url %][% bt_id | uri %]" /> >+ </a> > [% ELSE %] >- <span class="no-image">No cover image available</span> >+ <img alt="Cover image from Baker & Taylor" src="[% BakerTaylorImageURL | url %][% bt_id | uri %]" /> > [% END %] > [% END %] > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >index 8a90f4de21b..5b29a1dc126 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt >@@ -387,13 +387,14 @@ > [% END %] > [% END %] > >- [% IF ( BakerTaylorEnabled ) %] >- [% bt_id = ( ISSUE.normalized_upc || ISSUE.normalized_isbn ) %] >- [% IF ( bt_id ) %] >- <a href="https://[% BakerTaylorBookstoreURL | uri %][% bt_id | uri %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a> >+ [% bt_id = ( ISSUE.normalized_upc || ISSUE.normalized_isbn ) %] >+ [% IF ( Koha.Preference('OPACBakerTaylorEnabled') && bt_id ) %] >+ [% IF ( BakerTaylorLinkURL ) %] >+ <a href="https://[% BakerTaylorLinkURL | url %][% bt_id | url %]"> >+ <img alt="Cover image from Baker & Taylor" src="[% BakerTaylorImageURL | url %][% bt_id | uri %]" /> >+ </a> > [% ELSE %] >- <span class="no-image">No cover image available</span >- ><!-- BakerTaylor needs normalized_upc or normalized_isbn! --> >+ <img alt="Cover image from Baker & Taylor" src="[% BakerTaylorImageURL | url %][% bt_id | uri %]" /> > [% END %] > [% END %] > >@@ -766,13 +767,14 @@ > [% END %] > [% END %] > >- [% IF ( BakerTaylorEnabled ) %] >- [% bt_id = ( OVERDUE.normalized_upc || OVERDUE.normalized_isbn ) %] >- [% IF ( bt_id ) %] >- <a href="https://[% BakerTaylorBookstoreURL | uri %][% bt_id | uri %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL | html %][% bt_id | html %]" /></a> >+ [% bt_id = ( OVERDUE.normalized_upc || OVERDUE.normalized_isbn ) %] >+ [% IF ( Koha.Preference('OPACBakerTaylorEnabled') && bt_id ) %] >+ [% IF ( BakerTaylorLinkURL ) %] >+ <a href="https://[% BakerTaylorLinkURL | url %][% bt_id | url %]"> >+ <img alt="Cover image from Baker & Taylor" src="[% BakerTaylorImageURL | url %][% bt_id | uri %]" /> >+ </a> > [% ELSE %] >- <span class="no-image">No cover image available</span >- ><!-- BakerTaylor needs normalized_upc or normalized_isbn! --> >+ <img alt="Cover image from Baker & Taylor" src="[% BakerTaylorImageURL | url %][% bt_id | uri %]" /> > [% END %] > [% END %] > >diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl >index 4fe1622bc12..4d582a12807 100755 >--- a/opac/opac-readingrecord.pl >+++ b/opac/opac-readingrecord.pl >@@ -87,7 +87,7 @@ my $old_checkouts = [ > )->as_list > ]; > >-if ( C4::Context->preference('BakerTaylorEnabled') ) { >+if ( C4::Context->preference('OPACBakerTaylorEnabled') ) { > $template->param( > JacketImages => 1, > BakerTaylorImageURL => &image_url(), >diff --git a/opac/opac-search.pl b/opac/opac-search.pl >index 9f906784c95..d4c6e418d35 100755 >--- a/opac/opac-search.pl >+++ b/opac/opac-search.pl >@@ -173,12 +173,10 @@ $template->param( 'OPACNoResultsFound' => C4::Context->preference('OPACNoResults > > $template->param( OpacStarRatings => C4::Context->preference("OpacStarRatings") ); > >-if ( C4::Context->preference('BakerTaylorEnabled') ) { >+if ( C4::Context->preference('OPACBakerTaylorEnabled') ) { > $template->param( >- BakerTaylorEnabled => 1, >- BakerTaylorImageURL => &image_url(), >- BakerTaylorLinkURL => &link_url(), >- BakerTaylorBookstoreURL => C4::Context->preference('BakerTaylorBookstoreURL'), >+ BakerTaylorImageURL => &image_url(), >+ BakerTaylorLinkURL => &link_url(), > ); > } > >diff --git a/opac/opac-showreviews.pl b/opac/opac-showreviews.pl >index 590c3db576a..59b0bdb35ad 100755 >--- a/opac/opac-showreviews.pl >+++ b/opac/opac-showreviews.pl >@@ -31,6 +31,7 @@ use C4::Koha qw( > use C4::Output qw( output_html_with_http_headers ); > use Koha::DateUtils qw( dt_from_string ); > use Koha::Biblios; >+use C4::External::BakerTaylor qw( image_url link_url ); > use Koha::Patrons; > use Koha::Reviews; > use POSIX qw( ceil floor ); >@@ -199,6 +200,13 @@ $template->param( > ) unless $pages < 2; > $template->param( next_page_offset => $next_page_offset ) unless $pages eq $current_page_number; > >+if ( C4::Context->preference("OPACBakerTaylorEnabled") ) { >+ $template->param( >+ BakerTaylorImageURL => &image_url(), >+ BakerTaylorLinkURL => &link_url(), >+ ); >+} >+ > $template->param( > reviews => $reviews, > results_per_page => $results_per_page, >diff --git a/opac/opac-user.pl b/opac/opac-user.pl >index b841afd8272..ccf5155f425 100755 >--- a/opac/opac-user.pl >+++ b/opac/opac-user.pl >@@ -298,7 +298,7 @@ if ( $pending_checkouts->count ) { # Useless test > my $isbn = GetNormalizedISBN( $issue->{'isbn'} ); > $issue->{normalized_isbn} = $isbn; > >- if ( C4::Context->preference('BakerTaylorEnabled') >+ if ( C4::Context->preference('OPACBakerTaylorEnabled') > || C4::Context->preference('SyndeticsEnabled') > || C4::Context->preference('SyndeticsCoverImages') ) > { >@@ -356,18 +356,16 @@ if ( C4::Context->preference('UseRecalls') ) { > $template->param( RECALLS => $recalls ); > } > >-if ( C4::Context->preference('BakerTaylorEnabled') ) { >+if ( C4::Context->preference('OPACBakerTaylorEnabled') ) { > $template->param( >- BakerTaylorEnabled => 1, >- BakerTaylorImageURL => &image_url(), >- BakerTaylorLinkURL => &link_url(), >- BakerTaylorBookstoreURL => C4::Context->preference('BakerTaylorBookstoreURL'), >+ BakerTaylorImageURL => &image_url(), >+ BakerTaylorLinkURL => &link_url(), > ); > } > > if ( C4::Context->preference("OPACAmazonCoverImages") > or C4::Context->preference("GoogleJackets") >- or C4::Context->preference("BakerTaylorEnabled") >+ or C4::Context->preference("OPACBakerTaylorEnabled") > or C4::Context->preference("SyndeticsCoverImages") > or ( C4::Context->preference('OPACCustomCoverImages') and C4::Context->preference('CustomCoverImagesURL') ) ) > { >-- >2.39.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 28307
:
123198
|
125708
|
125743
|
125744
|
127222
|
127223
|
127224
|
127225
|
131784
|
131785
|
131786
|
133274
|
133275
|
133276
|
138137
|
138138
|
138139
|
142193
|
142194
|
142195
|
169061
|
169062
|
169063
|
175257
|
175258
|
175259
|
175265
|
178730
|
178731
|
178732
|
180719
|
180720
| 180721