From 2fd51eb84447dd068d0f290648cfb74a866a933e Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Tue, 5 Apr 2011 16:50:36 +1200 Subject: [PATCH] Bug 5917 using_https should be a global --- installer/html-template-to-template-toolkit.pl | 6 +++++- koha-tt/opac-tmpl/prog/en/modules/opac-detail.tt | 8 ++++---- koha-tt/opac-tmpl/prog/en/modules/opac-opensearch.tt | 2 +- koha-tt/opac-tmpl/prog/en/modules/opac-readingrecord.tt | 2 +- koha-tt/opac-tmpl/prog/en/modules/opac-shelves.tt | 2 +- koha-tt/opac-tmpl/prog/en/modules/opac-showreviews-rss.tt | 2 +- koha-tt/opac-tmpl/prog/en/modules/opac-showreviews.tt | 2 +- koha-tt/opac-tmpl/prog/en/modules/opac-user.tt | 4 ++-- 8 files changed, 16 insertions(+), 12 deletions(-) diff --git a/installer/html-template-to-template-toolkit.pl b/installer/html-template-to-template-toolkit.pl index 4a4a77ad2c..e99b19530e 100755 --- a/installer/html-template-to-template-toolkit.pl +++ b/installer/html-template-to-template-toolkit.pl @@ -29,7 +29,11 @@ my $tmpl_out_dir = 'koha-tt'; # template toolkit variables NOT to scope, in other words, variables that need to remain global (case sensitive) my @globals = ("themelang","JacketImages","OPACAmazonCoverImages","GoogleJackets","BakerTaylorEnabled", -"SyndeticsEnabled", "OpacRenewalAllowed", "item_level_itypes","noItemTypeImages"); +"SyndeticsEnabled", "OpacRenewalAllowed", "item_level_itypes","noItemTypeImages", +"virtualshelves", "RequestOnOpac", "COinSinOPACResults", "OPACXSLTResultsDisplay", +"OPACItemsResultsDisplay", "LibraryThingForLibrariesID", "opacuserlogin", "TagsEnabled", +"TagsShowOnList", "TagsInputOnList","loggedinusername","AllowOnShelfHolds","opacbookbag", +"OPACAmazonEnabled", "SyndeticsCoverImages","using_https"); # Arguments: my $KOHA_ROOT; diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-detail.tt index b9ee90385d..92a8dd365a 100644 --- a/koha-tt/opac-tmpl/prog/en/modules/opac-detail.tt +++ b/koha-tt/opac-tmpl/prog/en/modules/opac-detail.tt @@ -438,7 +438,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () { [% IF ( OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( PREVIOUS_SHELF_BROWS.browser_normalized_isbn ) %][% ELSE %]No cover image available[% END %][% END %][% END %] [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( PREVIOUS_SHELF_BROWS.content_identifier_exists ) %] - [% IF ( PREVIOUS_SHELF_BROWS.using_https ) %] + [% IF ( using_https ) %] [% ELSE %][% END %] [% ELSE %]No cover image available[% END %][% END %][% END %] @@ -456,7 +456,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () { [% ELSE %]No cover image available[% END %][% END %][% END %] [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( NEXT_SHELF_BROWS.content_identifier_exists ) %] - [% IF ( NEXT_SHELF_BROWS.using_https ) %] + [% IF ( using_https ) %] [% ELSE %][% END %] [% ELSE %]No cover image available[% END %][% END %][% END %] @@ -723,7 +723,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () { [% IF ( OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% END %][% END %] [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( XISBN.content_identifier_exists ) %] -[% IF ( XISBN.using_https ) %] +[% IF ( using_https ) %] [% ELSE %][% END %] [% ELSE %]No cover image available[% END %][% END %][% END %] @@ -748,7 +748,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () { [% FOREACH similar_biblionumber IN AMAZON_SIMILAR_PRODUCT.similar_biblionumbers %] [% IF ( OPACAmazonCoverImages ) %][% END %] [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( similar_biblionumber.content_identifier_exists ) %] - [% IF ( similar_biblionumber.using_https ) %] + [% IF ( using_https ) %] [% ELSE %][% END %] [% ELSE %]No cover image available[% END %][% END %][% END %] diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-opensearch.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-opensearch.tt index 5a18a55276..e7e28219cf 100644 --- a/koha-tt/opac-tmpl/prog/en/modules/opac-opensearch.tt +++ b/koha-tt/opac-tmpl/prog/en/modules/opac-opensearch.tt @@ -37,7 +37,7 @@ [% END %][% END %][% END %] -[% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( SEARCH_RESULT.content_identifier_exists ) %][% IF ( SEARCH_RESULT.using_https ) %] +[% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( SEARCH_RESULT.content_identifier_exists ) %][% IF ( using_https ) %] [% ELSE %] [% END %][% END %][% END %][% END %] diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-readingrecord.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-readingrecord.tt index 2fef7c800b..21dace91af 100644 --- a/koha-tt/opac-tmpl/prog/en/modules/opac-readingrecord.tt +++ b/koha-tt/opac-tmpl/prog/en/modules/opac-readingrecord.tt @@ -69,7 +69,7 @@ You have never borrowed anything from this library. [% IF ( BakerTaylorEnabled ) %][% IF ( READING_RECOR.normalized_isbn ) %]See Baker & Taylor[% ELSE %]No cover image available[% END %][% END %] - [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( READING_RECOR.using_https ) %] + [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( using_https ) %] [% ELSE %] [% END %][% END %][% END %] diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-shelves.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-shelves.tt index d08e71348b..7c6bae29b6 100644 --- a/koha-tt/opac-tmpl/prog/en/modules/opac-shelves.tt +++ b/koha-tt/opac-tmpl/prog/en/modules/opac-shelves.tt @@ -336,7 +336,7 @@ $(function() { [% IF ( OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( itemsloo.normalized_isbn ) %][% ELSE %]No cover image available[% END %][% END %][% END %] - [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( itemsloo.using_https ) %] + [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( using_https ) %] [% ELSE %] [% END %][% END %][% END %] diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-showreviews-rss.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-showreviews-rss.tt index f8a985df45..6d53953e01 100644 --- a/koha-tt/opac-tmpl/prog/en/modules/opac-showreviews-rss.tt +++ b/koha-tt/opac-tmpl/prog/en/modules/opac-showreviews-rss.tt @@ -13,7 +13,7 @@ [% END %][% END %][% END %] -[% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( review.content_identifier_exists ) %][% IF ( review.using_https ) %] +[% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( review.content_identifier_exists ) %][% IF ( using_https ) %] [% ELSE %] [% END %][% END %][% END %][% END %] diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-showreviews.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-showreviews.tt index e10c436d53..b16b219358 100644 --- a/koha-tt/opac-tmpl/prog/en/modules/opac-showreviews.tt +++ b/koha-tt/opac-tmpl/prog/en/modules/opac-showreviews.tt @@ -62,7 +62,7 @@ $(document).ready(function(){ [% IF ( OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( review.normalized_isbn ) %][% ELSE %]No cover image available[% END %][% END %][% END %] - [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( review.using_https ) %] + [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( using_https ) %] [% ELSE %] [% END %][% END %][% END %] diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-user.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-user.tt index ccaecebcb4..b62743347e 100644 --- a/koha-tt/opac-tmpl/prog/en/modules/opac-user.tt +++ b/koha-tt/opac-tmpl/prog/en/modules/opac-user.tt @@ -231,7 +231,7 @@ $.tablesorter.addParser({ [% IF ( BakerTaylorEnabled ) %][% IF ( ISSUE.normalized_isbn ) %]See Baker & Taylor[% ELSE %]No cover image available[% END %][% END %] -[% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( ISSUE.using_https ) %] +[% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( using_https ) %] [% ELSE %] [% END %][% END %][% END %] @@ -315,7 +315,7 @@ $.tablesorter.addParser({ [% IF ( BakerTaylorEnabled ) %][% IF ( OVERDUE.normalized_isbn ) %]See Baker & Taylor[% ELSE %]No cover image available[% END %][% END %] [% IF ( SyndeticsCoverImages ) %] -[% IF ( OVERDUE.using_https ) %] +[% IF ( using_https ) %] [% ELSE %] -- 2.39.5