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

[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 9fc33094e090dfa5d21034a4cebfad54c3f60fd8..7b8d78d3f49c58eb078a88a10ab3d5513a18be9f 100644 (file)
--- a/app/views/user/confirm.html.erb
+++ b/app/views/user/confirm.html.erb
@@ -1,32 +1,30 @@
 <% content_for :heading do %>
-  <h1><%= t 'user.confirm.heading' %></h1>
+  <h1><%= t '.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>
+  <p><%= t '.press confirm button' %></p>
 
   <%= form_tag({}, { :id => "confirm" }) do %>
     <input type="display_name" name="confirm_string" value="<%= params[:display_name] %>">
     <input type="hidden" name="confirm_string" value="<%= params[:confirm_string] %>">
-    <input type="submit" name="confirm_action" value="<%= t 'user.confirm.button' %>">
+    <input type="submit" name="confirm_action" value="<%= t '.button' %>">
   <% end %>
-
-  <script>
-  $("#confirm").submit();
-  </script>
 <% else %>
   <h1>
-    <%= t "user.confirm.introduction_1" %>
+    <%= t ".introduction_1" %>
     <span class="deemphasize">
-      <%= t "user.confirm.introduction_2" %>
+      <%= t ".introduction_2" %>
     </span>
   </h1>
 
-  <p class='deemphasize'><%= t "user.confirm.reconfirm_html",
+  <p class='deemphasize'><%= t ".reconfirm_html",
                                :reconfirm => url_for(:action => 'confirm_resend')%></p>
 <% end %>