X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6732ff07b99bea0c25093d3432ac94a07fd60559..c40ad9de0296b28140f13a01a055108b23cb2e7d:/app/views/user/confirm.html.erb?ds=sidebyside diff --git a/app/views/user/confirm.html.erb b/app/views/user/confirm.html.erb index 068e6eeee..f52098289 100644 --- a/app/views/user/confirm.html.erb +++ b/app/views/user/confirm.html.erb @@ -1,48 +1,30 @@ -

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

+<% content_for :heading do %> +

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

+
+<% end %> -

<%= t 'user.confirm.press confirm button' %>

+<% if params[:confirm_string] %> + <% content_for :head do %> + <%= javascript_include_tag "user" %> + <% end %> -
-

<%= t 'legal.contributor_terms.intro' %>

-
    -
  1. -

    <%= t 'legal.contributor_terms.section_1' %>

    -
  2. -
  3. -

    <%= t 'legal.contributor_terms.section_2' %>

    -
  4. -
  5. -

    <%= t 'legal.contributor_terms.section_3' %>

    -

    <%= t 'legal.contributor_terms.active_defn_1' %>

    -

    <%= t 'legal.contributor_terms.active_defn_2' %>

    -
  6. -
  7. -

    <%= t 'legal.contributor_terms.section_4' %>

    -
  8. -
  9. -

    <%= t 'legal.contributor_terms.section_5' %>

    -
  10. -
  11. -

    <%= t 'legal.contributor_terms.section_6' %>

    -
      -
    1. <%= t 'legal.contributor_terms.section_6_1' %>

    2. -
    3. <%= t 'legal.contributor_terms.section_6_2' %>

    4. -
    -
  12. -
  13. -

    <%= t 'legal.contributor_terms.section_7' %>

    -
  14. -
-
+ <% content_for(:content_class) { "user_confirm" } %> -
-

- - - (<%= link_to(t('user.confirm.consider_pd_why'), t('user.confirm.consider_pd_why_url'), :target => :new)%>) -

-

- - -

-
+

<%= t 'user.confirm.press confirm button' %>

+ + <%= form_tag({}, { :id => "confirm" }) do %> + + + + <% end %> +<% else %> +

+ <%= t "user.confirm.introduction_1" %> + + <%= t "user.confirm.introduction_2" %> + +

+ +

<%= t "user.confirm.reconfirm_html", + :reconfirm => url_for(:action => 'confirm_resend')%>

+<% end %>