From 134360da46c1f8e5153c1c9eb5180ac990150d93 Mon Sep 17 00:00:00 2001
From: Tomer Kimia <tkimia@purdue.edu>
Date: Tue, 4 Mar 2014 17:57:15 -0500
Subject: signin gives error if user cannot sign in

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

(limited to 'app/views')

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">
-- 
cgit v1.2.3-2-g168b


From d2b1f26cf41c6e1f887069c6c31bf3677416b993 Mon Sep 17 00:00:00 2001
From: guntasgrewal <guntasgrewal@gmail.com>
Date: Tue, 4 Mar 2014 17:58:13 -0500
Subject: sign out edit 2

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

(limited to 'app/views')

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" 
-- 
cgit v1.2.3-2-g168b