From 20d42fd68428ed8eb94055c3a4186ddf0e9afdf3 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 17 Sep 2013 08:33:01 -0400 Subject: [PATCH] [PASSED QA] Bug 10856 [Follow-up] Improve the previous and next items on the shelf browser In Firefox at least, the shelf browser cannot be reopened after hiding it with the "close shelf browser" link. This followup improves the behavior of the "close shelf browser" link so that the shelf browser can be redisplayed. To test, open a bibliographic detail page in the OPAC and click a "browse shelf" link. Click the "close shelf browser" link--the shelf browser should be hidden. Click the original "browse shelf" link and the shelf browser should reappear without reloading the page. Test with Firefox and Chrome (at least). Signed-off-by: Jonathan Druart Signed-off-by: Katrin Fischer All tests and QA script pass. Testing notes: - New unit tests in t/db_dependent/ShelfBrowser.t pass. - System preference OPACShelfBrowser still works as expected. - Closing and opening the shelf browser works as expected. - Next and Previous links show new and nicer behaviour. - Logs are clean. Tested with Firefox and Chromium under Ubuntu. Notes: The currently displayed record could maybe be highlighted a bit better. Signed-off-by: Katrin Fischer --- .../opac-tmpl/prog/en/includes/shelfbrowser.inc | 2 +- koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 15 +++++++++++++-- opac/opac-detail.pl | 1 + 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/shelfbrowser.inc b/koha-tmpl/opac-tmpl/prog/en/includes/shelfbrowser.inc index f5672f9..b910592 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/shelfbrowser.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/shelfbrowser.inc @@ -87,7 +87,7 @@ $(document).ready(function(){ $(".close_shelf").click(function(e){ e.preventDefault(); - $("#shelfbrowser").hide(); + $("#shelfbrowser").toggle(); }); [% IF shelfbrowser_prev_item.itemnumber %] $("#browser_previous a").click(function(e){ diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt index 3f7053d..e5d9c3c 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt @@ -1540,12 +1540,23 @@ YAHOO.util.Event.onContentReady("furtherm", function () { [% ITEM_RESULT.location_description %] [% IF ( itemdata_ccode ) %][% ITEM_RESULT.ccode %][% END %] - [% IF ( ITEM_RESULT.itemcallnumber ) %] [% ITEM_RESULT.itemcallnumber %][% IF ( OPACShelfBrowser ) %] (Browse shelf)[% END %][% END %] + + [% IF ( ITEM_RESULT.itemcallnumber ) %] + [% ITEM_RESULT.itemcallnumber %] + [% IF ( OPACShelfBrowser ) %] + [% IF ( ITEM_RESULT.itemnumber == starting_itemnumber ) %] + (Browse shelf) + [% ELSE %] + (Browse shelf) + [% END %] + [% END %] + [% END %] + [% IF ( itemdata_enumchron ) %][% ITEM_RESULT.enumchron %][% END %] [% IF ( itemdata_uri ) %] [% IF ITEM_RESULT.uri %] [% IF trackclicks == 'track' || trackclicks == 'anonymous' %] - Link to resource + Link to resource [% ELSE %] [% ITEM_RESULT.uri %] [% END %] diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl index 0b5ef8c..d805d66 100755 --- a/opac/opac-detail.pl +++ b/opac/opac-detail.pl @@ -931,6 +931,7 @@ if (C4::Context->preference("OPACShelfBrowser")) { my $nearby = GetNearbyItems($starting_itemnumber); $template->param( + starting_itemnumber => $starting_itemnumber, starting_homebranch => $nearby->{starting_homebranch}->{description}, starting_location => $nearby->{starting_location}->{description}, starting_ccode => $nearby->{starting_ccode}->{description}, -- 1.7.9.5