X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6a3cadb52d010b333a4acea8942bc4c13394e236..d075fc4c1f3e7a17b4c71e7a06fd6cf318e0ef2f:/app/views/user/account.html.erb

diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb
index ba5b652ac..741737559 100644
--- a/app/views/user/account.html.erb
+++ b/app/views/user/account.html.erb
@@ -29,7 +29,7 @@
 
   <tr>
     <td class="fieldName" ><%= t 'user.account.openid.openid' %></td>
-    <td><%= f.text_field :openid_url, {:class => "openid_url"} %> <span class="minorNote">(<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)</span></td>
+    <td><%= f.text_field :openid_url, {:id => "openid_url", :class => "openid_url"} %> <span class="minorNote">(<a href="<%= t 'user.account.openid.link' %>" target="_new"><%= t 'user.account.openid.link text' %></a>)</span></td>
   </tr>
 
   <tr>
@@ -43,6 +43,24 @@
     </td>
   </tr>
 
+  <tr>
+    <td class="fieldName" valign="top"><%= t 'user.account.contributor terms.heading' %></td>
+    <td>
+      <% if @user.terms_agreed? %>
+        <%= t 'user.account.contributor terms.agreed' %>
+        <span class="minorNote">(<a href="<%= t 'user.account.contributor terms.link' %>" target="_new"><%= t 'user.account.contributor terms.link text' %></a>)</span>
+        <br />
+        <% if @user.consider_pd? %>
+          <%= t 'user.account.contributor terms.agreed_with_pd' %>
+        <% end %>
+      <% else %>
+        <%= t 'user.account.contributor terms.not yet agreed' %> <br />
+
+        <%= link_to t('user.account.contributor terms.review link text'), :controller => 'user', :action => 'terms' %>
+      <% 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>
@@ -53,6 +71,11 @@
     <td><%= f.text_field :languages %></td>
   </tr>
 
+  <tr>
+    <td class="fieldName" valign="top"><%= t 'user.account.preferred editor' %></td>
+    <td><%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{DEFAULT_EDITOR}.name")), 'default']] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %></td>
+  </tr>
+
   <tr>
     <td class="fieldName" valign="top">
       <%= t 'user.account.image' %>
@@ -83,14 +106,14 @@
 
   <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>
+    <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" class="user_map" style="border:1px solid black; position:relative; width:500px; height:400px;"></div>
+      <div id="map" class="user_map"></div>
     </td>
   </tr>
   
@@ -101,7 +124,7 @@
 </table>
 <% end %>
 
-<%= render :partial => 'map' %>
+<%= render :partial => 'map', :locals => { :setting_location => true,  :show_other_users => false } %>
 
 <% unless @user.data_public? %>
 <a name="public"></a>