X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=koha-tmpl%2Fopac-tmpl%2Fbootstrap%2Fen%2Fmodules%2Fopac-main.tt;h=2b5abed26e788da0afd492cf24305630500bf48b;hb=d43eea51dd9653efbf6d7cee5a6ea9bd65591b1d;hp=8df87091d7a1b90f198c7a12ad12f8a7f89659c4;hpb=473a2d90d6eb1b814e66de0fc3a59882fed04c83;p=srvgit

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 8df87091d7..2b5abed26e 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
@@ -2,7 +2,15 @@
 [% USE Koha %]
 [% USE KohaDates %]
 [% USE Branches %]
+[% USE Categories %]
 [% USE Price %]
+[% USE AdditionalContents %]
+[% PROCESS 'i18n.inc' %]
+[% 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' %]
@@ -12,14 +20,22 @@
 [% INCLUDE 'masthead.inc' %]
 
 <div class="main">
-    <ul class="breadcrumb">
-        <li><a href="/cgi-bin/koha/opac-main.pl">Home</a>
-        [% IF news_item %]
-            <span class="divider">&rsaquo;</span></li>
-            <li>[% news_item.title %]</li>
-        [% END %]
-        </li>
-    </ul>
+    <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">
+                    <a href="#" aria-current="page">[% news_item.title | html %]</a>
+                </li>
+            [% ELSE %]
+                <li class="breadcrumb-item active">
+                    <a href="#" aria-current="page">Home</a>
+                </li>
+            [% END %]
+        </ol>
+    </nav> <!-- /#breadcrumbs -->
 
     [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
         [% IF ( loggedinusername ) %]
@@ -31,39 +47,47 @@
         <div id="notloggedin" class="container-fluid">
     [% END %]
 
-    <div class="row-fluid">
-    [% IF ( OpacNav ||  OpacNavBottom ) %]
-        <div class="span2">
-            <div id="navigation">
-                [% INCLUDE 'navigation.inc' %]
+    <div class="row">
+        [% IF ( OpacNav ||  OpacNavBottom ) %]
+            <div class="col-12 col-lg-2 order-3 order-lg-1">
+                <div id="navigation">
+                    [% INCLUDE 'navigation.inc' %]
+                </div>
             </div>
-        </div>
-    [% END %]
+        [% END %]
 
-    [% IF ( OpacNav ||  OpacNavBottom  ) && (Koha.Preference( 'opacuserlogin' ) == 1 || OpacNavRight) %]
-        <div class="span7">
-    [% ELSIF (Koha.Preference( 'opacuserlogin' ) == 1 || OpacNavRight) %]
-        <div class="span9">
-    [% ELSIF ( OpacNav ||  OpacNavBottom  ) %]
-        <div class="span10">
-    [% ELSE %]
-        <div class="span12">
-    [% END %]
-            [% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %]
+        [% IF ( OpacNav ||  OpacNavBottom  ) && (Koha.Preference( 'opacuserlogin' ) == 1 || OpacNavRight) %]
+            [% #  Three-column layout with right and left sidebars %]
+            <div class="col-12 col-lg-7 order-md-1 maincontent">
+        [% ELSIF (Koha.Preference( 'opacuserlogin' ) == 1 || OpacNavRight) %]
+            [% #  Two-column layout with right sidebar %]
+            <div class="col-12 col-lg-9 order-md-1 maincontent">
+        [% ELSIF ( OpacNav ||  OpacNavBottom  ) %]
+            <div class="col-12 col-lg-10 order-md-1 maincontent">
+        [% ELSE %]
+            <div class="col order-md-1 maincontent">
+        [% END %]
+
+        <h1 class="sr-only">Koha home</h1>
+
+        [% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %]
+            [% UNLESS news_item %]
                 <form id="news-branch-select" class="form-inline" name="news-branch-select" method="get" action="/cgi-bin/koha/opac-main.pl">
-                <label for="news-branch">Display news for: </label>
-                <select id="news-branch" name="branch">
-                [% IF ( branchcode == "" ) %]
-                <option value="" selected="selected">system-wide only</option>
-                [% ELSE %]
-                <option value=""         >system-wide only</option>
-                [% END %]
-                [% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode, unfiltered => 1, ) %]
-                </select>
+                    <legend class="sr-only">News</legend>
+                    <label for="news-branch">Display news for: </label>
+                    <select id="news-branch" name="branch">
+                        [% IF ( branchcode == "" ) %]
+                            <option value="" selected="selected">System-wide only</option>
+                        [% ELSE %]
+                            <option value="">System-wide only</option>
+                        [% END %]
+                        [% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode, unfiltered => 1, ) %]
+                    </select>
                 </form>
             [% END %]
+        [% END %]
 
-        [% IF ( koha_news ) %]
+        [% IF koha_news.count %]
 
             [% IF single_news_error %]
 
@@ -73,51 +97,55 @@
 
             [% ELSE %]
 
-            <div id="news" class="newscontainer">
-                [% SET newsdisp = ( Koha.Preference('NewsAuthorDisplay') ) %]
-                [% FOREACH koha_new IN koha_news %]
-                    <div class="newsitem">
-                        <a name="newsitem[% koha_new.idnew | html %]" href="/cgi-bin/koha/opac-main.pl?news_id=[% koha_new.idnew %]"><h4 class="newsheader">[% koha_new.title | html %]</h4></a>
-                        <div class="newsbody">[% koha_new.content | $raw %]</div>
-                        <div class="newsfooter">(published on [% koha_new.timestamp | $KohaDates with_hours = 1 | html %][% IF ( (newsdisp == 'opac' || newsdisp == 'both') && koha_new.borrowernumber ) %] by <span class="newsauthor_title">[% koha_new.author_title | html %] </span>[% koha_new.author_firstname | html %] [% koha_new.author_surname | html %][% END %][% IF ( koha_new.expirationdate ) %], expiry on [% koha_new.expirationdate %][% END %])</div>
-                    </div>
-                [% END %]
-            </div>
-
-            [% END %]
-
-            [% UNLESS news_item %] <!-- unless single news item -->
-
-            <div id="rssnews-container">
-                <!-- Logged in users have a branch code or it could be explicitly set -->
-                <a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-news-rss.pl?branchcode=[% branchcode | uri %]"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png"></a>
-                [% IF Branches.all.size == 1 %]
-                    [% IF branchcode %]
-                        RSS feed for [% Branches.GetName( branchcode ) | html %] library news.
-                    [% ELSE %]
-                        RSS feed for library news.
-                    [% END %]
-                [% ELSE %]
-                    [% IF branchcode %]
-                        RSS feed for [% Branches.GetName( branchcode ) | html %] and system-wide library news.
-                    [% ELSE %]
-                        RSS feed for system-wide library news.
+                <div id="news" class="newscontainer">
+                    [% SET show_author = Koha.Preference('NewsAuthorDisplay') == 'opac' || Koha.Preference('NewsAuthorDisplay') == 'both' %]
+                    [% FOREACH koha_new IN koha_news %]
+                        <div class="newsitem">
+                            <h4 class="newsheader">
+                                [% IF ( news_item ) %]
+                                    [% koha_new.title | html %]
+                                [% ELSE %]
+                                    <a name="newsitem[% koha_new.idnew | html %]" href="/cgi-bin/koha/opac-main.pl?news_id=[% koha_new.idnew | uri %]">[% koha_new.title | html %]</a>
+                                [% END %]
+                            </h4>
+                            <div class="newsbody">[% koha_new.content | $raw %]</div>
+                            <div class="newsfooter">
+                                Published on [% koha_new.published_on | $KohaDates %]
+                                [% IF ( show_author && koha_new.author ) %]
+                                    by <span class="newsauthor">[% INCLUDE 'patron-title.inc' patron=koha_new.author %]</span>
+                                [% END %]
+                                [% IF ( news_item ) %]
+                                    &bull; <a href="/cgi-bin/koha/opac-main.pl">Show all news</a>
+                                [% END %]
+                            </div>
+                        </div>
                     [% END %]
-                [% END %]
-            </div>
 
-            [% IF ( display_daily_quote && daily_quote ) %]
-                <div id="daily-quote">
-                    <h3>Quote of the day</h3>
-                    <div>
-                        <span id="daily-quote-text">[% daily_quote.text | html %]</span><span id="daily-quote-sep"> ~ </span><span id="daily-quote-source">[% daily_quote.source | html %]</span>
-                    </div>
+                    [% UNLESS news_item %]
+                        <div id="rssnews-container">
+                            <!-- Logged in users have a branch code or it could be explicitly set -->
+                            <a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-news-rss.pl?branchcode=[% branchcode | uri %]">
+                                <i class="fa fa-rss" aria-hidden="true"></i>
+                                [% IF Branches.all.size == 1 %]
+                                    [% IF branchcode %]
+                                        RSS feed for [% Branches.GetName( branchcode ) | html %] library news
+                                    [% ELSE %]
+                                        RSS feed for library news
+                                    [% END %]
+                                [% ELSE %]
+                                    [% IF branchcode %]
+                                        RSS feed for [% Branches.GetName( branchcode ) | html %] and system-wide library news
+                                    [% ELSE %]
+                                        RSS feed for system-wide library news
+                                    [% END %]
+                                [% END %]
+                            </a>
+                        </div>
+                    [% END %]
                 </div>
-            [% END %]
 
-            [% IF ( OpacMainUserBlock ) %]<div id="opacmainuserblock">[% OpacMainUserBlock | $raw %]</div>[% END %]
+            [% END # /IF single_news_error %]
 
-            [% END %] <!-- single news item -->
         [% ELSE %] <!-- koha news -->
             [% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %]
                 <div id="news" class="newscontainer">
@@ -127,30 +155,53 @@
                     </div>
                 </div>
             [% END %]
+
+        [% END # IF koha_news %]
+
+        [% UNLESS news_item # Don't show under single news item %]
+            [% IF ( daily_quote ) %]
+                <div id="daily-quote">
+                    <h2>Quote of the day</h2>
+                    <div>
+                        <span id="daily-quote-text">[% daily_quote.text | html %]</span><span id="daily-quote-sep"> ~ </span><span id="daily-quote-source">[% daily_quote.source | html %]</span>
+                    </div>
+                </div>
+            [% END %]
+
+            [% IF ( OpacMainUserBlock ) %]
+                [% PROCESS koha_news_block news => OpacMainUserBlock %]
+            [% END %]
         [% END %]
-        </div> <!-- / .span 7/9 -->
+
+        </div> <!-- / .col 6/8 -->
 
         [% IF ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) || OpacNavRight ) %]
-            <div class="span3">
+            <div class="col-12 col-lg-3 order-md-2">
                 [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
                     [% UNLESS ( loggedinusername ) %]
-                        [% UNLESS ( casAuthentication || shibbolethAuthentication ) %]
+                        [% UNLESS ( casAuthentication || shibbolethAuthentication || Koha.Preference('opacShibOnly') ) %]
                             <div id="login">
                                 <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth" autocomplete="off">
                                     <input type="hidden" name="koha_login_context" value="opac" />
                                     <fieldset class="brief">
                                         <legend>Log in to your account:</legend>
-                                        <label for="userid">Login:</label><input type="text" id="userid" name="userid" />
-                                        <label for="password">Password:</label><input type="password" id="password" name="password" />
+                                        [% IF ( Koha.Preference('GoogleOpenIDConnect') == 1 ) %]
+                                            <a href="/cgi-bin/koha/svc/auth/googleopenidconnect" class="btn btn-light" id="openid_connect"><i class="fa fa-google" aria-hidden="true"></i> Log in with Google</a>
+                                            <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" autocomplete="off" />
+                                        <label for="password">Password:</label>
+                                        <input class="form-control" type="password" id="password" name="password" autocomplete="off" />
                                         <fieldset class="action">
-                                            <input type="submit" value="Log in" class="btn" />
+                                            <input type="submit" value="Log in" class="btn btn-primary" />
                                         </fieldset>
-                                        [% IF Koha.Preference( 'OpacLoginInstructions' ) %]
+                                        [% IF ( OpacLoginInstructions ) %]
                                             <div id="nologininstructions-main" class="nologininstructions">
-                                                [% Koha.Preference( 'OpacLoginInstructions' ) | $raw %]
+                                                [% PROCESS koha_news_block news => OpacLoginInstructions %]
                                             </div>
                                         [% END %]
-                                        [% IF Koha.Preference('OpacPasswordChange') && Koha.Preference('OpacResetPassword') %]
+                                        [% IF Koha.Preference('OpacPasswordChange') && Categories.can_any_reset_password %]
                                             <div id="forgotpassword-main" class="forgotpassword">
                                                 <p><a href="/cgi-bin/koha/opac-password-recovery.pl">Forgot your password?</a></p>
                                             </div>
@@ -167,38 +218,77 @@
                     [% ELSE %]
                         [% IF Koha.Preference('OPACUserSummary') && dashboard_info %]
                             <div id="user_summary">
-                                <h3>Welcome, <a href="/cgi-bin/koha/opac-user.pl"><span class="loggedinusername">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</span></a></h3>
+                                <h2>User summary</h2>
+                                <p>Welcome, <a href="/cgi-bin/koha/opac-user.pl"><span class="loggedinusername">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</span></a></p>
                                 <ul id="user_summary_shortcuts">
                                     [% IF checkouts && checkouts > 0 %]
-                                        <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-checkouts"><span class="user_checkouts_count count_label">[% checkouts | html %]</span> checkout(s)</a></li>
+                                        <li>
+                                            <a href="/cgi-bin/koha/opac-user.pl#opac-user-checkouts">
+                                                <span class="user_checkouts_count count_label">[% checkouts | html %]</span>
+                                                [% tn('checkout', 'checkouts', checkouts ) | html %]
+                                            </a>
+                                        </li>
                                     [% END %]
                                     [% IF overdues && overdues > 0 %]
-                                        <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-overdues"><span class="user_overdues_count count_label">[% overdues | html %]</span> overdue(s)</a></li>
+                                        <li>
+                                            <a href="/cgi-bin/koha/opac-user.pl#opac-user-overdues">
+                                                <span class="user_overdues_count count_label">[% overdues | html %]</span>
+                                                [% tn('overdue', 'overdues', overdues ) | html %]
+                                            </a>
+                                        </li>
                                     [% END %]
                                     [% IF holds_pending && holds_pending > 0 %]
-                                        <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-holds"><span class="user_holds_pending_count count_label">[% holds_pending | html %]</span> hold(s) pending</a></li>
+                                        <li>
+                                            <a href="/cgi-bin/koha/opac-user.pl#opac-user-holds">
+                                                <span class="user_holds_pending_count count_label">[% holds_pending | html %]</span>
+                                                [% tn('hold pending', 'holds pending', holds_pending ) | html %]
+                                            </a>
+                                        </li>
                                     [% END %]
                                     [% IF holds_waiting && holds_waiting > 0 %]
-                                        <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-holds"><span class="user_holds_waiting_count count_label">[% holds_waiting | html %]</span> hold(s) waiting</a></li>
+                                        <li>
+                                            <a href="/cgi-bin/koha/opac-user.pl#opac-user-holds">
+                                                <span class="user_holds_waiting_count count_label">[% holds_waiting | html %]</span>
+                                                [% tn('hold waiting', 'holds waiting', holds_waiting ) | html %]
+                                            </a>
+                                        </li>
                                     [% END %]
                                     [% IF total_owing && total_owing > 0 %]
-                                        <li><a href="/cgi-bin/koha/opac-account.pl"><span class="user_fines_count count_label">[% total_owing | $Price with_symbol => 1 %]</span> due in fines and charges</a></li>
+                                        <li>
+                                            <a href="/cgi-bin/koha/opac-account.pl">
+                                                <span class="user_fines_count count_label">[% total_owing | $Price with_symbol => 1 %]</span>
+                                                due in fines and charges
+                                            </a>
+                                        </li>
+                                    [% END %]
+                                    [% IF patron_messages && patron_messages.count > 0 || opacnote %]
+                                        [% IF opacnote %]
+                                            <li>
+                                                <a href="/cgi-bin/koha/opac-user.pl">
+                                                    <span class="count_label">[% patron_messages.count + 1 | html %]</span>
+                                                    [% tn('message', 'messages', patron_messages.count + 1 ) | html %]
+                                                </a>
+                                            </li>
+                                        [% ELSE %]
+                                            <li>
+                                                <a href="/cgi-bin/koha/opac-user.pl">
+                                                    <span class="count_label">[% patron_messages.count | html %]</span>
+                                                    [% tn('message', 'messages', patron_messages.count ) | html %]
+                                                </a>
+                                            </li>
+                                        [% END %]
                                     [% END %]
                                 </ul>
                             </div>
                         [% END %]
                     [% END # /loggedinusername %]
                 [% END # /opacuserlogin %]
-                [% IF ( OpacNavRight ) %]
-                    <div id="opacnavright">
-                        [% OpacNavRight | $raw %]
-                    </div>
-                [% END # /OpacNavRight %]
-            </div> <!-- / .span3 -->
+                [% PROCESS koha_news_block news => OpacNavRight %]
+            </div> <!-- / .col -->
         [% END # /opacuserlogin || OpacNavRight %]
 
         </div> <!-- /.container-fluid -->
-    </div> <!-- /.row-fluid -->
+    </div> <!-- /.row -->
 </div> <!-- /.main -->
 
 [% INCLUDE 'opac-bottom.inc' %]