Merge remote-tracking branch 'upstream/pull/1851'

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

diff --git a/app/views/user/confirm_email.html.erb b/app/views/user/confirm_email.html.erb
index fd17ef08a656b49a3e3ace8987b23d8b6cee2e32..ecf3e1d3cec62ee568b3ba52084bdc362a53e3e0 100644 (file)
--- a/app/views/user/confirm_email.html.erb
+++ b/app/views/user/confirm_email.html.erb
@@ -1,16 +1,16 @@
-<script>
-$("content").style.display = "none";
-</script>
+<% content_for :head do %>
+  <%= javascript_include_tag "user" %>
+<% end %>

 
 

-<h1><%= t 'user.confirm_email.heading' %></h1>
+<% content_for(:content_class) { "user_confirm" } %>

 
 

-<p><%= t 'user.confirm_email.press confirm button' %></p>
+<% content_for :heading do %>
+  <h1><%= t '.heading' %></h1>
+<% end %>

 
 

-<form id="confirm" method="post">
-  <input type="hidden" name="confirm_string" value="<%= params[:confirm_string] %>">
-  <input type="submit" name="confirm_action" value="<%= t 'user.confirm_email.button' %>">
-</form>
+<p><%= t '.press confirm button' %></p>

 
 

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