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/sessions')

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


From a421aace7383bb6718d23eed1bde02659a7a93ff Mon Sep 17 00:00:00 2001
From: Tomer Kimia <tkimia@purdue.edu>
Date: Thu, 6 Mar 2014 15:57:26 -0500
Subject: login fixed and some views look better

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

(limited to 'app/views/sessions')

diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 6d73b1f..6439b9f 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -2,22 +2,22 @@
 <% if @user.nil? %>
   <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.label :user_name %>
-      <%= f.text_field :user_name%>
-
-      <%= f.label :password %>
+    <p>
+      <%= f.label(:username_or_email, "Username/Email")  %><br/>
+      <%= f.text_field :username_or_email%>
+    </p>
+    <p>
+      <%= f.label :password %><br/>
       <%= f.password_field :password %>
-
+    </p>
+    <p>
       <%= f.submit "Sign in", class: "btn btn-large btn-primary" %>
+    </p>
     <% end %>
 
     <p>New user? <%= link_to "Sign up now!", new_user_path %></p>
   </div>
-</div>
+
-- 
cgit v1.2.3-2-g168b


From 240d8602fb6aaf249b33db7b0c2f8a72add63658 Mon Sep 17 00:00:00 2001
From: Tomer Kimia <tkimia@purdue.edu>
Date: Thu, 6 Mar 2014 16:09:22 -0500
Subject: tournaments table only shows if tournaments exits

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

(limited to 'app/views/sessions')

diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 6439b9f..398cb49 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -18,6 +18,6 @@
     </p>
     <% end %>
 
-    <p>New user? <%= link_to "Sign up now!", new_user_path %></p>
+    <p>New user? <%= link_to("Sign up now!", new_user_path) %></p>
   </div>
 
-- 
cgit v1.2.3-2-g168b


From 110d67f433c091a3b739c5bbebe110d963efaa73 Mon Sep 17 00:00:00 2001
From: DavisLWebb <davislwebb@ymail.com>
Date: Thu, 6 Mar 2014 17:38:47 -0500
Subject: no

---
 app/views/sessions/new.html.erb | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'app/views/sessions')

diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 6d73b1f..2b40ed9 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -1,23 +1,22 @@
 <h1>Sign in</h1>
 <% if @user.nil? %>
-  <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>
+  <p class="errors"> The email/username or password is incorrect. Verify that CAPS LOCK is not on, and then retype the current email/username 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.label :user_name %>
-      <%= f.text_field :user_name%>
-
-      <%= f.label :password %>
+    <p>
+      <%= f.label(:username_or_email, "Username/Email") %><br/>
+      <%= f.text_field :username_or_email%>
+    </p>
+    <p>
+      <%= f.label :password %><br/>
       <%= f.password_field :password %>
-
+    </p>
+    <p>
       <%= f.submit "Sign in", class: "btn btn-large btn-primary" %>
+    </p>
     <% end %>
 
-    <p>New user? <%= link_to "Sign up now!", new_user_path %></p>
+    <p>New user? <%= link_to("Sign up now!", new_user_path) %></p>
   </div>
-</div>
-- 
cgit v1.2.3-2-g168b