Merge remote-tracking branch 'osmlab/welcome-2'

[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..1170631caf38cb238dd23859c3df31c65766e269 100644 (file)
--- a/app/views/user/confirm_email.html.erb
+++ b/app/views/user/confirm_email.html.erb
@@ -1,16 +1,18 @@
 <script>
 <script>

-$("content").style.display = "none";
+$("#content").hide();

 </script>
 
 </script>
 

-<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>
 

-<form id="confirm" method="post">
+<%= 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="hidden" name="confirm_string" value="<%= params[:confirm_string] %>">
   <input type="submit" name="confirm_action" value="<%= t 'user.confirm_email.button' %>">

-</form>
+<% end %>

 
 <script>
 
 <script>

-$("confirm").submit();
+$("#confirm").submit();

 </script>
 </script>