X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/1a8d73c0244a1455fc0d2fc24f1cbefdebedf1a1..2fb777c5be4c4b5b94b8bd5bee5f7670e3425e9d:/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 eab21e455..33c528292 100644 --- a/app/views/user/terms.html.erb +++ b/app/views/user/terms.html.erb @@ -1,56 +1,45 @@ -

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

- -

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

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

-

- <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %> - <% 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') %> +

+
+

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

-
-

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

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