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

[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 f8147ac783ac3c1f6fa698dcd1b43361e51b9a9d..f520982896b703eff203f1e242e8fdab504cf09f 100644 (file)
--- a/app/views/user/confirm.html.erb
+++ b/app/views/user/confirm.html.erb
@@ -1,12 +1,14 @@
 <% content_for :heading do %>
-  <h2><%= t 'user.confirm.heading' %></h2>
+  <h1><%= t 'user.confirm.heading' %></h1>
   <div class='header-illustration confirm-main'></div>
 <% end %>
 
 <% if params[:confirm_string] %>
-  <script>
-  $("#content").hide();
-  </script>
+  <% content_for :head do %>
+    <%= javascript_include_tag "user" %>
+  <% end %>
+
+  <% content_for(:content_class) { "user_confirm" } %>  
 
   <p><%= t 'user.confirm.press confirm button' %></p>
 
@@ -15,10 +17,6 @@
     <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>
 <% else %>
   <h1>
     <%= t "user.confirm.introduction_1" %>
@@ -27,7 +25,6 @@
     </span>
   </h1>
 
-  <p class='deemphasize'><%= t "user.confirm.antispam_alert_html" %></p>
   <p class='deemphasize'><%= t "user.confirm.reconfirm_html",
                                :reconfirm => url_for(:action => 'confirm_resend')%></p>
 <% end %>