summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjomo <github@jomo.tv>2015-04-03 20:00:39 +0200
committerjomo <github@jomo.tv>2015-04-03 20:00:39 +0200
commited7dd52db92164ca90b936a35bfcb6266ba7a0f1 (patch)
treea5faa29a030f380d7394a87bc8c456db44ebd57e
parent04c379c3c49b843ec00c77af7de4a885ab0fed7f (diff)
pre-fill email field on wrong password
-rw-r--r--app/views/layouts/_head.html.erb2
-rw-r--r--app/views/sessions/new.html.erb4
-rw-r--r--config/routes.rb2
3 files changed, 4 insertions, 4 deletions
diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index 50f8dd8..44e5d67 100644
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -33,7 +33,7 @@
<% if current_user %>
<span id="userinfo-box">
<%= link_to current_user.name, current_user %><br/>
- <%= link_to "Logout", logout_path %>
+ <%= link_to "Logout", logout_path, method: :delete %>
</span>
<%= link_to current_user.avatar(32), current_user %>
<% else %>
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 1170efa..5cc921f 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -6,11 +6,11 @@
<table>
<tr>
<td><%= label_tag :email %></td>
- <td><%= text_field_tag :email, nil, placeholder: "email@example.com" %></td>
+ <td><%= text_field_tag :email, params[:email], placeholder: "email@example.com", required: true %></td>
</tr>
<tr>
<td><%= label_tag :password %></td>
- <td><%= password_field_tag :password, nil, placeholder: "******" %></td>
+ <td><%= password_field_tag :password, nil, placeholder: "secret", required: true %></td>
</tr>
<tr>
<td></td>
diff --git a/config/routes.rb b/config/routes.rb
index 17c5e42..1caa0ca 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -46,7 +46,7 @@ Redstoner::Application.routes.draw do
post 'login' => 'sessions#create'
get 'become' => 'sessions#become'
get 'revert' => 'sessions#revert'
- get 'logout' => 'sessions#destroy'
+ delete 'logout' => 'sessions#destroy'
get 'signup' => 'users#new'
get '/dmca' => redirect('https://www.youtube.com/watch?v=oHg5SJYRHA0')