From 63d714a2c66f8c726dccc36df75d69756cdd7816 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 12 Jul 2017 09:32:24 -0300 Subject: [PATCH] [SIGNED-OFF] Bug 17277: Always display location and *branch item info - opac detail Signed-off-by: Owen Leonard --- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 87 ++++++++++------------ 1 file changed, 39 insertions(+), 48 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt index d95dc8c..bf5e43f 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt @@ -1182,13 +1182,11 @@ [% IF ( item_level_itypes ) %]Item type[% END %] - [% IF ( OpacLocationBranchToDisplay == 'holding' || OpacLocationBranchToDisplay == 'both' || singleBranchMode ) %] + [% IF ( OpacLocationBranchToDisplay == 'holding' || OpacLocationBranchToDisplay == 'both' ) %] Current location [% END %] - [% UNLESS ( singleBranchMode ) %] - [% IF ( OpacLocationBranchToDisplay == 'home' || OpacLocationBranchToDisplay == 'both' ) %] - Home library - [% END %] + [% IF ( OpacLocationBranchToDisplay == 'home' || OpacLocationBranchToDisplay == 'both' ) %] + Home library [% END %] [% IF ( itemdata_ccode ) %]Collection[% END %] Call number @@ -1224,54 +1222,49 @@ [% ITEM_RESULT.description %] [% END %] - [% UNLESS singleBranchMode %] - [% IF ( OpacLocationBranchToDisplay == 'holding' || OpacLocationBranchToDisplay == 'both' ) %] - - - - - [% IF ( ITEM_RESULT.branchurl ) %] - [% ITEM_RESULT.branchname %] - [% ELSE %] - [% ITEM_RESULT.branchname %] - [% END %] - -
[% ITEM_RESULT.holding_branch_opac_info %]
- - [% IF ( OpacLocationBranchToDisplayShelving == 'holding' || OpacLocationBranchToDisplayShelving == 'both' ) %] - [% ITEM_RESULT.location_description %] + [% IF ( OpacLocationBranchToDisplay == 'holding' || OpacLocationBranchToDisplay == 'both' ) %] + + + + + [% IF ( ITEM_RESULT.branchurl ) %] + [% ITEM_RESULT.branchname %] + [% ELSE %] + [% ITEM_RESULT.branchname %] [% END %] + +
[% ITEM_RESULT.holding_branch_opac_info %]
- - [% END %] + [% IF ( OpacLocationBranchToDisplayShelving == 'holding' || OpacLocationBranchToDisplayShelving == 'both' ) %] + [% ITEM_RESULT.location_description %] + [% END %] - [% IF ( OpacLocationBranchToDisplay == 'home' || OpacLocationBranchToDisplay == 'both' ) %] - - - - - [% IF Branches.GetURL( ITEM_RESULT.homebranch ) %] - [% home_branch_url = Branches.GetURL( ITEM_RESULT.homebranch ) %] - [% IF ( home_branch_url ) %] - [% Branches.GetName( ITEM_RESULT.homebranch ) %] - [% ELSE %] - [% Branches.GetName( ITEM_RESULT.homebranch ) %] - [% END %] + + [% END %] + + [% IF ( OpacLocationBranchToDisplay == 'home' || OpacLocationBranchToDisplay == 'both' ) %] + + + + + [% IF Branches.GetURL( ITEM_RESULT.homebranch ) %] + [% home_branch_url = Branches.GetURL( ITEM_RESULT.homebranch ) %] + [% IF ( home_branch_url ) %] + [% Branches.GetName( ITEM_RESULT.homebranch ) %] [% ELSE %] [% Branches.GetName( ITEM_RESULT.homebranch ) %] [% END %] - -
[% ITEM_RESULT.home_branch_opac_info %]
- - [% IF ( OpacLocationBranchToDisplayShelving == 'home' || OpacLocationBranchToDisplayShelving == 'both' ) %] - [% ITEM_RESULT.location_description %] + [% ELSE %] + [% Branches.GetName( ITEM_RESULT.homebranch ) %] [% END %] +
+
[% ITEM_RESULT.home_branch_opac_info %]
- - [% END %] + [% IF ( OpacLocationBranchToDisplayShelving == 'home' || OpacLocationBranchToDisplayShelving == 'both' ) %] + [% ITEM_RESULT.location_description %] + [% END %] - [% ELSE %] - [% ITEM_RESULT.location_description %] + [% END %] [% IF ( itemdata_ccode ) %] @@ -1481,10 +1474,8 @@ $(".holdingst").dataTable($.extend(true, {}, dataTablesDefaults, { "aoColumns": [ [% IF ( item_level_itypes ) %]null,[% END %] - [% IF ( OpacLocationBranchToDisplay == 'holding' || OpacLocationBranchToDisplay == 'both' || singleBranchMode ) %]null,[% END %] - [% UNLESS ( singleBranchMode ) %] - [% IF ( OpacLocationBranchToDisplay == 'home' || OpacLocationBranchToDisplay == 'both' ) %]null,[% END %] - [% END %] + [% IF ( OpacLocationBranchToDisplay == 'holding' || OpacLocationBranchToDisplay == 'both' ) %]null,[% END %] + [% IF ( OpacLocationBranchToDisplay == 'home' || OpacLocationBranchToDisplay == 'both' ) %]null,[% END %] [% IF ( itemdata_ccode ) %]null,[% END %] null, [% IF ( itemdata_enumchron ) %]null,[% END %] -- 2.1.4