X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9a9e13af901e9d66357135fb39b111fc9e26b3b2..24453e72308c681c3d4a5c8b4a743bab4c4bc5ce:/app/views/user/terms.html.erb?ds=inline diff --git a/app/views/user/terms.html.erb b/app/views/user/terms.html.erb index 23e2ba068..849005274 100644 --- a/app/views/user/terms.html.erb +++ b/app/views/user/terms.html.erb @@ -1,55 +1,31 @@
<%= t 'user.terms.press accept button' %>
+<%= t 'user.terms.read and accept' %>
-<%= t 'user.terms.legale_select' %> -<% form_tag :action => 'terms' do %> - -<% end %>
+ +<%= form_tag :action => 'terms' do %> ++ <%= t 'user.terms.legale_select' %> + <% [['france', 'FR'], ['italy', 'IT'], ['rest_of_world', 'GB']].each do |name,legale| %> + <%= radio_button_tag 'legale', legale, @legale == legale %> + <%= label_tag "legale_#{legale}", t('user.terms.legale_names.' + name) %> + + <% end %> +
+<% end %><%= @text['intro'] %>
-<%= @text['section_1'] %>
-<%= @text['section_2'] %>
-<%= @text['section_3'] %>
-<%= @text['active_defn_1'] %>
-<%= @text['active_defn_2'] %>
-<%= @text['section_4'] %>
-<%= @text['section_5'] %>
-<%= @text['section_6'] %>
-<%= @text['section_6_1'] %>
<%= @text['section_6_2'] %>
<%= @text['section_7'] %>
-<%= check_box('user', 'consider_pd') %> @@ -57,12 +33,19 @@
<%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %> - <%= hidden_field('user', 'email') %> - <%= hidden_field('user', 'email_confirmation') %> - <%= hidden_field('user', 'display_name') %> - <%= hidden_field('user', 'pass_crypt') %> - <%= hidden_field('user', 'pass_crypt_confirmation') %> - <%= t 'user.terms.decline' %> - <%= submit_tag(t('user.terms.button')) %> + <% if @user.new_record? %> + <%= hidden_field('user', 'email') %> + <%= hidden_field('user', 'email_confirmation') %> + <%= hidden_field('user', 'display_name') %> + <%= hidden_field('user', 'pass_crypt') %> + <%= hidden_field('user', 'pass_crypt_confirmation') %> + <%= hidden_field('user', 'openid_url') %> + <% end %> +
+<%= raw t 'user.terms.guidance', :summary => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary', :translations => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %>
<% end %>