From 661dbaf902d770dfbefa9ba1d9e4c28fc7abf891 Mon Sep 17 00:00:00 2001
From: Tomer Kimia <tkimia@purdue.edu>
Date: Mon, 3 Mar 2014 21:49:38 -0500
Subject: small things

---
 app/views/sessions/new.html.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'app/views/sessions/new.html.erb')

diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index f942cf6..2e7a0d3 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| %>
-- 
cgit v1.2.3-2-g168b


From 1d90f33bf07f9610d358c6c9c56754784b050541 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Tue, 4 Mar 2014 10:57:54 -0500
Subject: simplify the sessions routing

---
 app/views/sessions/new.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/views/sessions/new.html.erb')

diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 2e7a0d3..a820b2f 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -15,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>
-- 
cgit v1.2.3-2-g168b