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

[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 3f011a5fda13da714711fa52c6c08beb72c65da3..4cb94374ade7f47069d80448106efad3320194c2 100644 (file)
--- a/app/views/user/reset_password.html.erb
+++ b/app/views/user/reset_password.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
-  <h1><%= t 'user.reset_password.heading', :user => @user.display_name %></h1>
+  <h1><%= t 'user.reset_password.heading', :user => current_user.display_name %></h1>
 <% end %>
 
 <%= error_messages_for :user %>
@@ -8,11 +8,11 @@
 <%= hidden_field_tag(:token, params[:token]) %>
   <div class="standard-form">
     <fieldset>
-      <label><%= t 'user.reset_password.password' %></label>
+      <label class="standard-label"><%= t 'user.reset_password.password' %></label>
       <%= password_field(:user, :pass_crypt, {:value => '', :tabindex => 4}) %>
     </fieldset>
     <fieldset>
-      <label><%= t 'user.reset_password.confirm password' %></label>
+      <label class="standard-label"><%= t 'user.reset_password.confirm password' %></label>
       <%= password_field(:user, :pass_crypt_confirmation, {:value => '', :tabindex => 5}) %>
     </fieldset>
     <%= submit_tag t('user.reset_password.reset'), :tabindex => 6 %>