diff options
| author | DavisLWebb <davislwebb@ymail.com> | 2014-03-04 16:27:11 -0500 |
|---|---|---|
| committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-04 16:27:11 -0500 |
| commit | 2eb8e1c090071abf3108828efc831f12128e17df (patch) | |
| tree | a1410e2cc118db1b410808b7f339e4c5f52bd43c /app/views/sessions/new.html.erb | |
| parent | fb76b4db64583def6db3aac43e31c25d3bd489df (diff) | |
| parent | aca85cf084702c29014a17eafb090421061fae8b (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Conflicts:
app/assets/stylesheets/scaffolds.css.scss
app/views/games/index.html.erb
db/migrate/20140304043618_create_servers.rb
db/migrate/20140304043622_create_matches.rb
db/migrate/20140304043631_create_games.rb
Diffstat (limited to 'app/views/sessions/new.html.erb')
| -rw-r--r-- | app/views/sessions/new.html.erb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb index f942cf6..a820b2f 100644 --- a/app/views/sessions/new.html.erb +++ b/app/views/sessions/new.html.erb @@ -1,5 +1,7 @@ <h1>Sign in</h1> - +<% if @fail %> + <p class="error">Email and password combination not found</p> +<% end %> <div class="row"> <div class="span6 offset3"> <%= form_for(:session, url: sessions_path) do |f| %> @@ -13,6 +15,6 @@ <%= f.submit "Sign in", class: "btn btn-large btn-primary" %> <% end %> - <p>New user? <%= link_to "Sign up now!", signup_path %></p> + <p>New user? <%= link_to "Sign up now!", new_user_path %></p> </div> </div> |