Koha/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
Owen Leonard d139d400b1 Fix for Bug 6970 - logout not redirecting to login page
For some reason the latest version of Firefox doesn't like
the javascript which empties the cart on logout. As Ian points
out, there is code which tries to redirect to "about:blank"
and close the window (since the main context of the function
is the Cart's popup window.

This patch adds a parameter to the delBasket function so
that we can pass a "popup" context to the function and
choose whether or not we want to ask JS to close the window.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-14 15:57:45 +13:00

77 lines
4 KiB
HTML

[% IF ( intranetbookbag ) %]<div id="cartDetails">Your cart is empty.</div>[% END %]
<div id="header" class="clearfix">
<div id="toplevelnav">
<ul id="toplevelmenu">
[% IF ( CAN_user_circulate ) %]<li><a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a></li>[% END %]
[% IF ( CAN_user_borrowers ) %]<li><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li><a href="/cgi-bin/koha/catalogue/search.pl">Search</a></li>[% END %]
[% IF ( intranetbookbag ) %]
<li><a href="#" id="cartmenulink">Cart<span id="basketcount"></span></a></li>
[% END %]
[% IntranetNav %]
<li class="more">
<a id="showmore" href="/cgi-bin/koha/mainpage.pl">More</a>
<div id="moremenu">
<div class="bd">
<ul>
<li><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Lists</a></li>
[% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
<li><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a></li>
[% END %]
[% IF ( CAN_user_acquisition ) %]
<li><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></li>
[% END %]
[% IF ( CAN_user_editauthorities ) %]
<li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
[% END %]
[% IF ( CAN_user_serials ) %]
<li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
[% END %]
[% IF ( CAN_user_reports ) %]
<li><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></li>
[% END %]
[% IF ( CAN_user_tools ) %]
<li><a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a></li>
[% END %]
[% IF ( CAN_user_parameters ) %]
<li><a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a></li>
[% END %]
<li><a href="/cgi-bin/koha/about.pl">About Koha</a></li>
</ul>
</div>
</div>
</li>
</ul>
</div>
<div id="login">
[% IF ( AutoLocation ) %]
<strong>
[% LoginBranchname %]
</strong>
[% ELSE %]
<strong>[% LoginBranchname %]</strong>
[% IF ( IndependantBranches ) %]
[% IF ( CAN_user_management || CAN_user_editcatalogue_edit_catalogue ) %]
(<a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>)
[% END %]
[% ELSE %]
(<a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>)
[% END %]
|
[% END %]
[% IF ( loggedinusername ) %]
<span class="loggedinusername">
[% loggedinusername %]
</span>
[% IF ( intranetbookbag ) %]
(<a href="/cgi-bin/koha/mainpage.pl?logout.x=1" onclick="clearHoldFor(); delBasket('main', true);">Log Out</a>) |
[% ELSE %]
(<a href="/cgi-bin/koha/mainpage.pl?logout.x=1" onclick="clearHoldFor();">Log Out</a>) |
[% END %]
[% ELSE %]
You are not logged in |
[% END %]
<a href="/cgi-bin/koha/help.pl" id="helper" onclick="window.open('/cgi-bin/koha/help.pl?url='+escape(document.url),'Koha_Help','width=600,height=600,toolbar=false,scrollbars=yes'); return false;">[ ? ]</a>
</div>
</div>