Merge remote-tracking branch 'openstreetmap/pull/1349'

[rails.git] / app / views / user / confirm.html.erb

diff --git a/app/views/user/confirm.html.erb b/app/views/user/confirm.html.erb
index 3b68ddd5b0e2ec4516ee4a04863cd1157bfa6eb1..9fc33094e090dfa5d21034a4cebfad54c3f60fd8 100644 (file)
--- a/app/views/user/confirm.html.erb
+++ b/app/views/user/confirm.html.erb
@@ -1,19 +1,32 @@
-<script>
-$("#content").hide();
-</script>
-

 <% content_for :heading do %>
   <h1><%= t 'user.confirm.heading' %></h1>
 <% content_for :heading do %>
   <h1><%= t 'user.confirm.heading' %></h1>

+  <div class='header-illustration confirm-main'></div>

 <% end %>
 
 <% end %>
 

-<p><%= t 'user.confirm.press confirm button' %></p>
+<% if params[:confirm_string] %>
+  <script>
+  $("#content").hide();
+  </script>

 
 

-<%= form_tag({}, { :id => "confirm" }) do %>
-  <input type="display_name" name="confirm_string" value="<%= params[:display_name] %>">
-  <input type="hidden" name="confirm_string" value="<%= params[:confirm_string] %>">
-  <input type="submit" name="confirm_action" value="<%= t 'user.confirm.button' %>">
-<% end %>
+  <p><%= t 'user.confirm.press confirm button' %></p>
+
+  <%= form_tag({}, { :id => "confirm" }) do %>
+    <input type="display_name" name="confirm_string" value="<%= params[:display_name] %>">
+    <input type="hidden" name="confirm_string" value="<%= params[:confirm_string] %>">
+    <input type="submit" name="confirm_action" value="<%= t 'user.confirm.button' %>">
+  <% end %>

 
 

-<script>
-$("#confirm").submit();
-</script>
+  <script>
+  $("#confirm").submit();
+  </script>
+<% else %>
+  <h1>
+    <%= t "user.confirm.introduction_1" %>
+    <span class="deemphasize">
+      <%= t "user.confirm.introduction_2" %>
+    </span>
+  </h1>
+
+  <p class='deemphasize'><%= t "user.confirm.reconfirm_html",
+                               :reconfirm => url_for(:action => 'confirm_resend')%></p>
+<% end %>