X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a36f3558dd43dd5a598e36dd21fd5f7d2b4a94f5..fa7b3022a8a0a07ffae62973af0548f90ad82f2a:/app/views/user/confirm.html.erb diff --git a/app/views/user/confirm.html.erb b/app/views/user/confirm.html.erb index 3b68ddd5b..f52098289 100644 --- a/app/views/user/confirm.html.erb +++ b/app/views/user/confirm.html.erb @@ -1,19 +1,30 @@ - - <% 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 %> -<%= form_tag({}, { :id => "confirm" }) do %> - - - -<% end %> + <% content_for(:content_class) { "user_confirm" } %> + +

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