X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d6d0a2b1a61a0326bbb8eb3392e48b448ffa8d4f..42ef10ba80bf7ff13b4f9210e5fbf54538e0d52f:/app/views/user/account.html.erb?ds=sidebyside

diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb
index 85e9aebef..7047b5b82 100644
--- a/app/views/user/account.html.erb
+++ b/app/views/user/account.html.erb
@@ -38,6 +38,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>
@@ -48,6 +66,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' %>