Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Merge remote branch 'kc/new/enh/bug_5733' into kcmaster

Browse source
This commit is contained in:
Chris Cormack 2011-02-14 09:29:19 +13:00
commit 0dedbfba5a
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
View file

@ -64,7 +64,7 @@
<span class="loggedinusername"> <span class="loggedinusername">
<!-- TMPL_VAR NAME="loggedinusername" --> <!-- TMPL_VAR NAME="loggedinusername" -->
</span> </span>
(<a href="/cgi-bin/koha/mainpage.pl?logout.x=1"<!-- TMPL_IF NAME="intranetbookbag" --> onclick="javascript:delBasket(true);"<!-- /TMPL_IF -->>Log Out</a>) | (<a href="/cgi-bin/koha/mainpage.pl?logout.x=1"<!-- TMPL_IF NAME="intranetbookbag" --> onclick="delBasket(true);"<!-- /TMPL_IF -->>Log Out</a>) |
<!-- TMPL_ELSE --> <!-- TMPL_ELSE -->
You are not logged in | You are not logged in |
<!-- /TMPL_IF --> <!-- /TMPL_IF -->

8
koha-tmpl/intranet-tmpl/prog/en/js/basket.js
View file

@ -299,10 +299,10 @@ function delRecord (n, s) {
} }
function delBasket() { function delBasket(rep) {
if (rep == undefined){
var rep = false; rep = confirm(MSG_CONFIRM_DEL_BASKET);
rep = confirm(MSG_CONFIRM_DEL_BASKET); }
if (rep) { if (rep) {
delCookie(nameCookie); delCookie(nameCookie);
document.location = "about:blank"; document.location = "about:blank";