X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ffd7b02b0c3696ffa5d38ddeeb8078df19e841e0..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 049e07ca7..d51e52b5f 100644 --- a/app/views/user/terms.html.erb +++ b/app/views/user/terms.html.erb @@ -1,46 +1,45 @@ -

<%= t 'user.terms.heading' %>

- -

<%= t 'user.terms.press accept button' %>

- - -<% 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, - :onchange => remote_function( - :before => update_page do |page| - page.replace_html 'contributorTerms', image_tag('searching.gif') - end, - :url => {:legale => legale} - ) - %> - <%= label_tag "legale_#{legale}", t('user.terms.legale_names.' + name) %> - <% end %> -

+<% content_for :heading do %> +

<%= t 'user.terms.heading' %>

<% end %> -
- <%= render :partial => "terms" %> -
- -<% form_tag({:action => "save"}, { :id => "termsForm" }) do %> -

- - <%= 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' %>

+
+ <% [['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 %> +
+
+ <%= render :partial => "terms" %> +
+ + <%= form_tag({:action => "save"}, { :class => "sign" }) do %> +

+ + <%= 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.decline'), :name => "decline", :id => "decline") %> +
<%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %> + <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %>
-

-<% 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 %> +