summaryrefslogtreecommitdiff
path: root/app/views/sessions/new.html.erb
diff options
context:
space:
mode:
authorTomer Kimia <tkimia@purdue.edu>2014-03-06 15:57:26 -0500
committerTomer Kimia <tkimia@purdue.edu>2014-03-06 15:57:26 -0500
commita421aace7383bb6718d23eed1bde02659a7a93ff (patch)
tree1068eb34bd437d70faa44d123bbb6be6e1bcf6de /app/views/sessions/new.html.erb
parent2c1f214da8885232815cb85ded4ad616aa3d4b79 (diff)
login fixed and some views look better
Diffstat (limited to 'app/views/sessions/new.html.erb')
-rw-r--r--app/views/sessions/new.html.erb22
1 files changed, 11 insertions, 11 deletions
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>
+