From 341395943c5107c29bf438406ac3a7fb14e2fd0b Mon Sep 17 00:00:00 2001
From: simith <simith@inlibro.com>
Date: Thu, 31 Jul 2014 12:48:26 -0400
Subject: [PATCH] Bug 12683 - Use NoLoginInstructions to customize text for
 OPAC user/pass information
Content-Type: text/plain; charset=utf-8

Enable staff to setting a text for OPAC user/pass information

Modified:

C4/Auth.pm
koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc   -add a text to the popup login page
koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-main.tt   -add a text to the main login page

Testing:

I Apply the patch

0) Search NoLoginInstructions preference
1) Add/modify a text
2) Open OPAC main page
3) Validate the text added under Login button
4) Click in "Log in to your account" link
5) Validate the text added under input password (popup)

Sponsored-by: CCSR ( http://www.ccsr.qc.ca )

Patch behaves as expected.
Signed-off-by: Marc Veron <veron@veron.ch>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
---
 C4/Auth.pm                                         |    1 +
 .../opac-tmpl/bootstrap/en/includes/masthead.inc   |    3 +++
 .../opac-tmpl/bootstrap/en/modules/opac-main.tt    |    3 +++
 3 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 2b8a036..0f153af 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -421,6 +421,7 @@ sub get_template_and_user {
             LibraryNameTitle          => "" . $LibraryNameTitle,
             LoginBranchname           => C4::Context->userenv?C4::Context->userenv->{"branchname"}:"",
             OPACAmazonCoverImages     => C4::Context->preference("OPACAmazonCoverImages"),
+            NoLoginInstructions      => C4::Context->preference("NoLoginInstructions"),
             OPACFRBRizeEditions       => C4::Context->preference("OPACFRBRizeEditions"),
             OpacHighlightedWords      => C4::Context->preference("OpacHighlightedWords"),
             OPACItemHolds             => C4::Context->preference("OPACItemHolds"),
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
index b035047..42f679a 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
@@ -285,6 +285,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 ( NoLoginInstructions ) %]
+                        [% NoLoginInstructions %]
+                    [% 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>
             </div>
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 5b68c19..0d792c7 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
@@ -78,6 +78,9 @@
                                     </fieldset>
                                     [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]<div id="patronregistration"><p>Don't have an account? <a href="/cgi-bin/koha/opac-memberentry.pl">Register here.</a></p></div>[% END %]
                                     </fieldset>
+                                    [% IF ( NoLoginInstructions ) %]
+                                        [% NoLoginInstructions %]
+                                    [% END %]
                                 </form>
                             </div> <!-- /#login -->
                         [% END # /casAuthentication %]
-- 
1.7.7.6