@@ -, +, @@ --- .../intranet-tmpl/prog/en/includes/header.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/js/basket.js | 15 ++++++++++----- .../intranet-tmpl/prog/en/modules/basket/basket.tt | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc @@ -65,7 +65,7 @@ [% loggedinusername %] [% IF ( intranetbookbag ) %] - (Log Out) | + (Log Out) | [% ELSE %] (Log Out) | [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/js/basket.js +++ a/koha-tmpl/intranet-tmpl/prog/en/js/basket.js @@ -299,15 +299,20 @@ function delRecord (n, s) { } -function delBasket(rep) { +function delBasket(context,rep) { if (rep == undefined){ rep = confirm(MSG_CONFIRM_DEL_BASKET); } if (rep) { - delCookie(nameCookie); - document.location = "about:blank"; - updateBasket(0,top.opener); - window.close(); + if(context == "popup"){ + delCookie(nameCookie); + document.location = "about:blank"; + updateBasket(0,top.opener); + window.close(); + } else { + delCookie(nameCookie); + updateBasket(0,top.opener); + } } } --- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt @@ -103,7 +103,7 @@ function placeHold () {
  • - Empty and Close + Empty and Close
  • --