X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9a9e13af901e9d66357135fb39b111fc9e26b3b2..4028f4cdb91f616bc774dc9b9fa8c7183eb1f6dd:/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 23e2ba068..47e2f8b54 100644 --- a/app/views/user/terms.html.erb +++ b/app/views/user/terms.html.erb @@ -1,68 +1,56 @@ -

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

+<% content_for :heading do %> +

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

+
+<% end %> -

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

+<%= form_tag({:action => "save"}, { :class => " inner22 standard-form fillL" }) do %> + +
+ -

<%= t 'user.terms.legale_select' %> -<% form_tag :action => 'terms' do %> - -<% end %>

+ <% [['france', 'FR'], ['italy', 'IT'], ['rest_of_world', 'GB']].each do |name, legale| %> +
+ + +
+ <% end %> +
-
-

<%= @text['intro'] %>

-
    -
  1. -

    <%= @text['section_1'] %>

    -
  2. -
  3. -

    <%= @text['section_2'] %>

    -
  4. -
  5. -

    <%= @text['section_3'] %>

    -

    <%= @text['active_defn_1'] %>

    -

    <%= @text['active_defn_2'] %>

    -
  6. -
  7. -

    <%= @text['section_4'] %>

    -
  8. -
  9. -

    <%= @text['section_5'] %>

    -
  10. -
  11. -

    <%= @text['section_6'] %>

    -
      -
    1. <%= @text['section_6_1'] %>

    2. -
    3. <%= @text['section_6_2'] %>

    4. -
    -
  12. -
  13. -

    <%= @text['section_7'] %>

    -
  14. -
-
+
+ <%= render :partial => "terms" %> +
-<% form_tag :action => 'save' 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') %> - <%= t 'user.terms.decline' %> - <%= submit_tag(t('user.terms.button')) %> -

+ +
+

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

+ <%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %> + <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %> +
+ +
+

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