Owen Leonard
2cc6c709c1
This patch removes the "data-toggle" attribute from the login link in order to avoid a JavaScript error. Since we have a custom click handler to trigger the modal we don't need Bootstrap's "automatic" modal handling. Test plan: 1. Apply patch 2. Open F12 dev tools 3. Click "Log in to your account" on OPAC 4. Observe no Javascript errors in console Signed-off-by: David Cook <dcook@prosentient.com.au> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
375 lines
27 KiB
HTML
375 lines
27 KiB
HTML
[% USE raw %]
|
||
[% USE Koha %]
|
||
[% USE Branches %]
|
||
[% USE Categories %]
|
||
[% USE KohaNews %]
|
||
[% PROCESS 'html_helpers.inc' %]
|
||
[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
|
||
[% SET OpacHeader = KohaNews.get( location => "opacheader", lang => lang, library => branchcode, blocktitle => 0 ) %]
|
||
|
||
<div id="wrap">
|
||
<div id="header-region" class="noprint">
|
||
<div class="navbar navbar-inverse navbar-static-top">
|
||
<div class="navbar-inner">
|
||
<div class="container-fluid">
|
||
<h1 id="logo">
|
||
<a class="brand" href="/cgi-bin/koha/opac-main.pl">
|
||
[% IF ( LibraryNameTitle ) %]
|
||
[% LibraryNameTitle | html %]
|
||
[% ELSE %]
|
||
Koha online
|
||
[% END %]
|
||
</a>
|
||
</h1>
|
||
[% IF ( Koha.Preference( 'opacbookbag' ) == 1 ) %]
|
||
<div id="cartDetails" class="cart-message">Your cart is empty.</div>
|
||
[% END %]
|
||
<ul class="nav">
|
||
[% IF ( Koha.Preference( 'opacbookbag' ) == 1 ) %]
|
||
<li>
|
||
<a href="#" title="Collect items you are interested in" id="cartmenulink" role="button">
|
||
<i id="carticon" class="fa fa-shopping-cart fa-icon-white"></i> <span class="cartlabel">Cart</span> <span id="basketcount"></span>
|
||
</a>
|
||
</li>
|
||
[% END %]
|
||
[% IF ( Koha.Preference( 'virtualshelves' ) == 1 ) && ( Koha.Preference( 'opacbookbag' ) == 1 ) %]
|
||
<li class="divider-vertical"></li>
|
||
[% END %]
|
||
[% IF ( Koha.Preference( 'virtualshelves' ) == 1 ) %]
|
||
<li class="dropdown">
|
||
<a href="#" title="Show lists" class="dropdown-toggle" id="listsmenu" data-toggle="dropdown" role="button"><i class="fa fa-list fa-icon-white"></i> <span class="listslabel">Lists</span> <b class="caret"></b></a>
|
||
<ul aria-labelledby="listsmenu" role="menu" class="dropdown-menu">
|
||
[% IF some_public_shelves.count %]
|
||
<li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=list&category=2" tabindex="-1" role="menuitem"><strong>Public lists</strong></a></li>
|
||
[% SET number_of_public_shelves = 0 %]
|
||
[% FOREACH s IN some_public_shelves %]
|
||
<li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% s.shelfnumber | uri %]&sortfield=[% s.sortfield | uri %]" tabindex="-1" role="menuitem">[% s.shelfname | html %]</a></li>
|
||
[% SET number_of_public_shelves = number_of_public_shelves + 1 %]
|
||
[% IF number_of_public_shelves >= 10 %][% LAST %][% END %]
|
||
[% END %]
|
||
[% IF some_public_shelves > 10 %]
|
||
<li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=list&category=2" tabindex="-1" role="menuitem" class="listmenulink">View All</a></li>
|
||
[% END %]
|
||
[% END %]
|
||
[% IF some_public_shelves.count > 0 %]
|
||
<li class="divider" role="presentation"></li>
|
||
[% END %]
|
||
[% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
|
||
<li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=list&category=1" tabindex="-1" role="menuitem"><strong>Your lists</strong></a></li>
|
||
[% IF loggedinusername %]
|
||
[% IF some_private_shelves.count %]
|
||
[% SET number_of_private_shelves = 0 %]
|
||
[% FOREACH s IN some_private_shelves %]
|
||
<li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% s.shelfnumber | uri %]&sortfield=[% s.sortfield | uri %]" tabindex="-1" role="menuitem">[% s.shelfname | html %]</a></li>
|
||
[% SET number_of_private_shelves = number_of_private_shelves + 1 %]
|
||
[% IF number_of_private_shelves >= 10 %][% LAST %][% END %]
|
||
[% END %]
|
||
[% IF some_private_shelves > 10 %]
|
||
<li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=list&category=1" tabindex="-1" role="menuitem" class="listmenulink">View All</a></li>
|
||
[% END %]
|
||
[% ELSE %]
|
||
<li role="presentation"><a href="#" tabindex="-1" class="menu-inactive" role="menuitem">No private lists</a></li>
|
||
[% END %]
|
||
<li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=add_form" tabindex="-1" role="menuitem" class="listmenulink">New list</a></li>
|
||
[% ELSE %]
|
||
<li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=add_form" tabindex="-1" class="menu-inactive" role="menuitem">Log in to create your own lists</a></li>
|
||
[% END # / IF loggedinusername %]
|
||
[% END # / IF opacuserlogin %]
|
||
</ul> <!-- / .dropdown-menu -->
|
||
</li> <!-- / .dropdown -->
|
||
[% END # / IF virtualshelves %]
|
||
</ul> <!-- / .nav -->
|
||
|
||
[% IF Koha.Preference( 'opacuserlogin' ) == 1 || Koha.Preference( 'EnableOpacSearchHistory') || Koha.Preference( 'opaclanguagesdisplay' ) %]
|
||
|
||
<div id="members" class="pull-right">
|
||
[% IF ( Koha.Preference( 'opaclanguagesdisplay' ) ) %]
|
||
[% INCLUDE 'masthead-langmenu.inc' %]
|
||
[% END %]
|
||
<ul class="nav">
|
||
<li class="dropdown">
|
||
[% IF ( Koha.Preference( 'opacuserlogin' ) == 1 ) %]
|
||
[% IF ( loggedinusername ) %]
|
||
<a href="#" class="dropdown-toggle" id="user-menu" data-toggle="dropdown" role="button">
|
||
<i class="fa fa-user fa-icon-white fa-fw"></i>
|
||
<span class="userlabel">Welcome, [% INCLUDE 'patron-title.inc' patron = logged_in_user no_html = 1 %]</span>
|
||
<b class="caret"></b>
|
||
</a>
|
||
[% ELSE %]
|
||
[% IF Koha.Preference('casAuthentication') %]
|
||
[%# CAS authentication is too complicated for modal window %]
|
||
<a class="login-link" href="/cgi-bin/koha/opac-user.pl"><i class="fa fa-user fa-icon-white fa-fw"></i> <span class="userlabel">Log in to your account</span></a>
|
||
[% ELSIF ( Koha.Preference('GoogleOpenIDConnect') == 1 ) %]
|
||
<a class="login-link" href="/cgi-bin/koha/svc/auth/googleopenidconnect" role="button" data-toggle="modal"><i class="fa fa-user fa-icon-white fa-fw"></i> <span class="userlabel">Log in to your account</span></a>
|
||
[% ELSE %]
|
||
<a href="/cgi-bin/koha/opac-user.pl" class="login-link loginModal-trigger"><i class="fa fa-user fa-icon-white fa-fw"></i> <span class="userlabel">Log in to your account</span></a>
|
||
[% END %]
|
||
[% END %]
|
||
[% END %]
|
||
|
||
[% IF ( Koha.Preference( 'opacuserlogin' ) == 1 && loggedinusername ) %]
|
||
<ul aria-labelledby="user-menu" role="menu" class="dropdown-menu dropdown-menu-right">
|
||
<li role="presentation">
|
||
<div id="loggedinuser-menu">
|
||
<p>
|
||
<a class="login-link" href="/cgi-bin/koha/opac-user.pl"><span class="loggedinusername" data-borrowernumber="[% logged_in_user.borrowernumber | html %]" data-branchcode="[% logged_in_user.branchcode | html %]" >Your account</span></a>
|
||
</p>
|
||
[% IF Koha.Preference( 'EnableOpacSearchHistory' ) %]
|
||
<p class="search_history">
|
||
<a tabindex="-1" role="menuitem" class="login-link" href="/cgi-bin/koha/opac-search-history.pl" title="View your search history">Search history</a>
|
||
<span class="divider-vertical"></span>
|
||
<a class="logout clearsh" href="/cgi-bin/koha/opac-search-history.pl?action=delete" title="Delete your search history"><i class="fa fa-trash"></i> Clear</a>
|
||
</p>
|
||
[% END %]
|
||
<p>
|
||
<a tabindex="-1" role="menuitem" class="logout" id="logout" href="/cgi-bin/koha/opac-main.pl?logout.x=1">
|
||
Log out</a>
|
||
</p>
|
||
</div>
|
||
</li>
|
||
</ul>
|
||
[% END %]
|
||
</li>
|
||
[% IF ( !Koha.Preference( 'opacuserlogin') || !loggedinusername ) %]
|
||
[% IF Koha.Preference( 'EnableOpacSearchHistory' ) %]
|
||
<li class="search_history">
|
||
<a href="/cgi-bin/koha/opac-search-history.pl" title="View your search history">Search history</a>
|
||
<span class="divider-vertical"></span>
|
||
<a class="logout clearsh" href="/cgi-bin/koha/opac-search-history.pl?action=delete" title="Delete your search history"><i class="fa fa-trash"></i> Clear</a>
|
||
</li>
|
||
[% END %]
|
||
[% END %]
|
||
</ul>
|
||
</div> <!-- /members -->
|
||
[% END # IF opacuserlogin || EnableOpacSearchHistory || opaclanguagesdisplay %]
|
||
|
||
</div> <!-- /container-fluid -->
|
||
</div> <!-- /navbar-inner -->
|
||
</div> <!-- /navbar -->
|
||
|
||
[% IF ( OpacHeader ) %]
|
||
<div class="container-fluid">
|
||
<div class="row-fluid">
|
||
[% PROCESS koha_news_block news => OpacHeader %]
|
||
</div>
|
||
</div>
|
||
[% END %]
|
||
|
||
</div> <!-- / header-region -->
|
||
|
||
<div class="container-fluid">
|
||
<div class="row-fluid">
|
||
<div id="opac-main-search">
|
||
<div class="span12">
|
||
[% IF ( OpacPublic ) %]
|
||
[% UNLESS ( advsearch ) %]
|
||
[% IF ( Koha.Preference( 'OpacAddMastheadLibraryPulldown' ) == 1 ) %]
|
||
<div class="mastheadsearch librarypulldown">
|
||
[% ELSE %]
|
||
<div class="mastheadsearch">
|
||
[% END %]
|
||
[% IF Koha.Preference('OpacCustomSearch') == '' %]
|
||
<form name="searchform" method="get" action="/cgi-bin/koha/opac-search.pl" id="searchform" class="form-inline">
|
||
<label for="masthead_search"> Search
|
||
[% UNLESS ( Koha.Preference( 'OpacAddMastheadLibraryPulldown' ) == 1 ) %]
|
||
[% IF ( mylibraryfirst ) %]
|
||
(in [% Branches.GetName( mylibraryfirst ) | html %] only)
|
||
[% END %]
|
||
[% END %]
|
||
</label>
|
||
|
||
<select name="idx" id="masthead_search">
|
||
[% IF ( ms_kw ) %]
|
||
<option selected="selected" value="">Library catalog</option>
|
||
[% ELSE %]
|
||
<option value="">Library catalog</option>
|
||
[% END # /ms_kw %]
|
||
[% IF ( ms_ti ) %]
|
||
<option selected="selected" value="ti">Title</option>
|
||
[% ELSE %]
|
||
<option value="ti">Title</option>
|
||
[% END # /ms_ti %]
|
||
[% IF ( ms_au ) %]
|
||
<option selected="selected" value="au">Author</option>
|
||
[% ELSE %]
|
||
<option value="au">Author</option>
|
||
[% END # /ms_au%]
|
||
[% IF ( ms_su ) %]
|
||
<option selected="selected" value="su">Subject</option>
|
||
[% ELSE %]
|
||
<option value="su">Subject</option>
|
||
[% END # /ms_su %]
|
||
[% IF ( ms_nb ) %]
|
||
<option selected="selected" value="nb">ISBN</option>
|
||
[% ELSE %]
|
||
<option value="nb">ISBN</option>
|
||
[% END # /ms_nb%]
|
||
[% IF ( ms_ns ) %]
|
||
<option selected="selected" value="ns">ISSN</option>
|
||
[% ELSE %]
|
||
<option value="ns">ISSN</option>
|
||
[% END # /ms_ns%]
|
||
[% IF ( ms_se ) %]
|
||
<option selected="selected" value="se">Series</option>
|
||
[% ELSE %]
|
||
<option value="se">Series</option>
|
||
[% END # /ms_se %]
|
||
[% IF ( Koha.Preference('OPACNumbersPreferPhrase') ) %]
|
||
[% IF ( ms_callnumcommaphr ) %]
|
||
<option selected="selected" value="callnum,phr">Call number</option>
|
||
[% ELSE %]
|
||
<option value="callnum,phr">Call number</option>
|
||
[% END #/ms_callnumcommaphr %]
|
||
[% ELSE %]
|
||
[% IF ( ms_callnum ) %]
|
||
<option selected="selected" value="callnum">Call number</option>
|
||
[% ELSE %]
|
||
<option value="callnum">Call number</option>
|
||
[% END # /ms_callnum %]
|
||
[% END # /IF OPACNumbersPreferPhrase %]
|
||
</select>
|
||
|
||
[% UNLESS ( Koha.Preference( 'OpacAddMastheadLibraryPulldown' ) == 1 ) %]
|
||
<div class="input-append nolibrarypulldown">
|
||
[% END %]
|
||
[% IF ( ms_value ) %]
|
||
<input type="text" title="Type search term" class="transl1" id = "translControl1" name="q" value="[% ms_value | html %]" /><span id="translControl"></span>
|
||
[% ELSE %]
|
||
<input type="text" title="Type search term" class="transl1" id = "translControl1" name="q" /><span id="translControl"></span>
|
||
[% END # /ms_value %]
|
||
|
||
[% UNLESS ( Koha.Preference( 'OpacAddMastheadLibraryPulldown' ) == 1 ) %]
|
||
<button type="submit" id="searchsubmit" class="btn btn-primary">Go</button>
|
||
</div>
|
||
[% END %]
|
||
|
||
[% IF ( Koha.Preference( 'OpacAddMastheadLibraryPulldown' ) == 1 ) %]
|
||
<div class="input-append">
|
||
<select name="branch_group_limit" id="select_library">
|
||
<option value="">All libraries</option>
|
||
|
||
[% IF LibrarySearchGroups %]<optgroup label="Libraries">[% END %]
|
||
|
||
[% FOREACH library IN Branches.all( selected => opac_name ) %]
|
||
[% IF library.selected %]
|
||
<option selected="selected" value="branch:[% library.branchcode | html %]">[% library.branchname | html %]</option>
|
||
[% ELSE %]
|
||
<option value="branch:[% library.branchcode | html %]">[% library.branchname | html %]</option>
|
||
[% END %]
|
||
[% END %]
|
||
|
||
[% IF LibrarySearchGroups %]
|
||
</optgroup>
|
||
<optgroup label="Groups">
|
||
[% FOREACH lsg IN LibrarySearchGroups %]
|
||
[% IF lsg.id == opac_name %]
|
||
<option selected="selected" value="multibranchlimit-[% lsg.id | html %]">[% lsg.title | html %]</option>
|
||
[% ELSE %]
|
||
<option value="multibranchlimit-[% lsg.id | html %]">[% lsg.title | html %]</option>
|
||
[% END # / bc.selected %]
|
||
[% END %]
|
||
</optgroup>
|
||
[% END # / BranchCategoriesLoop %]
|
||
</select>
|
||
<button type="submit" id="searchsubmit" class="btn btn-primary">Go</button>
|
||
</div>
|
||
[% ELSE %]
|
||
[% IF ( opac_limit_override ) %]
|
||
[% IF ( opac_search_limit ) %]
|
||
[% IF ( multibranchlimit = opac_search_limit.match( 'branch:(multibranchlimit-\d+)' ) ) %]
|
||
<input name="branch_group_limit" value="[% multibranchlimit.0 | html %]" type="hidden" />
|
||
[% ELSE %]
|
||
<input name="limit" value="[% opac_search_limit | html %]" type="hidden" />
|
||
[% END %]
|
||
[% END %]
|
||
[% ELSE %]
|
||
[% IF ( mylibraryfirst ) %]
|
||
<input name="limit" value="branch:[% mylibraryfirst | html %]" type="hidden" />
|
||
[% END %]
|
||
[% END # / opac_limit_override %]
|
||
[% END # / OpacAddMastheadLibraryPulldown %]
|
||
|
||
</form>
|
||
[% ELSE # / Koha.Preference('OpacCustomSearch') == '' %]
|
||
[% Koha.Preference('OpacCustomSearch') | $raw %]
|
||
[% END # / Koha.Preference('OpacCustomSearch') == '' %]
|
||
</div> <!-- / .mastheadsearch -->
|
||
[% END # / UNLESS advsearch %]
|
||
|
||
<div class="row-fluid">
|
||
<div id="moresearches">
|
||
<ul>
|
||
<li><a href="/cgi-bin/koha/opac-search.pl">Advanced search</a></li>
|
||
[% IF ( Koha.Preference( 'UseCourseReserves' ) == 1 ) %]<li><a href="/cgi-bin/koha/opac-course-reserves.pl">Course reserves</a></li>[% END %]
|
||
[% IF Koha.Preference( 'OpacBrowser' ) == 1 %]<li><a href="/cgi-bin/koha/opac-browser.pl">Browse by hierarchy</a></li>[% END %]
|
||
[% IF Koha.Preference( 'OpacAuthorities' ) == 1 %]<li><a href="/cgi-bin/koha/opac-authorities-home.pl">Authority search</a></li>[% END %]
|
||
[% IF ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) && ( Koha.Preference( 'reviewson' ) == 1 ) && ( Koha.Preference( 'OpacShowRecentComments' ) == 1 ) ) %]<li><a href="/cgi-bin/koha/opac-showreviews.pl">Recent comments</a></li>[% END %]
|
||
[% IF Koha.Preference( 'TagsEnabled' ) == 1 %]<li><a href="/cgi-bin/koha/opac-tags.pl">Tag cloud</a></li>[% END %]
|
||
[% IF Koha.Preference( 'OpacCloud' ) == 1 %]<li><a href="/cgi-bin/koha/opac-tags_subject.pl">Subject cloud</a></li>[% END %]
|
||
[% IF Koha.Preference( 'OpacTopissue' ) == 1 %]<li><a href="/cgi-bin/koha/opac-topissues.pl">Most popular</a></li>[% END %]
|
||
[% IF Koha.Preference('SearchEngine') == 'Elasticsearch' && Koha.Preference( 'OpacBrowseSearch' ) == 1 %]<li><a href="/cgi-bin/koha/opac-browse.pl">Browse search</a></li>[% END %]
|
||
[% IF Koha.Preference( 'suggestion' ) == 1 %]
|
||
[% IF Koha.Preference( 'AnonSuggestions' ) == 1 %]
|
||
<li><a href="/cgi-bin/koha/opac-suggestions.pl">Purchase suggestions</a></li>
|
||
[% ELSIF ( ( Koha.Preference( 'OPACViewOthersSuggestions' ) == 1 ) ) %]
|
||
<li><a href="/cgi-bin/koha/opac-suggestions.pl">Purchase suggestions</a></li>
|
||
[% END %]
|
||
[% END %]
|
||
[% Koha.Preference('OpacMoreSearches') | $raw %]
|
||
</ul>
|
||
</div> <!-- /#moresearches -->
|
||
</div> <!-- /.row-fluid -->
|
||
|
||
[% END # / OpacPublic %]
|
||
</div> <!-- /.span10 -->
|
||
</div> <!-- /.opac-main-search -->
|
||
</div> <!-- / .row-fluid -->
|
||
</div> <!-- /.container-fluid -->
|
||
|
||
<!-- Login form hidden by default, used for modal window -->
|
||
<div id="loginModal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="modalLoginLabel" aria-hidden="true">
|
||
<div class="modal-header">
|
||
<button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
|
||
<h3 id="modalLoginLabel">Log in to your account</h3>
|
||
</div>
|
||
<form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="modalAuth">
|
||
<input type="hidden" name="has-search-query" id="has-search-query" value="" />
|
||
<div class="modal-body">
|
||
[% IF ( shibbolethAuthentication ) %]
|
||
[% IF ( invalidShibLogin ) %]
|
||
<!-- This is what is displayed if shibboleth login has failed to match a koha user -->
|
||
<div class="alert alert-info">
|
||
<p>Sorry, your Shibboleth identity does not match a valid library identity. If you have a local login, you may use that below.</p>
|
||
</div>
|
||
[% ELSE %]
|
||
<h4>Shibboleth login</h4>
|
||
<p>If you have a Shibboleth account, please <a href="[% shibbolethLoginUrl | $raw %]">click here to login</a>.</p>
|
||
<h4>Local Login</h4>
|
||
[% END %]
|
||
[% END %]
|
||
<input type="hidden" name="koha_login_context" value="opac" />
|
||
<fieldset class="brief">
|
||
<label for="muserid">Login:</label><input type="text" id="muserid" name="userid" />
|
||
<label for="mpassword">Password:</label><input type="password" id="mpassword" name="password" />
|
||
[% IF Koha.Preference( 'OpacLoginInstructions' ) %]
|
||
<div id="nologininstructions-modal" class="nologininstructions">
|
||
[% Koha.Preference( 'OpacLoginInstructions' ) | $raw %]
|
||
</div>
|
||
[% END %]
|
||
[% IF Koha.Preference('OpacPasswordChange') && Categories.can_any_reset_password %]
|
||
<div id="forgotpassword-modal" class="forgotpassword">
|
||
<a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a>
|
||
</div>
|
||
[% END %]
|
||
[% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]
|
||
<div id="patronregistration-modal" class="patronregistration">
|
||
<p>Don't have an account? <a href="/cgi-bin/koha/opac-memberentry.pl">Register here.</a></p>
|
||
</div>
|
||
[% END %]
|
||
</fieldset>
|
||
</div>
|
||
<div class="modal-footer">
|
||
<input type="submit" class="btn btn-primary" value="Log in" />
|
||
</div>
|
||
</form> <!-- /#auth -->
|
||
</div> <!-- /#modalAuth -->
|