X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/898c47e647fbffcd0543b78033945b04f1b9aeae..10c9ca81c788c5aa3cd7a66d9cdbaedc14def1bc:/app/views/user/terms.html.erb?ds=sidebyside diff --git a/app/views/user/terms.html.erb b/app/views/user/terms.html.erb index 258b6e0b3..d51e52b5f 100644 --- a/app/views/user/terms.html.erb +++ b/app/views/user/terms.html.erb @@ -1,53 +1,45 @@ -
<%= t 'user.terms.press accept button' %>
- -<%= t 'legal.contributor_terms.intro' %>
-<%= t 'legal.contributor_terms.section_1' %>
-<%= t 'legal.contributor_terms.section_2' %>
-<%= t 'legal.contributor_terms.section_3' %>
-<%= t 'legal.contributor_terms.active_defn_1' %>
-<%= t 'legal.contributor_terms.active_defn_2' %>
-<%= t 'legal.contributor_terms.section_4' %>
-<%= t 'legal.contributor_terms.section_5' %>
-<%= t 'legal.contributor_terms.section_6' %>
-<%= t 'legal.contributor_terms.section_6_1' %>
<%= t 'legal.contributor_terms.section_6_2' %>
<%= t 'legal.contributor_terms.section_7' %>
-- - <%= check_box('user', 'consider_pd') %> - (<%= link_to(t('user.terms.consider_pd_why'), t('user.terms.consider_pd_why_url'), :target => :new)%>) -
-+
<%= t 'user.terms.read and accept' %>
+ + + <%= form_tag :action => 'terms' do %> +<%= t 'user.terms.legale_select' %>
+ + <% end %> ++ + <%= check_box('user', 'consider_pd') %> + (<%= link_to(t('user.terms.consider_pd_why'), t('user.terms.consider_pd_why_url'), :target => :new)%>) +
<%= 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') %> - <%= submit_tag(t('user.terms.button')) %> - -<% 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 %> +