Bugzilla – Attachment 26852 Details for
Bug 11684
More mixed content warnings using SSL with amazon - opac-readingrecord and opac-user
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED OFF] bug 11684 - mixed content warnings using SSL with amazon - opac-readingrecord and opac-user
bug-11684---mixed-content-warnings-using-SSL-with-.patch (text/plain), 9.75 KB, created by
Mark Tompsett
on 2014-04-07 03:28:04 UTC
(
hide
)
Description:
[SIGNED OFF] bug 11684 - mixed content warnings using SSL with amazon - opac-readingrecord and opac-user
Filename:
MIME Type:
Creator:
Mark Tompsett
Created:
2014-04-07 03:28:04 UTC
Size:
9.75 KB
patch
obsolete
>From f5babcf97653dab012d08ba28ec3901f5c70d83d Mon Sep 17 00:00:00 2001 >From: Liz Rea <liz@catalyst.net.nz> >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: > > 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 <mtompset@hotmail.com> >--- > .../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 @@ > <td> > [% IF OPACAmazonCoverImages %] > [% IF issue.normalized_isbn %] >- <a href="http://www.amazon.com/gp/reader/[% issue.normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/[% issue.normalized_isbn %].01.THUMBZZZ.jpg" alt="" class="item-thumbnail" /></a> >+ <a href="http://www.amazon.com/gp/reader/[% issue.normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="https://images-na.ssl-images-amazon.com/images/P/[% issue.normalized_isbn %].01.THUMBZZZ.jpg" alt="" class="item-thumbnail" /></a> > [% ELSE %] > <span class="no-image">No cover image available</span> > [% 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 ) %] >- <a href="http://www.amazon.com/gp/reader/[% ISSUE.normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link" title="View at Amazon.com"><img src="http://images.amazon.com/images/P/[% ISSUE.normalized_isbn %].01.THUMBZZZ.jpg" alt="" class="item-thumbnail" /></a> >+ <a href="http://www.amazon.com/gp/reader/[% ISSUE.normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link" title="View at Amazon.com"><img src="https://images-na.ssl-images-amazon.com/images/P/[% ISSUE.normalized_isbn %].01.THUMBZZZ.jpg" alt="item-thumbnail" class="item-thumbnail"/></a> > [% ELSE %] > <a href="#"><span class="no-image">No cover image available</span></a> > [% END %] >@@ -370,7 +370,7 @@ > <td class="jacketcell"> > [% IF ( OPACAmazonCoverImages ) %] > [% IF ( OVERDUE.normalized_isbn ) %] >- <a href="http://www.amazon.com/gp/reader/[% OVERDUE.normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link" title="View at Amazon.com"><img src="http://images.amazon.com/images/P/[% OVERDUE.normalized_isbn %].01.THUMBZZZ.jpg" alt="" class="item-thumbnail" /></a> >+ <a href="http://www.amazon.com/gp/reader/[% OVERDUE.normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link" title="View at Amazon.com"><img src="https://images-na.ssl-images-amazon.com/images/P/[% OVERDUE.normalized_isbn %].01.THUMBZZZ.jpg" alt="" class="item-thumbnail" /></a> > [% ELSE %] > <a href="#"><span class="no-image">No cover image available</span></a> > [% 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. > <td> > [% IF OPACAmazonCoverImages %] > [% IF issue.normalized_isbn %] >- <a href="http://www.amazon.com/gp/reader/[% issue.normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/[% issue.normalized_isbn %].01.THUMBZZZ.jpg" alt="Cover Image" /></a> >+ <a href="http://www.amazon.com/gp/reader/[% issue.normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="https://images-na.ssl-images-amazon.com/images/P/[% issue.normalized_isbn %].01.THUMBZZZ.jpg" alt="Cover Image" /></a> > [% ELSE %] > <span class="no-image">No cover image available</span> > [% 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 ) %]<td class="jacketcell"> > >-[% IF ( OPACAmazonCoverImages ) %][% IF ( ISSUE.normalized_isbn ) %]<a href="http://www.amazon.com/gp/reader/[% ISSUE.normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link" title="View at Amazon.com"><img border="0" src="http://images.amazon.com/images/P/[% ISSUE.normalized_isbn %].01.THUMBZZZ.jpg" alt="Cover Image" /></a>[% ELSE %]<a href="#"><span class="no-image">No cover image available</span></a>[% END %][% END %] >+[% IF ( OPACAmazonCoverImages ) %][% IF ( ISSUE.normalized_isbn ) %]<a href="http://www.amazon.com/gp/reader/[% ISSUE.normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link" title="View at Amazon.com"><img border="0" src="https://images-na.ssl-images-amazon.com/images/P/[% ISSUE.normalized_isbn %].01.THUMBZZZ.jpg" alt="Cover Image" /></a>[% ELSE %]<a href="#"><span class="no-image">No cover image available</span></a>[% END %][% END %] > > [% IF ( GoogleJackets ) %][% IF ( ISSUE.normalized_isbn ) %]<div style="display:block;" title="Click to view in Google Books" class="[% ISSUE.normalized_isbn %]" id="gbs-thumbnail[% loop.count %]"></div>[% ELSE %]<a href="http://books.google.com/books?q=[% ISSUE.title |url %]"><span class="no-image">No cover image available</span></a>[% END %][% END %] > >@@ -308,7 +308,7 @@ var MSG_CONFIRM_RESUME_HOLDS = _("Are you sure you want to resume all suspended > <tr> > [% IF ( JacketImages ) %]<td class="jacketcell"> > >-[% IF ( OPACAmazonCoverImages ) %][% IF ( OVERDUE.normalized_isbn ) %]<a href="http://www.amazon.com/gp/reader/[% OVERDUE.normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link" title="View at Amazon.com"><img src="http://images.amazon.com/images/P/[% OVERDUE.normalized_isbn %].01.THUMBZZZ.jpg" alt="" class="thumbnail" /></a>[% ELSE %]<a href="#"><span class="no-image">No cover image available</span></a>[% END %][% END %] >+[% IF ( OPACAmazonCoverImages ) %][% IF ( OVERDUE.normalized_isbn ) %]<a href="http://www.amazon.com/gp/reader/[% OVERDUE.normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link" title="View at Amazon.com"><img src="https://images-na.ssl-images-amazon.com/images/P/[% ISSUE.normalized_isbn %].01.THUMBZZZ.jpg" alt="" class="thumbnail" /></a>[% ELSE %]<a href="#"><span class="no-image">No cover image available</span></a>[% END %][% END %] > > [% IF ( GoogleJackets ) %][% IF ( OVERDUE.normalized_isbn ) %]<div style="display:block;" title="Click to view in Google Books" class="[% OVERDUE.normalized_isbn %]" id="gbs-thumbnail[% loop.count %]"></div>[% ELSE %]<a href="http://books.google.com/books?q=[% OVERDUE.title |url %]"><span class="no-image">No cover image available</span></a>[% END %][% END %] > >-- >1.7.9.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 11684
:
25043
|
26848
|
26852
|
26888