Bug 21526: Use the 'url' filter when needed
[koha.git] / koha-tmpl / opac-tmpl / bootstrap / en / includes / masthead.inc
index 1ccd2be..e9e42b2 100644 (file)
@@ -1,4 +1,6 @@
+[% USE raw %]
 [% USE Koha %]
+[% USE Branches %]
 [% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
 <div id="wrap">
     <div id="header-region" class="noprint">
@@ -8,7 +10,7 @@
                     <h1 id="logo">
                         <a class="brand" href="/cgi-bin/koha/opac-main.pl">
                             [% IF ( LibraryNameTitle ) %]
-                                [% LibraryNameTitle %]
+                                [% LibraryNameTitle | html %]
                             [% ELSE %]
                                 Koha online
                             [% END %]
                     [% END %]
                     <ul class="nav">
                         [% IF ( Koha.Preference( 'opacbookbag' ) == 1 ) %]
-                            <li class="dropdown">
-                                <a href="#" title="Collect items you are interested in" class="dropdown-toggle" id="cartmenulink" data-toggle="dropdown" role="button">
-                                    <i id="carticon" class="icon-shopping-cart icon-white"></i> <span class="cartlabel">Cart</span> <span id="basketcount"></span> <b class="caret"></b>
+                            <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>
-                                <ul aria-labelledby="cartmenulink" role="menu" class="dropdown-menu">
-                                    <li role="presentation">
-                                        <a href="#" id="cartmenuitem" class="cart-message" tabindex="-1" role="menuitem">Your cart is empty.</a>
-                                    </li>
-                                </ul>
                             </li>
                         [% END %]
                         [% IF ( Koha.Preference( 'virtualshelves' ) == 1 ) && ( Koha.Preference( 'opacbookbag' ) == 1 ) %]
                         [% 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="icon-list icon-white"></i> <span class="listslabel">Lists</span> <b class="caret"></b></a>
+                                <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 ( pubshelves ) %]
-                                            <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?display=publicshelves" tabindex="-1" role="menuitem"><strong>Public lists</strong></a></li>
-                                        [% FOREACH pubshelvesloo IN pubshelvesloop %]
-                                            <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=[% pubshelvesloo.shelfnumber %]&amp;sortfield=[% pubshelvesloo.sortfield %]" tabindex="-1" role="menuitem">[% pubshelvesloo.shelfname |html %]</a></li>
-                                        [% END %]
-                                            <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?display=publicshelves" tabindex="-1" role="menuitem" class="listmenulink">View All</a></li>
-                                    [% ELSE %]
-                                        <li role="presentation"><a href="#" tabindex="-1" class="menu-inactive" role="menuitem">No public lists</a></li>
+                                [% IF some_public_shelves.count %]
+                                    <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;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&amp;shelfnumber=[% s.shelfnumber | uri %]&amp;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 %]
-                                    <li class="divider" role="presentation"></li>
-                                    [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
-                                        <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves" tabindex="-1" role="menuitem"><strong>Your lists</strong></a></li>
-                                        [% IF ( loggedinusername ) %]
-                                            [% IF ( barshelves ) %]
-                                                [% FOREACH barshelvesloo IN barshelvesloop %]
-                                                    <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=[% barshelvesloo.shelfnumber %]&amp;sortfield=[% barshelvesloo.sortfield %]" tabindex="-1" role="menuitem">[% barshelvesloo.shelfname |html %]</a></li>
-                                                [% END %]
-                                                <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves" tabindex="-1" role="menuitem" class="listmenulink">View all</a></li>
-                                            [% ELSE %]
-                                                <li role="presentation"><a href="#" tabindex="-1" class="menu-inactive" role="menuitem">No private lists</a></li>
-                                                <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves" tabindex="-1" role="menuitem" class="listmenulink">New list</a></li>
+                                    [% IF some_public_shelves > 10 %]
+                                        <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;category=2" 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 public lists</a></li>
+                                [% END %]
+                                <li class="divider" role="presentation"></li>
+                                [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
+                                    <li role="presentation"><a href="/cgi-bin/koha/opac-shelves.pl?op=list&amp;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&amp;shelfnumber=[% s.shelfnumber | uri %]&amp;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&amp;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 %]
+                                        [% IF Koha.Preference('casAuthentication') %]
+                                            [%# CAS authentication is too complicated for modal window %]
+                                            <li role="presentation"><a href="/cgi-bin/koha/opac-user.pl" tabindex="-1" class="menu-inactive" role="menuitem">Log in to create your own lists</a></li>
                                         [% ELSE %]
                                             <li role="presentation"><a href="/cgi-bin/koha/opac-user.pl" tabindex="-1" class="menu-inactive loginModal-trigger" role="menuitem">Log in to create your own lists</a></li>
-                                        [% END # / IF loggedinusername %]
-                                    [% END # / IF opacuserlogin %]
+                                        [% END %]
+                                    [% END # / IF loggedinusername %]
+                                [% END # / IF opacuserlogin %]
                                 </ul> <!-- / .dropdown-menu -->
                             </li> <!-- / .dropdown -->
                         [% END # / IF virtualshelves %]
                     </ul> <!-- / .nav -->
                     [% IF Koha.Preference( 'virtualshelves' ) == 1 %]<div id="listsDetails"></div>[% END %]
-                    [% IF Koha.Preference( 'opacuserlogin' ) == 1 || EnableOpacSearchHistory %]
-                        <a id="user-menu-trigger" class="pull-right" href="#"><i class="icon-user"></i> <span class="caret"></span></a>
+                    [% IF Koha.Preference( 'opacuserlogin' ) == 1 || opaclanguagesdisplay || EnableOpacSearchHistory %]
+                        <a id="user-menu-trigger" class="pull-right" href="#"><i class="fa fa-user fa-icon-white"></i> <span class="caret"></span></a>
                         <div id="members">
                             <ul class="nav pull-right">
-                                [% IF OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'top' %]
-                                    [% IF ( opaclanguagesdisplay ) %]
-                                        [% IF ( languages_loop && opaclanguagesdisplay ) %]
-                                            [% UNLESS ( one_language_enabled ) %]
-                                            <li class="dropdown">
-                                              <a href="#" title="Switch languages" class="dropdown-toggle" id="langmenu" data-toggle="dropdown" role="button"><i class="icon-flag icon-white"></i> <span class="langlabel">Languages</span> <b class="caret"></b></a>
-                                              <ul aria-labelledby="langmenu" role="menu" class="dropdown-menu">
-                                              [% FOREACH languages_loo IN languages_loop.sort('rfc4646_subtag') %]
-                                                  [% IF ( languages_loo.group_enabled ) %]
-                                                      [% IF ( languages_loo.plural ) %]
-                                                          [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
-                                                              [% IF ( sublanguages_loo.enabled ) %]
-                                                                  [% IF ( sublanguages_loo.sublanguage_current ) %]
-                                                                  <li role="presentation"> <a href="#" tabindex="-1" class="menu-inactive" role="menuitem">[% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %]&nbsp;<i class="icon-ok"></i></a></li>
-                                                                  [% ELSE %]
-                                                                  <li role="presentation"><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag %]"  tabindex="-1" role="menuitem" class="listmenulink"> [% sublanguages_loo.native_description %] [% sublanguages_loo.script_description %] [% sublanguages_loo.region_description %] [% sublanguages_loo.variant_description %]</a></li>
-                                                                  [% END %]
-                                                              [% END # / IF sublanguages_loo.enabled %]
-                                                          [% END # / FOREACH sublanguages_loo %]
-                                                      [% ELSE %]
-                                                          [% IF ( languages_loo.group_enabled ) %]
-                                                              [% IF ( languages_loo.current ) %]
-                                                              <li role="presentation"><a href="#" tabindex="-1" class="menu-inactive" role="menuitem">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]&nbsp;<i class="icon-ok"></i></a></li>
-                                                              [% ELSE %]
-                                                              <li role="presentation"><a href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag %]"  tabindex="-1" role="menuitem" class="listmenulink">[% IF ( languages_loo.native_description ) %][% languages_loo.native_description %][% ELSE %][% languages_loo.rfc4646_subtag %][% END %]</a></li>
-                                                              [% END %]
-                                                          [% END # / IF languages_loo.current %]
-                                                      [% END # / IF ( languages_loo.plural ) %]
-                                                  [% END # / IF ( languages_loo.group_enabled ) %]
-                                              [% END # / FOREACH languages_loo IN languages_loop %]
-                                              </ul> <!-- /# .dropdown-menu -->
-                                            </li> <!-- / .dropdown -->
-                                            [% END # / UNLESS ( one_language_enabled ) %]
-                                        [% END # / IF ( languages_loop && opaclanguagesdisplay ) %]
-                                    [% END # / IF opaclanguagesdisplay %]
-                                [% END # / IF OpacLangSelectorMode %]
+
+                                [% INCLUDE 'masthead-langmenu.inc' %]
+
                                 [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
                                     [% UNLESS ( loggedinusername ) %]
                                         [% IF Koha.Preference('casAuthentication') %]
                                             [%# CAS authentication is too complicated for modal window %]
-                                            <li><a href="/cgi-bin/koha/opac-user.pl">Log in to your account</a></li>
+                                            <li><a class="login-link" href="/cgi-bin/koha/opac-user.pl">Log in to your account</a></li>
+                                        [% ELSIF ( Koha.Preference('GoogleOpenIDConnect') == 1 ) %]
+                                            <li><a class="login-link" href="/cgi-bin/koha/svc/auth/googleopenidconnect" role="button" data-toggle="modal">Log in to your account</a></li>
                                         [% ELSE %]
-                                            <li><a href="/cgi-bin/koha/opac-user.pl" class="loginModal-trigger" role="button" data-toggle="modal">Log in to your account</a></li>
+                                            <li><a href="/cgi-bin/koha/opac-user.pl" class="login-link loginModal-trigger" role="button" data-toggle="modal">Log in to your account</a></li>
                                         [% END %]
                                     [% END %]
                                     [% IF ( loggedinusername ) %]
-                                        <li><p class="members navbar-text">Welcome, <a href="/cgi-bin/koha/opac-user.pl"><span class="loggedinusername">[% FOREACH USER_INF IN USER_INFO %][% USER_INF.title %] [% USER_INF.firstname %] [% USER_INF.surname %][% END %]</span></a></p></li>
+                                        <li><p class="members navbar-text">Welcome, <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 %]" >[% INCLUDE 'patron-title.inc' patron = logged_in_user no_html = 1 %]</span></a></p></li>
                                         <li class="divider-vertical"></li>
                                     [% END %]
                                 [% END %]
                                 [% IF EnableOpacSearchHistory %]
-                                    <li><p class="navbar-text"><a href="/cgi-bin/koha/opac-search-history.pl" title="View your search history">Search history</a> [<a class="logout" href="/cgi-bin/koha/opac-search-history.pl?action=delete" title="Delete your search history" onclick="return confirm(MSG_DELETE_SEARCH_HISTORY);">x</a>]</p></li>
+                                    <li><p class="navbar-text"><a class="login-link" href="/cgi-bin/koha/opac-search-history.pl" title="View your search history">Search history</a> [<a class="logout clearsh" href="/cgi-bin/koha/opac-search-history.pl?action=delete" title="Delete your search history">x</a>]</p></li>
                                     <li class="divider-vertical"></li>
                                 [% END %]
                                 [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
                                     [% IF ( loggedinusername ) %]
                                         <li><p class="navbar-text">
-                                            [% IF persona %]
-                                                <a class="logout" id="logout" href="/cgi-bin/koha/opac-main.pl?logout.x=1" onclick='navigator.id.logout();'>
-                                            [% ELSE %]
-                                                <a class="logout" id="logout" href="/cgi-bin/koha/opac-main.pl?logout.x=1">
-                                            [% END %]
+                                            <a class="logout" id="logout" href="/cgi-bin/koha/opac-main.pl?logout.x=1">
                                             Log out</a></p></li>
                                     [% END %]
                                 [% END %]
             <div class="container-fluid">
                 <div class="row-fluid">
                     <div id="opacheader">
-                        [% opacheader %]
+                        [% opacheader | $raw %]
                     </div>
                 </div>
             </div>
     <div class="container-fluid">
         <div class="row-fluid">
             <div id="opac-main-search">
-    <!--             <div class="span2">
-        [% IF ( opacsmallimage ) %]
-            <h1 id="libraryname" style="background-image: url('[% opacsmallimage %]');">
-        [% ELSE %]
-            <h1 id="libraryname">
-        [% END %]
-            <a href="/cgi-bin/koha/opac-main.pl">[% IF ( LibraryName ) %][% LibraryName %][% ELSE %]Koha Online Catalog[% END %]</a></h1>
-    </div> /.span2 -->
             <div class="span12">
                 [% IF ( OpacPublic ) %]
                     [% UNLESS ( advsearch ) %]
                                 <label for="masthead_search"> Search
                                     [% UNLESS ( Koha.Preference( 'OpacAddMastheadLibraryPulldown' ) == 1 ) %]
                                         [% IF ( mylibraryfirst ) %]
-                                            (in [% mylibraryfirst %] only)
+                                            (in [% Branches.GetName( mylibraryfirst ) | html %] only)
                                         [% END %]
                                     [% END %]
                                 </label>
                                 [% ELSE %]
                                     <option value="se">Series</option>
                                 [% END # /ms_se %]
-                                [% IF ( numbersphr ) %]
+                                [% IF ( Koha.Preference('OPACNumbersPreferPhrase') ) %]
                                     [% IF ( ms_callnum ) %]
                                             <option selected="selected" value="callnum,phr">Call number</option>
                                     [% ELSE %]
                                     [% ELSE %]
                                         <option value="callnum">Call number</option>
                                     [% END # /ms_callnum %]
-                                [% END # /numbersphr %]
+                                [% 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>
+                                    <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 %]
                                     <div class="input-append">
                                         <select name="branch_group_limit" id="select_library">
                                             <option value="">All libraries</option>
-                                            [% IF BranchCategoriesLoop %]<optgroup label="Libraries">[% END %]
-                                                [% FOREACH BranchesLoo IN BranchesLoop %]
-                                                    [% IF ( BranchesLoo.selected ) %]<option selected="selected" value="branch:[% BranchesLoo.value %]">[% BranchesLoo.branchname %]</option>
-                                                    [% ELSE %]<option value="branch:[% BranchesLoo.value %]">[% BranchesLoo.branchname %]</option>[% END %]
+
+                                            [% 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 %]
-                                            [% IF BranchCategoriesLoop %]
+                                            [% END %]
+
+                                            [% IF LibrarySearchGroups %]
                                                 </optgroup>
                                                 <optgroup label="Groups">
-                                                    [% FOREACH bc IN BranchCategoriesLoop %]
-                                                        [% IF ( bc.selected ) %]
-                                                            <option selected="selected" value="multibranchlimit-[% bc.categorycode %]">[% bc.categoryname %]</option>
+                                                    [% 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-[% bc.categorycode %]">[% bc.categoryname %]</option>
+                                                            <option value="multibranchlimit-[% lsg.id | html %]">[% lsg.title | html %]</option>
                                                         [% END # / bc.selected %]
                                                     [% END %]
                                                 </optgroup>
                                 [% ELSE %]
                                     [% IF ( opac_limit_override ) %]
                                         [% IF ( opac_search_limit ) %]
-                                            <input name="limit" value="[% opac_search_limit %]" type="hidden" />
+                                            <input name="limit" value="[% opac_search_limit | html %]" type="hidden" />
                                         [% END %]
                                     [% ELSE %]
                                         [% IF ( mylibraryfirst ) %]
-                                            <input name="limit" value="branch:[% mylibraryfirst %]" type="hidden" />
+                                            <input name="limit" value="branch:[% mylibraryfirst | html %]" type="hidden" />
                                         [% END %]
                                     [% END # / opac_limit_override %]
                                 [% END # / OpacAddMastheadLibraryPulldown %]
 
                             </form>
                         [% ELSE # / Koha.Preference('OpacCustomSearch') == '' %]
-                            [% Koha.Preference('OpacCustomSearch') %]
+                            [% Koha.Preference('OpacCustomSearch') | $raw %]
                         [% END # / Koha.Preference('OpacCustomSearch') == '' %]
                         </div> <!-- / .mastheadsearch -->
                     [% END # / UNLESS advsearch %]
             <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 ( 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>
+                        <!-- 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 %]">click here to login</a>.</p>
-                    <h4>Local Login</h4>
+                        <h4>Shibboleth login</h4>
+                        <p>If you have a Shibboleth account, please <a href="[% shibbolethLoginUrl | url %]">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') && Koha.Preference('OpacResetPassword') %]
+                        <div id="forgotpassword-modal" class="forgotpassword">
+                            <a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a>
+                        </div>
                     [% 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( 'NoLoginInstructions' ) %]
-                        <div id="nologininstructions-modal">
-                            [% Koha.Preference( 'NoLoginInstructions' ) %]
+                    [% 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 %]
-                        [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]<div id="mpatronregistration"><p>Don't have an account? <a href="/cgi-bin/koha/opac-memberentry.pl">Register here.</a></p></div>[% END %]
-                    </fieldset>
+                </fieldset>
             </div>
             <div class="modal-footer">
                 <input type="submit" class="btn btn-primary" value="Log in" />
-                <a href="#" data-dismiss="modal" aria-hidden="true" class="cancel">Cancel</a>
             </div>
         </form> <!-- /#auth -->
     </div>  <!-- /#modalAuth  -->