From d295692fe044c44ac9ca235331feedfd616473d2 Mon Sep 17 00:00:00 2001 From: David Cook Date: Fri, 30 May 2014 16:18:03 +1000 Subject: [PATCH] [SIGNED-OFF] Bug 12325 - Marc and Card view in Z39.50 Results doesn't work properly in IE 8 Content-Type: text/plain; charset="utf-8" This patch removes an unnecessary and problematic "return true" which causes conflicts with Greybox when clicking on "MARC" or "Card" in the search results of a Z39.50 search. The result is that the user is taken to the showmarc.pl page and cannot return to the results, which makes Z39.50 searching pretty much unusable for IE 8 users. This patch also cleans up the "inline links" display for the separate Z39.50 search pages. The 'biblio' version now has inline links for LCCN, and the 'authority' version now prevents inline links for the MARC and Import cells. _TEST PLAN_ 1) Open Internet Explorer 8 (if you don't have IE 8, use whatever Internet Explorer version you do have. You can use F12 developer tools to emulate it.) 2) Go to Cataloguing > New from Z39.50 3) Do a search that will get results (N.B. if you're using IE9+, hit F12 in the pop-up and change to IE 8 mode) 4) Click on "MARC" or "Card". 5) Note that Greybox tries to open a pop-over, but instead follows the link to showmarc.pl. (If you're on IE 8, you can't use "Back" to go back to the search results. If you're using an emulated version, you can.) (If you're testing the inline links, click on the LCCN cell for a biblio search (not that no inline links appear), or MARC and Import cells when doing an authority search (not that inline links do appear). Look at bug 10096 for authority z39.50 server details.) 6) Apply the patch 7) Repeat steps 1-5 8) Note that Greybox now appears correctly when clicking "MARC" and "Card" 9) Note also that inline links now appear for LCCN cell for biblio searches, and inline links no longer appear for MARC and Import cells when doing authority searches. 10) Profit Signed-off-by: Owen Leonard --- .../en/modules/cataloguing/z3950_auth_search.tt | 4 ++-- .../prog/en/modules/cataloguing/z3950_search.tt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt index 08ba74e..2a8a84d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt @@ -42,8 +42,8 @@ $(document).ready(function(){ $(".linktools").hide(); $("tr").removeClass("selected"); row.addClass("selected"); - if($tgt.is("a")||$tgt.is(":nth-child(7)")||$tgt.is(":nth-child(8)")||$tgt.is(":nth-child(9)")||$tgt.is(":nth-child(10)")){ - return true; + if($tgt.is("a")||$tgt.is(":nth-child(4)")||$tgt.is(":nth-child(5)")){ + //Don't show inline links for cells containing links of their own. } else { var position = $(this).offset(); var top = position.top+5; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt index 37b03dc..3e6bb16 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt @@ -43,8 +43,8 @@ $(document).ready(function(){ $(".linktools").hide(); $("tr").removeClass("selected"); row.addClass("selected"); - if($tgt.is("a")||$tgt.is(":nth-child(7)")||$tgt.is(":nth-child(8)")||$tgt.is(":nth-child(9)")||$tgt.is(":nth-child(10)")){ - return true; + if($tgt.is("a")||$tgt.is(":nth-child(8)")||$tgt.is(":nth-child(9)")||$tgt.is(":nth-child(10)")){ + //Don't show inline links for cells containing links of their own. } else { var position = $(this).offset(); var top = position.top+5; -- 1.7.9.5