From c18d60de7329f31dcd4cdfa8f595ed59798eb0fd Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Tue, 5 Apr 2011 16:36:31 +1200 Subject: [PATCH] Bug 5917 : Whole pile of scoping for opac search results --- .../opac-tmpl/prog/en/modules/opac-results.tt | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-results.tt index 5b64256ded..7ad9872839 100644 --- a/koha-tt/opac-tmpl/prog/en/modules/opac-results.tt +++ b/koha-tt/opac-tmpl/prog/en/modules/opac-results.tt @@ -377,8 +377,8 @@ $(document).ready(function(){ [% END %] [% IF ( SEARCH_RESULT.opacbookbag ) %] [% ELSE %] -[% IF ( SEARCH_RESULT.virtualshelves ) %] [% ELSE %] -[% IF ( SEARCH_RESULT.RequestOnOpac ) %][% UNLESS ( SEARCH_RESULT.norequests ) %][% IF ( SEARCH_RESULT.opacuserlogin ) %] [% END %][% END %][% END %][% END %][% END %] +[% IF ( virtualshelves ) %] [% ELSE %] +[% IF ( RequestOnOpac ) %][% UNLESS ( SEARCH_RESULT.norequests ) %][% IF ( SEARCH_RESULT.opacuserlogin ) %] [% END %][% END %][% END %][% END %][% END %] [% SEARCH_RESULT.result_number %]. [% UNLESS ( item_level_itypes ) %] @@ -401,13 +401,13 @@ $(document).ready(function(){ [% END %] - [% IF ( SEARCH_RESULT.COinSinOPACResults ) %] + [% IF ( COinSinOPACResults ) %] [% IF ( SEARCH_RESULT.coins ) %] [% END %] [% END %] - [% IF ( SEARCH_RESULT.OPACXSLTResultsDisplay ) %] + [% IF ( OPACXSLTResultsDisplay ) %] [% SEARCH_RESULT.XSLTResultsRecord %] [% ELSE %] [% IF ( SEARCH_RESULT.BiblioDefaultViewmarc ) %] @@ -447,7 +447,7 @@ $(document).ready(function(){ [% available_items_loo.branchname %] [% END %] - [% IF ( available_items_loo.OPACItemsResultsDisplay ) %] + [% IF ( OPACItemsResultsDisplay ) %] [% UNLESS ( available_items_loo.singleBranchMode ) %][% available_items_loo.location %][% END %] [% IF ( available_items_loo.itemcallnumber ) %][[% available_items_loo.itemcallnumber %]][% END %] [% END %] @@ -475,9 +475,9 @@ $(document).ready(function(){ [% END %] - [% IF ( SEARCH_RESULT.LibraryThingForLibrariesID ) %]
[% END %] - [% IF ( SEARCH_RESULT.opacuserlogin ) %][% IF ( SEARCH_RESULT.TagsEnabled ) %] - [% IF ( SEARCH_RESULT.TagsShowOnList ) %] + [% IF ( LibraryThingForLibrariesID ) %]
[% END %] + [% IF ( opacuserlogin ) %][% IF ( TagsEnabled ) %] + [% IF ( TagsShowOnList ) %] [% IF ( SEARCH_RESULT.TagLoop ) %]
Tags: @@ -485,8 +485,8 @@ $(document).ready(function(){ [% END %] [% END %] - [% IF ( SEARCH_RESULT.TagsInputOnList ) %] - [% IF ( SEARCH_RESULT.loggedinusername ) %] + [% IF ( TagsInputOnList ) %] + [% IF ( loggedinusername ) %]
@@ -505,10 +505,10 @@ $(document).ready(function(){ [% IF ( SEARCH_RESULT.searchhighlightblob ) %]Match: [% SEARCH_RESULT.searchhighlightblob %][% END %] Actions: - [% IF ( SEARCH_RESULT.RequestOnOpac ) %] + [% IF ( RequestOnOpac ) %] [% UNLESS ( SEARCH_RESULT.norequests ) %] - [% IF ( SEARCH_RESULT.opacuserlogin ) %] - [% IF ( SEARCH_RESULT.AllowOnShelfHolds ) %] + [% IF ( opacuserlogin ) %] + [% IF ( AllowOnShelfHolds ) %] Place Hold [% ELSE %] [% IF ( SEARCH_RESULT.itemsissued ) %] @@ -520,15 +520,15 @@ $(document).ready(function(){ [% END %] - [% IF ( SEARCH_RESULT.opacuserlogin ) %][% IF ( SEARCH_RESULT.loggedinusername ) %][% IF ( SEARCH_RESULT.virtualshelves ) %]Save to Lists + [% IF ( opacuserlogin ) %][% IF ( loggedinusername ) %][% IF ( virtualshelves ) %]Save to Lists [% END %][% END %][% END %] - [% IF ( SEARCH_RESULT.opacbookbag ) %]Add to Cart[% END %] + [% IF ( opacbookbag ) %]Add to Cart[% END %] - [% IF ( SEARCH_RESULT.OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( SEARCH_RESULT.normalized_isbn ) %][% ELSE %]No cover image available[% END %][% END %][% END %] + [% IF ( OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( SEARCH_RESULT.normalized_isbn ) %][% ELSE %]No cover image available[% END %][% END %][% END %] - [% IF ( SyndeticsEnabled ) %][% IF ( SEARCH_RESULT.SyndeticsCoverImages ) %][% IF ( SEARCH_RESULT.using_https ) %] + [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( using_https ) %] [% ELSE %] [% END %][% END %][% END %] -- 2.39.5