From b30a5d31b5c48934b5a86731232a69c0ff59b991 Mon Sep 17 00:00:00 2001 From: Ian Walls Date: Wed, 5 Oct 2011 14:20:43 -0400 Subject: [PATCH 2/2] Bug 6975: OPACBaseurl instead of OPACBaseURL Updates OPAC templates to refer to OPACBaseURL (the properly capitalized name) instead of OPACBaseurl Also fixes some T:T scope errors when OPACBaseURL was called within a loop --- .../prog/en/modules/basket/sendbasket.tt | 2 +- .../prog/en/modules/virtualshelves/sendshelf.tt | 2 +- .../opac-tmpl/prog/en/includes/doc-head-close.inc | 2 +- koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc | 4 +- .../opac-tmpl/prog/en/modules/opac-opensearch.tt | 36 ++++++++++---------- .../opac-tmpl/prog/en/modules/opac-results.tt | 2 +- .../opac-tmpl/prog/en/modules/opac-sendbasket.tt | 2 +- .../opac-tmpl/prog/en/modules/opac-sendshelf.tt | 2 +- .../prog/en/modules/opac-showreviews-rss.tt | 8 ++-- .../opac-tmpl/prog/en/modules/opac-showreviews.tt | 2 +- 10 files changed, 31 insertions(+), 31 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt index 04f7321..15ef0a3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt @@ -32,7 +32,7 @@ Classification: [% BIBLIO_RESULT.classification %][% END %][% IF ( BIBLIO_RESULT LCCN: [% BIBLIO_RESULT.lccn %][% END %][% IF ( BIBLIO_RESULT.url ) %] url : [% BIBLIO_RESULT.url %][% END %] In the online catalog: -[% BIBLIO_RESULT.OPACBaseurl %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber |url %] +[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber |url %] Items : [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %] [% ITEM_RESULT.branchname %] [% ITEM_RESULT.location %] [% IF ( ITEM_RESULT.itemcallnumber ) %]([% ITEM_RESULT.itemcallnumber %])[% END %] [% ITEM_RESULT.barcode %][% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt index 5fbb31f..686d278 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelf.tt @@ -33,7 +33,7 @@ Classification: [% BIBLIO_RESULT.classification %][% END %][% IF ( BIBLIO_RESULT LCCN: [% BIBLIO_RESULT.lccn %][% END %][% IF ( BIBLIO_RESULT.url ) %] url : [% BIBLIO_RESULT.url %][% END %] In the online catalog: -[% BIBLIO_RESULT.OPACBaseurl %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber |url %] +[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber |url %] Items : [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %] [% ITEM_RESULT.branchname %] [% ITEM_RESULT.location %] [% IF ( ITEM_RESULT.itemcallnumber ) %]([% ITEM_RESULT.itemcallnumber %])[% END %] [% ITEM_RESULT.barcode %][% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc index c05a83b..15bea79 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc @@ -107,7 +107,7 @@ var NO_OL_JACKET = _("No cover image available"); }); //]]> [% END %] - + [% IF ( GoogleIndicTransliteration ) %] diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc index 2510a7f..b3672f4 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc @@ -177,12 +177,12 @@