Merge remote-tracking branch 'upstream/pull/2898'

[rails.git] / app / views / users / reset_password.html.erb

diff --git a/app/views/users/reset_password.html.erb b/app/views/users/reset_password.html.erb
index afa4cb202f3ad500eeab01ff8f470032db4ebaf9..99f07cab6d6bff7dda0ac74e11e6545a85c43ae2 100644 (file)
--- a/app/views/users/reset_password.html.erb
+++ b/app/views/users/reset_password.html.erb
@@ -1,20 +1,10 @@
 <% content_for :heading do %>
-  <h1><%= t '.heading', :user => current_user.display_name %></h1>
+  <h1><%= t ".heading", :user => current_user.display_name %></h1>
 <% end %>
 
-<%= error_messages_for current_user %>
-
-<%= form_tag do %>
-<%= hidden_field_tag(:token, params[:token]) %>
-  <div class="standard-form">
-    <fieldset>
-      <label class="standard-label"><%= t '.password' %></label>
-      <%= password_field(:user, :pass_crypt, :value => '', :tabindex => 4) %>
-    </fieldset>
-    <fieldset>
-      <label class="standard-label"><%= t '.confirm password' %></label>
-      <%= password_field(:user, :pass_crypt_confirmation, :value => '', :tabindex => 5) %>
-    </fieldset>
-    <%= submit_tag t('.reset'), :tabindex => 6 %>
-  </div>
+<%= bootstrap_form_for current_user, :url => { :action => "reset_password" }, :html => { :method => :post } do |f| %>
+  <%= f.hidden_field :token, :name => "token", :value => params[:token] %>
+  <%= f.password_field :pass_crypt, :value => "" %>
+  <%= f.password_field :pass_crypt_confirmation, :value => "" %>
+  <%= f.primary t(".reset") %>
 <% end %>