From 3fae980e1aae10a6082cad2d4daf9bcb24b612be Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi <tomascohen@theke.io> Date: Thu, 29 Mar 2018 16:12:28 -0300 Subject: [PATCH] Bug 20497: Access LibraryThing assets using HTTPS --- .../admin/preferences/enhanced_content.pref | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 24 ++++++---------------- .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 6 +----- 3 files changed, 8 insertions(+), 24 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref index f62882d966..ad273843ba 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref @@ -150,7 +150,7 @@ Enhanced Content: yes: Show no: "Don't show" - "reviews, similar items, and tags from Library Thing for Libraries on item detail pages on the OPAC. If you've enabled this, you need to " - - <a href="http://www.librarything.com/forlibraries/">sign up</a>, then enter in your ID below. + - <a href="https://www.librarything.com/forlibraries/">sign up</a>, then enter in your ID below. - - Access Library Thing for Libraries using the customer ID - pref: LibraryThingForLibrariesID 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 c688a3f1e5..f4b823c2c7 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt @@ -577,15 +577,10 @@ <li id="tab_reviews"> <a href="#reviews">Reviews</a></li> [% IF ( LibraryThingForLibrariesID ) %] <li id="tab_LTFLreviews"> - [% IF ( using_https ) %] - <script src="https://www.librarything.com/forlibraries/widget.js?id=[% LibraryThingForLibrariesID %]" type="text/javascript"></script> - <noscript>This page contains enriched content visible when JavaScript is enabled or by clicking <a href="https://www.librarything.com/forlibraries/noscript.php?id=[% LibraryThingForLibrariesID %]&accessibility=1">here</a>.</noscript> - [% ELSE %] - <script src="http://www.librarything.com/forlibraries/widget.js?id=[% LibraryThingForLibrariesID %]" type="text/javascript"></script> - <noscript>This page contains enriched content visible when JavaScript is enabled or by clicking <a href="http://www.librarything.com/forlibraries/noscript.php?id=[% LibraryThingForLibrariesID %]&accessibility=1">here</a>.</noscript> - [% END %] + <script src="https://www.librarything.com/forlibraries/widget.js?id=[% LibraryThingForLibrariesID %]" type="text/javascript"></script> + <noscript>This page contains enriched content visible when JavaScript is enabled or by clicking <a href="https://www.librarything.com/forlibraries/noscript.php?id=[% LibraryThingForLibrariesID %]&accessibility=1">here</a>.</noscript> + </li> [% END %] - </li> [% END %] [% IF ( SyndeticsAuthorNotes && SYNDETICS_ANOTES ) %] <li id="tab_anotes"> <a href="#anotes">About the author</a></li> @@ -1166,16 +1161,9 @@ </div> <!-- / .row-fluid --> <div class="row-fluid"> [% IF ( LibraryThingForLibrariesID ) %] - [% IF ( using_https ) %] - <script src="https://ltfl.librarything.com/forlibraries/widget.js?systype=koha&id=[% LibraryThingForLibrariesID %]" type="text/javascript"></script> - <noscript>This page contains enriched content visible when JavaScript is enabled or by clicking - <a href="https://www.librarything.com/forlibraries/noscript.php?id=[% LibraryThingForLibrariesID %]&accessibility=1">here</a>.</noscript> - [% ELSE %] - <script src="http://ltfl.librarything.com/forlibraries/widget.js?systype=koha&id=[% LibraryThingForLibrariesID %]" type="text/javascript"></script> - <noscript>This page contains enriched content visible when JavaScript is enabled or by clicking - <a href="http://www.librarything.com/forlibraries/noscript.php?id= - [% LibraryThingForLibrariesID %]&accessibility=1">here</a>.</noscript> - [% END %] + <script src="https://ltfl.librarything.com/forlibraries/widget.js?systype=koha&id=[% LibraryThingForLibrariesID %]" type="text/javascript"></script> + <noscript>This page contains enriched content visible when JavaScript is enabled or by clicking + <a href="https://www.librarything.com/forlibraries/noscript.php?id=[% LibraryThingForLibrariesID %]&accessibility=1">here</a>.</noscript> [% END %] [% IF ( NovelistSelectProfile && normalized_isbn ) %] 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 36211c9809..3803627763 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt @@ -588,11 +588,7 @@ [% INCLUDE 'opac-bottom.inc' %] [% BLOCK jsinclude %] [% IF ( LibraryThingForLibrariesID ) %] - [% IF ( using_https ) %] - <script src="https://ltfl.librarything.com/forlibraries/widget.js?id=[% LibraryThingForLibrariesID %]&systype=koha" type="text/javascript"></script> - [% ELSE %] - <script src="http://ltfl.librarything.com/forlibraries/widget.js?id=[% LibraryThingForLibrariesID %]&systype=koha" type="text/javascript"></script> - [% END %] + <script src="https://ltfl.librarything.com/forlibraries/widget.js?id=[% LibraryThingForLibrariesID %]&systype=koha" type="text/javascript"></script> [% END %] [% IF ( OpacStarRatings == 'all' || Koha.Preference('Babeltheque') ) %]<script type="text/javascript" src="[% interface %]/[% theme %]/lib/jquery/plugins/jquery.rating_[% KOHA_VERSION %].js"></script>[% END %] [% IF ( OverDriveEnabled ) %]<script type="text/javascript" src="[% interface %]/[% theme %]/js/overdrive_[% KOHA_VERSION %].js"></script>[% END %] -- 2.16.3