View | Details | Raw Unified | Return to bug 6970
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc (-1 / +1 lines)
Lines 65-71 Link Here
65
                [% loggedinusername %]
65
                [% loggedinusername %]
66
            </span>
66
            </span>
67
            [% IF ( intranetbookbag ) %]
67
            [% IF ( intranetbookbag ) %]
68
            (<a href="/cgi-bin/koha/mainpage.pl?logout.x=1" onclick="delBasket(true);">Log Out</a>) |
68
            (<a href="/cgi-bin/koha/mainpage.pl?logout.x=1" onclick="delBasket('main',true);">Log Out</a>) |
69
            [% ELSE %]
69
            [% ELSE %]
70
            (<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>) |
70
            (<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>) |
71
            [% END %]
71
            [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/js/basket.js (-5 / +10 lines)
Lines 299-313 function delRecord (n, s) { Link Here
299
}
299
}
300
300
301
301
302
function delBasket(rep) {
302
function delBasket(context,rep) {
303
    if (rep == undefined){
303
    if (rep == undefined){
304
        rep = confirm(MSG_CONFIRM_DEL_BASKET);
304
        rep = confirm(MSG_CONFIRM_DEL_BASKET);
305
    }
305
    }
306
    if (rep) {
306
    if (rep) {
307
        delCookie(nameCookie);
307
        if(context == "popup"){
308
        document.location = "about:blank";
308
            delCookie(nameCookie);
309
        updateBasket(0,top.opener);
309
            document.location = "about:blank";
310
        window.close();
310
            updateBasket(0,top.opener);
311
            window.close();
312
        } else {
313
            delCookie(nameCookie);
314
            updateBasket(0,top.opener);
315
        }
311
    }
316
    }
312
}
317
}
313
318
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt (-2 / +1 lines)
Lines 103-109 function placeHold () { Link Here
103
	</li>
103
	</li>
104
	<li>
104
	<li>
105
	    <span id="delete" class="yui-button yui-link-button"><span class="first-child">
105
	    <span id="delete" class="yui-button yui-link-button"><span class="first-child">
106
		<a class="empty" href="basket.pl" onclick="delBasket(); return false;">Empty and Close</a>
106
		<a class="empty" href="basket.pl" onclick="delBasket('popup'); return false;">Empty and Close</a>
107
	    </span></span>
107
	    </span></span>
108
	</li>
108
	</li>
109
	<li>
109
	<li>
110
- 

Return to bug 6970