Bug 28955: (follow-up) Set to fall back

[srvgit] / koha-tmpl / opac-tmpl / bootstrap / en / modules / opac-main.tt

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
index ffa32a9..2b5abed 100644 (file)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
@@ -6,9 +6,11 @@
 [% USE Price %]
 [% USE AdditionalContents %]
 [% PROCESS 'i18n.inc' %]
-[% SET OpacNavRight = AdditionalContents.get( location => "OpacNavRight", lang => lang, library => branchcode ) %]
-[% SET OpacMainUserBlock = AdditionalContents.get( location => "OpacMainUserBlock", lang => lang, library => branchcode ) %]
-[% SET OpacLoginInstructions = AdditionalContents.get( location => "OpacLoginInstructions", lang => lang, library => branchcode ) %]
+[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
+[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
+[% SET OpacNavRight = AdditionalContents.get( location => "OpacNavRight", lang => lang, library => logged_in_user.branchcode || default_branch ) %]
+[% SET OpacMainUserBlock = AdditionalContents.get( location => "OpacMainUserBlock", lang => lang, library => logged_in_user.branchcode || default_branch ) %]
+[% SET OpacLoginInstructions = AdditionalContents.get( location => "OpacLoginInstructions", lang => lang, library => branchcode || default_branch ) %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -18,22 +20,22 @@
 [% INCLUDE 'masthead.inc' %]
 
 <div class="main">
-    <nav aria-label="breadcrumb">
-        <ul class="breadcrumb">
+    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumbs">
+        <ol class="breadcrumb">
             [% IF news_item %]
                 <li class="breadcrumb-item">
                     <a href="/cgi-bin/koha/opac-main.pl">Home</a>
                 </li>
-                <li class="breadcrumb-item active" aria-current="page">
-                    [% news_item.title | html %]
+                <li class="breadcrumb-item active">
+                    <a href="#" aria-current="page">[% news_item.title | html %]</a>
                 </li>
             [% ELSE %]
-                <li class="breadcrumb-item active" aria-current="page">
-                    <a href="/cgi-bin/koha/opac-main.pl">Home</a>
+                <li class="breadcrumb-item active">
+                    <a href="#" aria-current="page">Home</a>
                 </li>
             [% END %]
-        </ul>
-    </nav>
+        </ol>
+    </nav> <!-- /#breadcrumbs -->
 
     [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
         [% IF ( loggedinusername ) %]
@@ -188,9 +190,9 @@
                                             <p>If you do not have a Google account, but do have a local account, you can still log in: </p>
                                         [% END # /IF GoogleOpenIDConnect %]
                                         <label for="userid">Login:</label>
-                                        <input class="form-control" type="text" id="userid" name="userid" />
+                                        <input class="form-control" type="text" id="userid" name="userid" autocomplete="off" />
                                         <label for="password">Password:</label>
-                                        <input class="form-control" type="password" id="password" name="password" />
+                                        <input class="form-control" type="password" id="password" name="password" autocomplete="off" />
                                         <fieldset class="action">
                                             <input type="submit" value="Log in" class="btn btn-primary" />
                                         </fieldset>