diff options
| author | DavisLWebb <davislwebb@ymail.com> | 2014-03-04 17:59:16 -0500 |
|---|---|---|
| committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-04 17:59:16 -0500 |
| commit | 728f874deaf6ceb097d1a5f5cdf7e58a04cec557 (patch) | |
| tree | 6bd1f665e51d73230bde088f044f122e332d58e9 /app/views | |
| parent | 8740f17405abef0f4975f028e33b3029fcb35634 (diff) | |
| parent | e587dc3fab34724d06eceb042c6e9eed6a7d95f4 (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/application.html.erb | 2 | ||||
| -rw-r--r-- | app/views/sessions/new.html.erb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index e13a8df..9cc30bc 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -20,7 +20,7 @@ <div id="log-buttons"> <% if signed_in? %> <%= current_user.user_name.upcase %> - <%= link_to "Sign out", session_path("/signout"), method: "delete", :class => "signout", :role => "button" %> + <%= link_to "Sign out", "/signout", method: "delete", :class => "signout", :role => "button" %> <% else %> <%= link_to "Log in", new_session_path, :class => "signin", :role => "button" %> <%= link_to "Sign up", new_user_path, :class => "signup", :role => "button" 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"> |