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

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

diff --git a/app/views/user/reset_password.html.erb b/app/views/user/reset_password.html.erb
index 458a6084cffc7118ab60f5b1e52bd7b04e89bed0..51983b94abb42a108df9721cafc522a7747c69d3 100644 (file)
--- a/app/views/user/reset_password.html.erb
+++ b/app/views/user/reset_password.html.erb
@@ -1,14 +1,20 @@
-<h1><%= t 'user.reset_password.heading' %></h1>
+<% content_for :heading do %>
+  <h1><%= t '.heading', :user => current_user.display_name %></h1>
+<% end %>
 
-<%= error_messages_for :user %>
+<%= error_messages_for current_user %>
 
-<% form_tag do %>
+<%= form_tag do %>
 <%= hidden_field_tag(:token, params[:token]) %>
-<table id="loginForm">
-  <tr><td class="fieldName"><%= t 'user.reset_password.password' %></td><td><%= password_field(:user, :pass_crypt,{:size => 30, :maxlength => 255, :tabindex => 4}) %></td></tr>
-  <tr><td class="fieldName"><%= t 'user.reset_password.confirm password' %></td><td><%= password_field(:user, :pass_crypt_confirmation,{:size => 30, :maxlength => 255, :tabindex => 5}) %></td></tr>
-  
-  <tr><td colspan=2>&nbsp;<!--vertical spacer--></td></tr>
-  <tr><td></td><td align=right><input type="submit" value="<%= t'user.reset_password.reset' %>" tabindex="6"></td></tr>
-</table>
+  <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>
 <% end %>