Attachment 28301 Details for Bug 7867 – [SIGNED-OFF] Bug 7867 - Further tweaks on error messages related to login

[patch] [SIGNED-OFF] Bug 7867 - Further tweaks on error messages related to login

SIGNED-OFF-Bug-7867---Further-tweaks-on-error-mess.patch (text/plain), 4.72 KB, created by Bernardo Gonzalez Kriegel on 2014-05-17 01:29:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernardo Gonzalez Kriegel

Created: 2014-05-17 01:29:42 UTC

Size: 4.72 KB

patch

obsolete

>From c7032fe0d747a9bdf3e2b9f0f4f0616f62104724 Mon Sep 17 00:00:00 2001
>From: Mark Tompsett <mtompset@hotmail.com>
>Date: Thu, 15 May 2014 10:39:46 -0400
>Subject: [PATCH] [SIGNED-OFF] Bug 7867 - Further tweaks on error messages
> related to login
>
>As per Jonathan Druart's comments, self-checkout and error
>messages related to logging in were tweaked.
>
>TEST PLAN
>----------
>1) Purposefully fail to log in properly with staff client.
>   -- it should say username.
>2) Purposefully fail to log in properly with opac.
>   -- it should say username.
>3) Re-run 2 with for both prog and bootstrap themes.
>4) Purposefully fail to log in properly with self-checkout.
>   -- you should be prompted username and error should say
>      username as well.
>6) apply patch.
>7) Re-run the steps, but this time messages should be related
>   to login and not username.
>8) run koha-qa test tools.
>
>Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
>Work as described. No errors.
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt    |    4 ++--
> .../opac-tmpl/bootstrap/en/modules/opac-auth.tt    |    2 +-
> koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt   |    2 +-
> .../opac-tmpl/prog/en/modules/sco/sco-main.tt      |    4 ++--
> 4 files changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
>index ea7e3d3..2584fae 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
>@@ -3,7 +3,7 @@
>     [% IF ( nopermission ) %]Access denied[% END %]
>     [% IF ( timed_out ) %]Session timed out[% END %]
>     [% IF ( different_ip ) %]IP address change[% END %]
>-    [% IF ( invalid_username_or_password ) %]Invalid username or password[% END %]
>+    [% IF ( invalid_username_or_password ) %]Invalid login or password[% END %]
>     [% IF ( loginprompt ) %]Log in to Koha[% END %]
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -39,7 +39,7 @@
> [% END %]
> 
> [% IF ( invalid_username_or_password ) %]
>-<div id="login_error"><strong>Error: </strong>Invalid username or password</div>
>+<div id="login_error"><strong>Error: </strong>Invalid login or password</div>
> [% END %]
> 
> 
>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 ce0d838..e6d899a 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
>@@ -53,7 +53,7 @@
>                             [% IF ( invalid_username_or_password ) %]
>                                 
>                                 <div class="alert alert-info">
>-                                    <p>You entered an incorrect username or password. Please try again! And remember, usernames and passwords are case sensitive.</p>
>+                                    <p>You entered an incorrect login or password. Please try again! And remember, logins and passwords are case sensitive.</p>
>                                 </div>
>                             [% END %]
> 
>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 da87da5..ef53de6 100644
>--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt
>+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt
>@@ -43,7 +43,7 @@
> 
> [% IF ( invalid_username_or_password ) %]
> 
>-<p>You entered an incorrect username or password. Please try again! And remember, usernames and passwords are case sensitive.</p>
>+<p>You entered an incorrect login or password. Please try again! And remember, usernames and passwords are case sensitive.</p>
> [% END %]
> 
> [% IF ( casAuthentication ) %]
>diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt
>index e117f25..1bc1058 100644
>--- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt
>+++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt
>@@ -312,8 +312,8 @@ Sorry, this self-checkout station has lost authentication.  Please contact the a
>        [% IF ( authbylogin ) %]
> 	<fieldset class="checkout">
>        <legend>Please login with your username and password</legend>
>-       <label for="patronlogin">Username:</label>
>-	<input type="text" id="patronlogin" class="focus" size="20" name="patronlogin" />
>+       <label for="patronlogin">Login:</label>
>+        <input type="text" id="patronlogin" class="focus" size="20" name="patronlogin" title="Please enter your username or card number." />
>        <label for="patronpw">Password:</label>
> 	<input type="password" id="patronpw" size="20" name="patronpw" />
>        [% ELSE %]
>-- 
>1.7.9.5

Actions: View | Diff | Splinter Review

Attachments on bug 7867: 12412 | 12460 | 26828 | 26831 | 28137 | 28282 | 28301 | 28349 | 28350 | 28457 | 28458