Don't show "Browse Map Data" when we're not on the map view

[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..adb714b00d26560a511f27676f06ee259c95afc5 100644 (file)
--- a/app/views/user/reset_password.html.erb
+++ b/app/views/user/reset_password.html.erb
@@ -1,14 +1,14 @@
-<h1><%= t 'user.reset_password.heading' %></h1>
+<h1><%= t 'user.reset_password.heading', :user => @user.display_name %></h1>

 
 <%= error_messages_for :user %>
 
 
 <%= error_messages_for :user %>
 

-<% form_tag do %>
+<%= form_tag do %>

 <%= hidden_field_tag(:token, params[:token]) %>
 <table id="loginForm">
 <%= 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 class="fieldName"><%= t 'user.reset_password.password' %></td><td><%= password_field(:user, :pass_crypt, {:value => '', :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, {:value => '', :size => 30, :maxlength => 255, :tabindex => 5}) %></td></tr>

   
   <tr><td colspan=2>&nbsp;<!--vertical spacer--></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>
+  <tr><td></td><td class="submitButton"><input type="submit" value="<%= t'user.reset_password.reset' %>" tabindex="6"></td></tr>

 </table>
 <% end %>
 </table>
 <% end %>