From da08f65e11fbd33ad6a572a1234d031efd2a3647 Mon Sep 17 00:00:00 2001 From: Liz Rea Date: Mon, 7 Apr 2014 10:23:05 +1200 Subject: [PATCH] Bug 11684: avoid mixed content warnings using SSL with Amazon - opac-readingrecord and opac-user To test: 0) It goes without saying that images being looked at should continue to be the proper size and look ok. 1) In the staff client, change the OPAC system preference opacthemes to 'bootstrap'. 2) Enable Amazon images in the system preferences 3) Issue a book you know will have images for a known user 4) Issue a book you know will have images for intentionally overdue for the same user 5) git reset --hard origin/master 6) In OPAC, log in as the user. -- On the 'your summary' tab on the left (which is default), a) In the 'Checked out' tab, there should be at least two books. The two books issued should have http images. b) In the 'Overdue' tag, there should be at least one book. The image for the overdue book issued should have http images. 7) Click the 'your reading history' tab on the left. -- The images for the two books issued should have http images. 8) Apply the patch 9) Repeat steps 6-7, but all the images in question should have https images now. 10) In the staff client, change the OPAC system preference opacthemes to 'prog'. 11) Repeat steps 5-9 12) Run the koha QA test tool Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Passes all tests and QA script. Checked reading history, overdoes, and checkouts in bootstrap and prog OPAC. Amazon image URL is now https://. Signed-off-by: Galen Charlton --- .../opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 4 ++-- koha-tmpl/opac-tmpl/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 983dcc8f82..49b6cda6bb 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 e639c17a12..8b732293fc 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -151,7 +151,7 @@ [% IF ( OPACAmazonCoverImages ) %] [% IF ( ISSUE.normalized_isbn ) %] - + item-thumbnail [% ELSE %] No cover image available [% END %] @@ -389,7 +389,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 3a849c9c2c..a448d0bdf1 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt @@ -71,7 +71,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 445d4c7dd7..0483f29523 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt @@ -193,7 +193,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 %] @@ -348,7 +348,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 %] -- 2.20.1