diff options
| author | guntasgrewal <guntasgrewal@gmail.com> | 2014-03-04 17:58:18 -0500 |
|---|---|---|
| committer | guntasgrewal <guntasgrewal@gmail.com> | 2014-03-04 17:58:18 -0500 |
| commit | e587dc3fab34724d06eceb042c6e9eed6a7d95f4 (patch) | |
| tree | 051b58b2f9e22b305068a58a3b059e49e3b2fbf9 /app/views/sessions | |
| parent | d2b1f26cf41c6e1f887069c6c31bf3677416b993 (diff) | |
| parent | c6ba6c11c7f0665064efdfc9385a5b8e1deaee50 (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/views/sessions')
| -rw-r--r-- | app/views/sessions/new.html.erb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index a820b2f..550a54d 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -1,6 +1,6 @@ <h1>Sign in</h1> -<% if @fail %> - <p class="error">Email and password combination not found</p> +<% if @user.nil? %> + <p class="errors"> The username or password is incorrect. Verify that CAPS LOCK is not on, and then retype the current username and password. </p> <% end %> <div class="row"> <div class="span6 offset3"> |