From 6d32d66fdc2f9d137d1b4f7e5de7414ee986abde Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Mon, 12 May 2014 07:37:00 -0400 Subject: [PATCH] Bug 7720: (follow-up) update Bootstrap theme Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton --- .../bootstrap/en/modules/opac-detail.tt | 71 +++++++++++++++---- 1 file changed, 57 insertions(+), 14 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 5e39779ac0..c3f38dd809 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt @@ -1,5 +1,6 @@ [% USE Koha %] [% USE KohaDates %] +[% USE Branches %] [% USE AuthorisedValues %] [% SET TagsShowEnabled = ( ( Koha.Preference( 'TagsEnabled' ) == 1 ) && TagsShowOnDetail ) %] [% SET TagsInputEnabled = ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) && ( Koha.Preference( 'TagsEnabled' ) == 1 ) && TagsInputOnDetail ) %] @@ -1127,7 +1128,14 @@ [% IF ( item_level_itypes ) %]Item type[% END %] - Location + [% IF ( OpacLocationBranchToDisplay == 'holding' || OpacLocationBranchToDisplay == 'both' || singleBranchMode ) %] + Current location + [% END %] + [% UNLESS ( singleBranchMode ) %] + [% IF ( OpacLocationBranchToDisplay == 'home' || OpacLocationBranchToDisplay == 'both' ) %] + Home library + [% END %] + [% END %] [% IF ( itemdata_ccode ) %]Collection[% END %] Call number [% IF ( itemdata_enumchron ) %]Vol info[% END %] @@ -1162,21 +1170,56 @@ [% ITEM_RESULT.description %] [% END %] - - - - [% UNLESS ( singleBranchMode ) %] -
- [% IF ( ITEM_RESULT.branchurl ) %] - [% ITEM_RESULT.branchname %] - [% ELSE %] - [% ITEM_RESULT.branchname %] - [% END %] + [% UNLESS singleBranchMode %] + [% IF ( OpacLocationBranchToDisplay == 'holding' || OpacLocationBranchToDisplay == 'both' ) %] + + + +
+ [% IF ( ITEM_RESULT.branchurl ) %] + [% ITEM_RESULT.branchname %] + [% ELSE %] + [% ITEM_RESULT.branchname %] + [% END %] +
+ + [% IF ( OpacLocationBranchToDisplayShelving == 'holding' || OpacLocationBranchToDisplayShelving == 'both' ) %] + [% ITEM_RESULT.location_description %] + [% END %] +
[% ITEM_RESULT.branch_opac_info %]
-
+ [% END %] - [% ITEM_RESULT.location_description %] - + + [% IF ( OpacLocationBranchToDisplay == 'home' || OpacLocationBranchToDisplay == 'both' ) %] + + + +
+ [% IF ( ITEM_RESULT.branchurl ) %] + [% home_branch_url = Branches.GetURL( ITEM_RESULT.homebranch ) %] + [% IF ( home_branch_url ) %] + [% Branches.GetName( ITEM_RESULT.homebranch ) %] + [% ELSE %] + [% Branches.GetName( ITEM_RESULT.homebranch ) %] + [% END %] + [% ELSE %] + [% ITEM_RESULT.branchname %] + [% END %] +
+ + [% IF ( OpacLocationBranchToDisplayShelving == 'home' || OpacLocationBranchToDisplayShelving == 'both' ) %] + [% ITEM_RESULT.location_description %] + [% END %] + +
[% ITEM_RESULT.branch_opac_info %]
+ + [% END %] + + [% ELSE %] + [% ITEM_RESULT.location_description %] + [% END %] + [% IF ( itemdata_ccode ) %] [% ITEM_RESULT.ccode %] [% END %] -- 2.39.5