From 3a75985ce95525afe25bb9d4f30dad15d3214dfa Mon Sep 17 00:00:00 2001
From: Mark Tompsett <mtompset@hotmail.com>
Date: Fri, 21 Sep 2012 11:43:38 +0200
Subject: [PATCH] Bug 7867: Staff and OPAC login areas lack consistency
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This patch:
- Changes the Staff client's login area text from "Username:"
   into "Login:", since login is more generic than username.
- Adds a tool tip to the staff client's login area 'Login:'
   textbox: "Please enter your username or card number."
- Adds a tool tip to the main OPAC screen's login area 'Login:'
   textbox using the bootstrap theme:
   "Please enter your username or card number."
- Adds a tool tip to the main OPAC screen's login area 'Login:'
   textbox using the prog theme:
   "Please enter your username or card number."
- Adds a tool tip to the OPAC screen triggered by clicking the
   'Log in to your account' link in the top right using the
   bootstrap theme: "Please enter your username or card number."
- Adds a tool tip to the OPAC screen triggered by clicking the
   'Log in to your account' link in the top right using the
   bootstrap theme: "Please enter your username or card number."

NOTE: koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt was
      modified similarly as well, though I don't think it can be
      triggered, since the modal login screen of bootstrap is
      triggered by the 'Log in to your account' link, and it no
      longer goes to page it did before. The page still exists
      by going there by pasting in the known URL.

TEST PLAN
---------
 1) Go to staff client.
 2) Log in and change the OPAC system preference opacthemes to
    'bootstrap'.
 3) Logout.
 4) Go to OPAC in a different tab.
    -- notice staff client's "Username:" differs from the
       OPAC's "Login" text.
 5) Click the 'Log in to your account' link in the top right.
    -- notice staff client's "Username:" differs from the
       OPAC's "Login" text.
 6) Go to http://YOUROPAC/cgi-bin/koha/opac-user.pl
    -- notice staff client's "Username:" differs from the
       OPAC's "Login" text.
 7) Log in to the staff client and change the OPAC system
     preference opacthemes to 'prog'.
 8) Logout
 9) In the OPAC tab, reload the page.
    -- notice staff client's "Username:" differs from the
       OPAC's "Login" text.
10) Click the icon in the top left to return to the main Koha
    screen.
    -- notice staff client's "Username:" differs from the
       OPAC's "Login" text.
11) Apply the patch
12) Repeat steps 1-10 again.
    -- The textbox associated with the login should have a
       tooltip: "Please enter your username or card number."
13) Run the koha qa test tool.

Followed test plan (without qa test tool). Login screens display as expected.
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt        | 4 ++--
 koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt  | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt  | 2 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt       | 2 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt       | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
index 5f97758..ea7e3d3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
@@ -48,8 +48,8 @@
 [% FOREACH INPUT IN INPUTS %]
     <input type="hidden" name="[% INPUT.name |html %]" value="[% INPUT.value |html %]" />
 [% END %]
-<p><label for="userid">Username:</label>
-<input type="text" name="userid" id="userid" class="input focus" value="[% userid %]" size="20" tabindex="1" />
+<p><label for="userid">Login:</label>
+<input type="text" name="userid" id="userid" class="input focus" value="[% userid %]" size="20" tabindex="1" title="Please enter your username or card number." />
 </p>
 <p><label for="password">Password:</label>
 <input type="password" name="password" id="password" class="input" value="" size="20" tabindex="2" />
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
index d17f893..9a3b43d 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
@@ -279,7 +279,7 @@
             <div class="modal-body">
                     <input type="hidden" name="koha_login_context" value="opac" />
                     <fieldset class="brief">
-                        <label for="muserid">Login:</label><input type="text" id="muserid" name="userid" />
+                        <label for="muserid">Login:</label><input type="text" id="muserid" name="userid" title="Please enter your username or card number." />
                         <label for="mpassword">Password:</label><input type="password" id="mpassword" name="password" />
                     [% 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>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
index e031d90..ce0d838 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
@@ -91,7 +91,7 @@
                                         <input type="hidden" name="[% INPUT.name |html %]" value="[% INPUT.value |html %]" />
                                     [% END %]
                                     <label for="userid">Login</label>
-                                    <input type="text"  size="25" id="userid"  name="userid" />
+                                    <input type="text"  size="25" id="userid"  name="userid" title="Please enter your username or card number." />
                                     <label for="password">Password</label><input type="password"  size="25" id="password"  name="password" />
                                 </fieldset>
 
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..945d5af 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
@@ -71,7 +71,7 @@
                                     <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="userid">Login:</label><input type="text" id="userid" name="userid" title="Please enter your username or card number." />
                                         <label for="password">Password:</label><input type="password" id="password" name="password" />
                                     <fieldset class="action">
                                         <input type="submit" value="Log in" class="btn" />
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt
index c06e234..da87da5 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt
@@ -80,7 +80,7 @@ please choose against which one you would like to authenticate: </p>
 [% END %]
 <ol>
 <li><label for="userid">Login</label>
-<input type="text"  size="25" id="userid"  name="userid" /></li>
+<input type="text"  size="25" id="userid"  name="userid" title="Please enter your username or card number." /></li>
 <li><label for="password">Password</label><input type="password"  size="25" id="password"  name="password" /></li>
 </ol></fieldset>
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt
index a1be710..42654b1 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt
@@ -53,7 +53,7 @@
 	<fieldset class="brief">
         <legend>Log in to your account:</legend>
 		<ol>
-		<li><label for="userid">Login:</label><input type="text" id="userid" size="10" name="userid" /></li>
+            <li><label for="userid">Login:</label><input type="text" id="userid" size="10" name="userid" title="Please enter your username or card number." /></li>
 		<li><label for="password">Password:</label><input type="password" id="password" size="10" name="password" /></li>
 		</ol>	 <fieldset class="action">
 	 <input type="submit" value="Log In" class="submit" />
-- 
2.0.0.rc2