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 1170631caf38cb238dd23859c3df31c65766e269..ecf3e1d3cec62ee568b3ba52084bdc362a53e3e0 100644 (file)
--- a/app/views/user/confirm_email.html.erb
+++ b/app/views/user/confirm_email.html.erb
@@ -1,18 +1,16 @@
-<script>
-$("#content").hide();
-</script>
+<% content_for :head do %>
+  <%= javascript_include_tag "user" %>
+<% end %>
+
+<% content_for(:content_class) { "user_confirm" } %>
 
 <% content_for :heading do %>
-  <h1><%= t 'user.confirm_email.heading' %></h1>
+  <h1><%= t '.heading' %></h1>
 <% end %>
 
-<p><%= t 'user.confirm_email.press confirm button' %></p>
+<p><%= t '.press confirm button' %></p>
 
 <%= form_tag({}, { :id => "confirm" }) do %>
   <input type="hidden" name="confirm_string" value="<%= params[:confirm_string] %>">
-  <input type="submit" name="confirm_action" value="<%= t 'user.confirm_email.button' %>">
+  <input type="submit" name="confirm_action" value="<%= t '.button' %>">
 <% end %>
-
-<script>
-$("#confirm").submit();
-</script>