From ba7ac6d3ecc416e2ccf688f11fc2da60eef23916 Mon Sep 17 00:00:00 2001 From: Paul Poulain Date: Wed, 11 Jul 2012 12:33:36 +0200 Subject: [PATCH] Revert "Bug 4460 - Amazon's AssociateID tag not used in links so referred revenue lost" This reverts commit 68ba16afe8989291df8afe54dd72fdf0f0a99fbf. --- C4/Auth.pm | 2 -- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 4 ++-- koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 2 +- koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt | 3 ++- koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt | 4 ++-- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index 70669e4d5c..b6dc2f5ad2 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -335,7 +335,6 @@ sub get_template_and_user { if ( $in->{'type'} eq "intranet" ) { $template->param( AmazonContent => C4::Context->preference("AmazonContent"), - AmazonAssocTag => C4::Context->preference("AmazonAssocTag"), AmazonCoverImages => C4::Context->preference("AmazonCoverImages"), AmazonEnabled => C4::Context->preference("AmazonEnabled"), AmazonSimilarItems => C4::Context->preference("AmazonSimilarItems"), @@ -400,7 +399,6 @@ sub get_template_and_user { } $template->param( AmazonContent => "" . C4::Context->preference("AmazonContent"), - AmazonAssocTag => C4::Context->preference("AmazonAssocTag"), AnonSuggestions => "" . C4::Context->preference("AnonSuggestions"), AuthorisedValueImages => C4::Context->preference("AuthorisedValueImages"), BranchesLoop => GetBranchesLoop($opac_name), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 0123d89a42..4f005247fe 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -118,7 +118,7 @@ function verify_images() { [% IF ( holdcount ) %]Holds: [% holdcount %][% ELSE %][% END %] [% IF ( AmazonEnabled ) %][% IF ( AmazonCoverImages ) %]
-
[% END %][% END %] + [% END %][% END %] [% ELSE %]

[% title |html %]

@@ -522,7 +522,7 @@ function verify_images() { [% IF ( FRBRizeEditions ) %][% IF ( XISBNS ) %]

Editions

-[% FOREACH XISBN IN XISBNS %][% IF ( XISBN.AmazonEnabled ) %][% END %][% IF ( XISBN.AmazonEnabled ) %][% END %] [% UNLESS ( item_level_itypes ) %][% END %] [% ELSE %][% END %] [% IF ( JacketImages ) %]
[% IF noItemTypeImages %][% description %][% ELSE %][% description %][% END %] +[% FOREACH XISBN IN XISBNS %]
[% IF ( noItemTypeImages ) %][% XISBN.description %][% ELSE %][% XISBN.description %][% END %][% XISBN.title |html %] by [% XISBN.author %] ©[% XISBN.copyrightdate %] [% IF ( XISBN.publishercode ) %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt index 10113976ec..5e2b55edc7 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt @@ -296,7 +296,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
[% IF ( OPACLocalCoverImages ) %]
[% END %] - [% IF ( OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( OPACURLOpenInNewWindow ) %]Cover Image[% ELSE %]Cover Image[% END %][% END %][% END %] + [% IF ( OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( OPACurlOpenInNewWindow ) %]Cover image[% ELSE %]Cover image[% END %][% END %][% END %] [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( content_identifier_exists ) %][% IF ( using_https ) %] 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 528d611166..878692515e 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt @@ -65,7 +65,8 @@ You have never borrowed anything from this library. [% UNLESS ( loop.odd ) %]
-[% IF ( OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( READING>RECOR.normalized_isbn ) %]Cover Image[% ELSE %]No cover image available[% END %][% END %][% END %] +[% IF ( OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( READING_RECOR.normalized_isbn ) %]Cover Image[% ELSE %]No cover image available[% END %][% END %][% END %] + [% IF ( GoogleJackets ) %][% IF ( READING_RECOR.normalized_isbn ) %]
[% ELSE %]No cover image available[% END %][% END %] [% IF ( BakerTaylorEnabled ) %][% IF ( READING_RECOR.normalized_isbn ) %]See Baker & Taylor[% ELSE %]No cover image available[% END %][% 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 8791e28755..33e3b4849b 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt @@ -158,7 +158,7 @@ $.tablesorter.addParser({ [% IF ( JacketImages ) %]		 -[% IF ( OPACAmazonCoverImages ) %][% IF ( ISSUE.normalized_isbn ) %]Cover Image[% END %]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 %] @@ -302,7 +302,7 @@ $.tablesorter.addParser({
-[% IF ( OPACAmazonCoverImages ) %][% IF ( ISSUE.normalized_isbn ) %]Cover Image[% END %]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