Merge branch 'master' into notes

[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 100206c31c0f3882f32542c5ddd7f5e0271222dc..3b68ddd5b0e2ec4516ee4a04863cd1157bfa6eb1 100644 (file)
--- a/app/views/user/confirm.html.erb
+++ b/app/views/user/confirm.html.erb
@@ -1,48 +1,19 @@
-<h1><%= t 'user.confirm.heading' %></h1>
+<script>
+$("#content").hide();
+</script>
+
+<% content_for :heading do %>
+  <h1><%= t 'user.confirm.heading' %></h1>
+<% end %>

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

-<div id="contributorTerms">
-  <p id="first"><%= t 'legal.contributor_terms.intro' %></p>
-  <ol>
-    <li>
-      <p><%= t 'legal.contributor_terms.section_1' %></p>
-    </li>
-    <li>
-      <p><%= t 'legal.contributor_terms.section_2' %></p>
-    </li>
-    <li>
-      <p><%= t 'legal.contributor_terms.section_3' %></p>
-      <p><%= t 'legal.contributor_terms.active_defn_1' %></p>
-      <p><%= t 'legal.contributor_terms.active_defn_2' %></p>
-    </li>
-    <li>
-      <p><%= t 'legal.contributor_terms.section_4' %></p>
-    </li>
-    <li>
-      <p><%= t 'legal.contributor_terms.section_5' %></p>
-    </li>
-    <li>
-      <p><%= t 'legal.contributor_terms.section_6' %></p>
-      <ol>
-        <li><p><%= t 'legal.contributor_terms.section_6_1' %></p></li>
-        <li><p><%= t 'legal.contributor_terms.section_6_2' %></p></li>
-      </ol>
-    </li>
-    <li>
-      <p id="last"><%= t 'legal.contributor_terms.section_7' %></p>
-    </li>
-  </ol>
-</div>
+<%= 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' %>">
+<% end %>

 
 

-<form method="post">
-  <p>
-    <label for="confirm_pd_checkbox"><%= t 'user.confirm.consider_pd' %></label>
-    <input id="confirm_pd_checkbox" type="checkbox"
-    name="consider_pd"/><br/>
-  </p>
-  <p>
-    <input type="hidden" name="confirm_string" value="<%= params[:confirm_string] %>"/>
-    <input type="submit" name="confirm_action" value="<%= t 'user.confirm.button' %>"/>
-  </p>
-</form>
+<script>
+$("#confirm").submit();
+</script>