From 85c387f8486c4b1bfcc36978cbc5b13c9a73a1b2 Mon Sep 17 00:00:00 2001
From: Tomas Cohen Arazi <tomascohen@gmail.com>
Date: Fri, 15 Aug 2014 10:47:29 -0300
Subject: [PATCH] Bug 12683: (followup) use the Koha.Preference plugin and add
 ids

It is kosher now to use the Koha template toolkit plugin for retrieving
system preferences values. This followup does that.

It also changes the class for ids, for people considering this patch
introduces too much noise on the home screen being able to control
its visibility.

Regards
To+

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
---
 C4/Auth.pm                                             | 1 -
 koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc | 8 ++++----
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt  | 8 ++++----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 0f153af..2b8a036 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -421,7 +421,6 @@ 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 61f1308..2ee0ed9 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
@@ -285,11 +285,11 @@
                     <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" />
-                        <div class="NoLoginInstructions">
-                           [% IF ( NoLoginInstructions ) %]
-                              [% NoLoginInstructions %]
-                           [% END %]
+                    [% IF Koha.Preference( 'NoLoginInstructions' ) %]
+                        <div id="nologininstructions-modal">
+                            [% Koha.Preference( 'NoLoginInstructions' ) %]
                         </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>
             </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 b4c957c..450506e 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
@@ -78,11 +78,11 @@
                                     </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>
-                                    <div class="NoLoginInstructions">
-                                    [% IF ( NoLoginInstructions ) %]
-                                        [% NoLoginInstructions %]
-                                    [% END %]
+                                [% IF Koha.Preference( 'NoLoginInstructions' ) %]
+                                    <div id="nologininstructions-main">
+                                        [% Koha.Preference( 'NoLoginInstructions' ) %]
                                     </div>
+                                [% END %]
                                 </form>
                             </div> <!-- /#login -->
                         [% END # /casAuthentication %]
-- 
1.9.1