From cd020cb3c9f8a1d40af4958c26dcdfb97e1a80c1 Mon Sep 17 00:00:00 2001
From: DavisLWebb <davislwebb@ymail.com>
Date: Thu, 6 Mar 2014 14:23:11 -0500
Subject: Users can now log in with user_name and email but I could not make
 one text box for both

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

(limited to 'app/views')

diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 550a54d..6d73b1f 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -1,13 +1,16 @@
 <h1>Sign in</h1>
 <% 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>
+  <p class="errors">  The email or password is incorrect. Verify that CAPS LOCK is not on, and then retype the current email and password. </p>
 <% end %>
 <div class="row">
   <div class="span6 offset3">
     <%= form_for(:session, url: sessions_path) do |f| %>
 
       <%= f.label :email %>
-      <%= f.text_field :email %>
+      <%= f.text_field :email%>
+
+      <%= f.label :user_name %>
+      <%= f.text_field :user_name%>
 
       <%= f.label :password %>
       <%= f.password_field :password %>
-- 
cgit v1.2.3-2-g168b