From 1bc9765d043169dfeb569e25659f553f39dc466b Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 7 Jul 2020 18:36:32 +0000
Subject: [PATCH] Bug 23797: (follow-up) Enable OpacLoginInstructions in header

The OpacLoginInstructions information should be available in the login
modal which is displayed when the login link in the header menu is
clicked.

Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
index c1784458e3..dca9a0a2e6 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
@@ -7,6 +7,7 @@
 [% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
 [% SET OpacHeader = KohaNews.get( location => "opacheader", lang => lang, library => branchcode, blocktitle => 0 ) %]
 [% SET OpacCustomSearch = KohaNews.get( location => "OpacCustomSearch", lang => lang, library => branchcode, blocktitle => 0 ) %]
+[% SET OpacLoginInstructions = KohaNews.get( location => "OpacLoginInstructions", lang => lang, library => branchcode ) %]
 
 <div id="wrap">
     <div id="header-region" class="noprint">
@@ -358,9 +359,9 @@
                 <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' ) %]
+                    [% IF ( OpacLoginInstructions ) %]
                         <div id="nologininstructions-modal" class="nologininstructions">
-                            [% Koha.Preference( 'OpacLoginInstructions' ) | $raw %]
+                            [% PROCESS koha_news_block news => OpacLoginInstructions %]
                         </div>
                     [% END %]
                     [% IF Koha.Preference('OpacPasswordChange') && Categories.can_any_reset_password %]
-- 
2.39.5