summaryrefslogtreecommitdiff
path: root/app/views/sessions/new.html.erb
diff options
context:
space:
mode:
authorAndrewMurrell <amurrel@purdue.edu>2014-03-25 17:38:38 -0400
committerAndrewMurrell <amurrel@purdue.edu>2014-03-25 17:38:38 -0400
commit53b4f8028fc987b0cf26a7a073fec7064b4b6d8a (patch)
treed277b31519df83e8a1c060b04c6ea6cf50b5c361 /app/views/sessions/new.html.erb
parent0c22c4bd9a0b4a0b0ff5840c1af41c0b320e3529 (diff)
revert Guntas
Diffstat (limited to 'app/views/sessions/new.html.erb')
-rw-r--r--app/views/sessions/new.html.erb24
1 files changed, 21 insertions, 3 deletions
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 55c9eca..b4acf77 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -1,5 +1,23 @@
-<h1>New session</h1>
+<h1>Sign in</h1>
+<% if @user.nil? %>
+ <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 %>
-<%= render 'form' %>
+ <div class="span6 offset3">
+ <%= form_for(:session, url: sessions_path) do |f| %>
+ <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>
-<%= link_to 'Back', sessions_path %>