From fa4d0afc869465974a1e0ae4369dcec4f825f221 Mon Sep 17 00:00:00 2001 From: Liz Rea Date: Mon, 7 Apr 2014 10:23:05 +1200 Subject: [PATCH] bug 11684 - mixed content warnings using SSL with amazon - opac-readingrecord and opac-user To test: In both prog and bootstrap: * Enable Amazon images in the system preferences * Issue a book you know will have images for, verify that without SSL 1. the images show on the borrower's logged in home page (opac-user, both checkouts and overdue tab) and on the opac-readingrecord 2. the image source is from an Amazon url that uses http:// 3. the images are the right size, and look ok * Do the same using https, verify that with SSL 1. the images show on the borrower's logged in home page (opac-user, both checkouts and overdue tab) and on the opac-readingrecord 2. the image source is from an Amazon url that uses https:// 3. the images are the right size, and look ok --- .../bootstrap/en/modules/opac-readingrecord.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 4 ++-- .../prog/en/modules/opac-readingrecord.tt | 2 +- koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) 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 584e0e3..a3f8c50 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt @@ -72,7 +72,7 @@ [% IF OPACAmazonCoverImages %] [% IF issue.normalized_isbn %] - + [% ELSE %] No cover image available [% 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 b4a337f..99b8de5 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -130,7 +130,7 @@ [% IF ( OPACAmazonCoverImages ) %] [% IF ( ISSUE.normalized_isbn ) %] - + item-thumbnail [% ELSE %] No cover image available [% END %] @@ -370,7 +370,7 @@ [% IF ( OPACAmazonCoverImages ) %] [% IF ( OVERDUE.normalized_isbn ) %] - + [% ELSE %] No cover image available [% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt index 7ee7e12..b60e36f 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt @@ -70,7 +70,7 @@ You have never borrowed anything from this library. [% IF OPACAmazonCoverImages %] [% IF issue.normalized_isbn %] - Cover Image + Cover Image [% ELSE %] No cover image available [% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt index 6b8172e..50272fc 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt @@ -164,7 +164,7 @@ var MSG_CONFIRM_RESUME_HOLDS = _("Are you sure you want to resume all suspended [% IF ( JacketImages ) %] -[% IF ( OPACAmazonCoverImages ) %][% IF ( ISSUE.normalized_isbn ) %]Cover Image[% ELSE %]No cover image available[% END %][% END %] +[% IF ( OPACAmazonCoverImages ) %][% IF ( ISSUE.normalized_isbn ) %]Cover Image[% ELSE %]No cover image available[% END %][% END %] [% IF ( GoogleJackets ) %][% IF ( ISSUE.normalized_isbn ) %]
[% ELSE %]No cover image available[% END %][% END %] @@ -308,7 +308,7 @@ var MSG_CONFIRM_RESUME_HOLDS = _("Are you sure you want to resume all suspended [% IF ( JacketImages ) %] -[% IF ( OPACAmazonCoverImages ) %][% IF ( OVERDUE.normalized_isbn ) %][% ELSE %]No cover image available[% END %][% END %] +[% IF ( OPACAmazonCoverImages ) %][% IF ( OVERDUE.normalized_isbn ) %][% ELSE %]No cover image available[% END %][% END %] [% IF ( GoogleJackets ) %][% IF ( OVERDUE.normalized_isbn ) %]
[% ELSE %]No cover image available[% END %][% END %] -- 1.7.9.5