From d6dc1edb9a4348d657eb48830ba1133cd5929690 Mon Sep 17 00:00:00 2001 From: Owen Date: Tue, 2 Nov 2021 13:48:43 +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 | 1 + .../prog/en/modules/catalogue/results.tt | 10 ++++---- .../bootstrap/en/includes/opac-bottom.inc | 2 +- .../bootstrap/en/includes/shelfbrowser.inc | 14 +++++------ .../bootstrap/en/modules/opac-opensearch.tt | 12 +++++++--- .../en/modules/opac-readingrecord.tt | 13 ++++------ .../bootstrap/en/modules/opac-results.tt | 22 ++++++----------- .../bootstrap/en/modules/opac-shelves.tt | 20 +++++----------- .../en/modules/opac-showreviews-rss.tt | 4 +++- .../bootstrap/en/modules/opac-showreviews.tt | 11 +++++---- .../bootstrap/en/modules/opac-user.tt | 24 +++++++++++-------- opac/opac-readingrecord.pl | 6 ++--- opac/opac-search.pl | 4 +--- opac/opac-shelves.pl | 2 +- opac/opac-showreviews.pl | 8 +++++++ opac/opac-user.pl | 6 ++--- 17 files changed, 79 insertions(+), 81 deletions(-) diff --git a/C4/UsageStats.pm b/C4/UsageStats.pm index fe3b092da2..8a55445355 100644 --- a/C4/UsageStats.pm +++ b/C4/UsageStats.pm @@ -248,6 +248,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 94acbe3e1c..b2e336b047 100644 --- a/installer/data/mysql/mandatory/sysprefs.sql +++ b/installer/data/mysql/mandatory/sysprefs.sql @@ -464,6 +464,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'), 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 b597b6644a..e82e179d97 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 %] @@ -465,7 +467,7 @@ - [% IF ( CoverImagePlugins || AmazonCoverImages || LocalCoverImages || IntranetCoce || ( SyndeticsCovers ) || Koha.Preference('BakerTaylorEnabled') || (Koha.Preference('CustomCoverImages') && Koha.Preference('CustomCoverImagesURL')) ) %] + [% IF ( CoverImagePlugins || AmazonCoverImages || LocalCoverImages || IntranetCoce || SyndeticsCovers || BakerTaylorEnabled || CustomCoverImages ) %] [% END %] @@ -477,7 +479,7 @@ [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %] - [% IF ( CoverImagePlugins || AmazonCoverImages || LocalCoverImages || IntranetCoce || ( SyndeticsCovers ) || Koha.Preference('BakerTaylorEnabled') || (Koha.Preference('CustomCoverImages') && Koha.Preference('CustomCoverImagesURL')) ) %] + [% IF ( CoverImagePlugins || AmazonCoverImages || LocalCoverImages || IntranetCoce || SyndeticsCovers || BakerTaylorEnabled || CustomCoverImages ) %]
 Results
[% IF ( LocalCoverImages && SEARCH_RESULT.has_local_cover_image ) %] @@ -522,7 +524,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" %]
[% IF BakerTaylorBookstoreURL %] @@ -538,7 +540,7 @@
[% 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 %]
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 937cad9a61..bda2cfe7b6 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc @@ -214,7 +214,7 @@ [% Asset.js("js/localcovers.js") | $raw %] [% END %] -[% IF ( BakerTaylorEnabled ) %] +[% IF ( OPACBakerTaylorEnabled ) %] [% Asset.js("js/bakertaylorimages.js") | $raw %]