Allow users to change their password from the account page, and get rid
of the separate edit page that (partially) duplicated the account page.
This commit is contained in:
parent
afe8ffffe9
commit
2afcb4b222
5 changed files with 13 additions and 19 deletions
|
@ -1,10 +1,12 @@
|
|||
<h2>User details</h2>
|
||||
<%= error_messages_for 'user' %>
|
||||
<% form_tag :controller => 'user', :action => 'edit', :display_name => @user.display_name do %>
|
||||
<% form_tag :controller => 'user', :action => 'account', :display_name => @user.display_name do %>
|
||||
<table style="width : 100%">
|
||||
<tr><td>Name</td><td><%= @user.email %></td></tr>
|
||||
<tr><td>Mapper since</td><td><%= @user.creation_time %> (<%= time_ago_in_words(@user.creation_time) %> ago)</td></tr>
|
||||
<tr><td>Display Name</td><td><%= text_field :user, :display_name, :value => @user.display_name %></td></tr>
|
||||
<tr><td>Password</td><td><%= password_field('user', 'pass_crypt',{:value => '', :size => 50, :maxlength => 255}) %></td></tr>
|
||||
<tr><td>Confirm Password</td><td><%= password_field('user', 'pass_crypt_confirmation',{:value => '', :size => 50, :maxlength => 255}) %></td></tr>
|
||||
<tr id="homerow" <% unless @user.home_lat and @user.home_lon %> class="nohome" <%end%> ><td>Your home</td><td><em class="message">You have not entered your home location.</em><span class="location">Latitude: <%= text_field :user, :home_lat, :value => @user.home_lat, :size => 20, :id => "home_lat" %> Longitude <%= text_field :user, :home_lon, :value => @user.home_lon, :size => 20, :id => "home_lon" %></span> </td></tr>
|
||||
|
||||
<tr><td></td><td>
|
||||
|
|
|
@ -1,12 +0,0 @@
|
|||
<h2>Edit details:</h2>
|
||||
<%= error_messages_for 'user' %>
|
||||
<% form_tag :controller => 'user', :action => 'edit', :display_name => User.find(@user.id).display_name do %>
|
||||
<table>
|
||||
<tr><td>display name</td><td><%= text_field :user, :display_name, :value => @user.display_name %></td></tr>
|
||||
<tr><td valign="top">description</td><td><%= text_area :user, :description, :value => @user.description %></td></tr>
|
||||
<tr><td>home latitude</td><td><%= text_field :user, :home_lat, :value => @user.home_lat %></td>
|
||||
<tr><td>home longitude</td><td><%= text_field :user, :home_lon, :value => @user.home_lon %></td>
|
||||
|
||||
</table>
|
||||
<%= submit_tag 'Change' %>
|
||||
<% end %>
|
Loading…
Add table
Add a link
Reference in a new issue