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/games/index.html.erb           |  2 +-
 app/views/sessions/new.html.erb          | 22 +++++++++++-----------
 app/views/tournaments/_selected.html.erb |  2 +-
 app/views/users/new.html.erb             |  6 +++---
 4 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'app/views')

diff --git a/app/views/games/index.html.erb b/app/views/games/index.html.erb
index 7ee69d1..9893cbc 100644
--- a/app/views/games/index.html.erb
+++ b/app/views/games/index.html.erb
@@ -1,6 +1,6 @@
 <h1>Listing games</h1>
 
-<table>
+<table class="table table-hover">
   <thead>
     <tr>
       <th>Name</th>
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>
+
diff --git a/app/views/tournaments/_selected.html.erb b/app/views/tournaments/_selected.html.erb
index 4277d8e..5058c56 100644
--- a/app/views/tournaments/_selected.html.erb
+++ b/app/views/tournaments/_selected.html.erb
@@ -18,7 +18,7 @@
       <% next %>
     <% end %>
     <% if name == "created_at" %>
-      <% break %>
+      <% break %> 
     <% end %>
   <p>
     <label for=<%= name %>><%= name.capitalize.gsub('_', ' ') %></label>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 704aa10..c23f76d 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -19,14 +19,14 @@
     <%= f.password_field :password %>
   </p>
   <p>
-    <%= f.label :password_confirm %><br>
+    <%= f.label(:password_confirmation, "Confirm Password") %><br>
     <%= f.password_field :password_confirmation %>
   </p>
   <p>
-    <%= f.submit %>
+    <%= f.submit("Be a Leaguer", :class => "signup") %>
   </p>
 <% end %>
 
 
-<%= link_to 'Already Have an Account? Log in', new_session_path, :class => "btn btn-warning btn-lg" %>
+<%= link_to 'Already Have an Account? Log in', new_session_path, :class => "signin" %>
 
-- 
cgit v1.2.3-2-g168b