X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2e43a275de10e162d605df71e3e0f16ba596ad25..f69abaa9cfba28892022910cddd5d0d8c3e19ba7:/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..3e93ff20c 100644 --- a/app/views/user/terms.html.erb +++ b/app/views/user/terms.html.erb @@ -1,6 +1,6 @@

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

-

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

+

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

<% form_tag :action => 'terms' do %> @@ -13,7 +13,7 @@ :before => update_page do |page| page.replace_html 'contributorTerms', image_tag('searching.gif') end, - :url => {:legale => legale} + :url => {:legale => legale, :has_decline => @user.new_record?} ) %> <%= label_tag "legale_#{legale}", t('user.terms.legale_names.' + name) %> @@ -22,7 +22,7 @@ <% end %>
- <%= render :partial => "terms" %> + <%= render :partial => "terms", :locals => { :has_decline => @user.new_record? } %>
<% form_tag({:action => "save"}, { :id => "termsForm" }) do %> @@ -33,13 +33,18 @@

<%= 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') %> + <% 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') %> + <% end %>

- <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %> + <% if @user.new_record? %> + <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %> + <% end %> <%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %>