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

[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 7acb85a98003dab2934419838f9dfea2cca6a5db..1791cfc732f362190117c9ef074665cd4d8528ad 100644 (file)
--- a/app/views/user/confirm_email.html.erb
+++ b/app/views/user/confirm_email.html.erb
@@ -1,8 +1,12 @@
-<script>
-$("content").style.display = "none";
-</script>
+<% content_for :head do %>
+  <%= javascript_include_tag "user" %>
+<% end %>
+
+<% content_for(:content_class) { "user_confirm" } %>  

 
 

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

 
 <p><%= t 'user.confirm_email.press confirm button' %></p>
 
 
 <p><%= t 'user.confirm_email.press confirm button' %></p>
 


@@ -10,7 +14,3 @@ $("content").style.display = "none";
   <input type="hidden" name="confirm_string" value="<%= params[:confirm_string] %>">
   <input type="submit" name="confirm_action" value="<%= t 'user.confirm_email.button' %>">
 <% end %>
   <input type="hidden" name="confirm_string" value="<%= params[:confirm_string] %>">
   <input type="submit" name="confirm_action" value="<%= t 'user.confirm_email.button' %>">
 <% end %>

-
-<script>
-$("confirm").submit();
-</script>