X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/79276fb43abc429cd5515f81005281e303a16dd8..3e8f20fbed1573def1261d67003a761acf5aa803:/app/views/user/terms.html.erb diff --git a/app/views/user/terms.html.erb b/app/views/user/terms.html.erb index cd8da54da..e4644e815 100644 --- a/app/views/user/terms.html.erb +++ b/app/views/user/terms.html.erb @@ -13,7 +13,7 @@ :before => update_page do |page| page.replace_html 'contributorTerms', image_tag('searching.gif') end, - :url => {:legale => legale, :has_decline => params.has_key?(:user)} + :url => {:legale => legale} ) %> <%= label_tag "legale_#{legale}", t('user.terms.legale_names.' + name) %> @@ -22,7 +22,7 @@ <% end %>
- <%= render :partial => "terms", :locals => { :has_decline =>params.has_key?(:user) } %> + <%= render :partial => "terms" %>
<% form_tag({:action => "save"}, { :id => "termsForm" }) do %> @@ -33,7 +33,7 @@

<%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %> - <% if params[:user] %> + <% if @user.new_record? %> <%= hidden_field('user', 'email') %> <%= hidden_field('user', 'email_confirmation') %> <%= hidden_field('user', 'display_name') %> @@ -42,10 +42,10 @@ <%= 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") %>

+
+

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