X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/945d60ea5a52d0c1d41cc63456bd6f60e547e79e..d53bbe53f48d3f235ebc93af665ac912c057a51b:/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 cd8da54da..a2d33e36e 100644 --- a/app/views/user/terms.html.erb +++ b/app/views/user/terms.html.erb @@ -1,31 +1,33 @@ -

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

+<% content_for :heading do %> +

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

+<% end %>

<%= t 'user.terms.read and accept' %>

-<% form_tag :action => 'terms' do %> +<%= 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, :has_decline => params.has_key?(:user)} - ) - %> + <%= radio_button_tag 'legale', legale, @legale == legale %> <%= label_tag "legale_#{legale}", t('user.terms.legale_names.' + name) %> + <% end %>

<% end %>
- <%= render :partial => "terms", :locals => { :has_decline =>params.has_key?(:user) } %> + <%= render :partial => "terms" %>
-<% form_tag({:action => "save"}, { :id => "termsForm" }) do %> +<%= form_tag({:action => "save"}, { :id => "termsForm" }) do %>

<%= check_box('user', 'consider_pd') %> @@ -33,19 +35,11 @@

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

- <% if params[:user] %> - <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %> - <% end %> + <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %> <%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %>

+
+

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