Use {{count}} instead of {{(node|way_relation)_count}} since {{count}}

[rails.git] / app / views / user / account.rhtml

diff --git a/app/views/user/account.rhtml b/app/views/user/account.rhtml
index 81f72fe04fb4ad5bfa7618c21c0c36bf91e9faaf..15a8f6827054cd2d50a4cbf371a578ac10264c26 100644 (file)
--- a/app/views/user/account.rhtml
+++ b/app/views/user/account.rhtml
@@ -1,19 +1,53 @@
-<h2>User details</h2>
-<table>
-  <tr><td>id</td><td><%= @user.id %></td></tr>
-  <tr><td>email</td><td><%= @user.email %></td></tr>
-  <tr><td>display name</td><td><%= @user.display_name %> (<%= link_to 'change...', :controller => 'user', :action => 'edit' %>)</td></tr>
-  <tr><td>account created</td><td><%= @user.creation_time %> (<%= time_ago_in_words(@user.creation_time) %> ago)</td></tr>
-  <tr><td>description</td><td><%= @user.description %>  (<%= link_to 'change...', :controller => 'user', :action => 'edit' %>)</td></tr>
-</table>
+<h2><%= t 'user.account.my settings' %></h2>
+<%= error_messages_for 'user' %>
+<% form_for :user, @user do |f| %>
+<table id="accountForm">
+  <tr><td class="fieldName"><%= t 'user.new.display name' %></td><td><%= f.text_field :display_name %></td></tr>
+  <tr><td class="fieldName"><%= t 'user.new.email address' %></td><td><%= f.text_field :email, {:size => 50, :maxlength => 255} %> <span class="minorNote"><%= t 'user.account.email never displayed publicly' %></span></td></tr>
+  <tr><td class="fieldName" style="padding-bottom:0px;"><%= t 'user.new.password' %></td><td style="padding-bottom:0px;"><%= f.password_field :pass_crypt, {:value => '', :size => 30, :maxlength => 255} %></td></tr>
+  <tr><td class="fieldName"><%= t 'user.new.confirm password' %></td><td><%= f.password_field :pass_crypt_confirmation, {:value => '', :size => 30, :maxlength => 255} %></td></tr>
 
-<h2>Privacy</h2>
+  <tr>
+  <td class="fieldName" valign="top"><%= t 'user.account.public editing.heading' %></td>
+  <td>
 <% if @user.data_public? %>
-  All your edits are public.
+  <%= t 'user.account.public editing.enabled' %> <span class="minorNote">(<a href="<%= t 'user.account.public editing.enabled link' %>" target="_new"><%= t 'user.account.public editing.enabled link text' %></a>)</span>
 <% else %>
-  Currently your edits are ananymous and people can't find out where you are located. To show what you edited and allow people to contact you through the website, click the button below. This action cannot be reversed.
+  <%= t 'user.account.public editing.disabled' %><span class="minorNote">(<a href="#public"><%= t 'user.account.public editing.disabled link text' %></a>)</span>
+<% end %>
+  </td>
+  </tr>
+
+  <tr><td class="fieldName" valign="top"><%= t 'user.account.profile description' %></td><td><%= f.text_area :description, :rows => '5', :cols => '60' %></td></tr>
+
+  <tr><td class="fieldName" valign="top"><%= t 'user.account.preferred languages' %></td><td><%= f.text_field :languages %></td></tr>
+
+  <tr id="homerow" <% unless @user.home_lat and @user.home_lon %> class="nohome" <%end%> ><td class="fieldName"><%= t 'user.account.home location' %></td><td><em class="message"><%= t 'user.account.no home location' %></em><span class="location"><%= t 'user.account.latitude' %> <%= f.text_field :home_lat, :size => 20, :id => "home_lat" %><%= t 'user.account.longitude' %><%= f.text_field :home_lon, :size => 20, :id => "home_lon" %></span></td></tr>
+
+  <tr><td></td><td>
+  <p><%= t 'user.account.update home location on click' %> <input type="checkbox" value="1" <% unless @user.home_lat and @user.home_lon %> checked="checked" <% end %> id="updatehome" /> </p>
+  <div id="map" style="border:1px solid black; position:relative; width:500px; height:400px;"></div>
+  </td></tr>
+  
+  <tr><td></td><td align=right><br/></br><%= submit_tag t('user.account.save changes button') %></td></tr>
+</table>
+<br/>
+
+<% end %>
+
+<%= render :partial => 'friend_map' %>
+<% unless @user.data_public? %>
+<a name="public"></a>
+<h2>Public editing</h2>
+  Currently your edits are anonymous and people can't send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below.
+  <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">find out why</a>).<br />
+  Your email address will not be revealed by becoming public.<br />
+  This action cannot be reversed and all new users are now public by default.<br />
   <br /><br />
-  <%= start_form_tag :controller => 'user', :action => 'go_public'%>
-  <%= submit_tag 'Make all my edits public, forever' %>
-  <%= end_form_tag %>
+  <%= button_to t('user.account.make all my edits public button'), :action => :go_public %>
 <% end %>
+<br/>
+<br/>
+<%= link_to t('user.account.return to profile'), :controller => 'user', :action => @user.display_name %>
+<br/>
+<br/>