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

[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 068e6eeee91d6b707eed1a4d19d717bb4b17a50d..f520982896b703eff203f1e242e8fdab504cf09f 100644 (file)
--- a/app/views/user/confirm.html.erb
+++ b/app/views/user/confirm.html.erb
@@ -1,48 +1,30 @@
-<h1><%= t 'user.confirm.heading' %></h1>
+<% content_for :heading do %>
+  <h1><%= t 'user.confirm.heading' %></h1>
+  <div class='header-illustration confirm-main'></div>
+<% end %>

 
 

-<p><%= t 'user.confirm.press confirm button' %></p>
+<% if params[:confirm_string] %>
+  <% content_for :head do %>
+    <%= javascript_include_tag "user" %>
+  <% end %>

 
 

-<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>
+  <% content_for(:content_class) { "user_confirm" } %>  

 
 

-<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"/>
-    <span class="minorNote">(<%= link_to(t('user.confirm.consider_pd_why'), t('user.confirm.consider_pd_why_url'), :target => :new)%>)</span>
-  </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>
+  <p><%= t 'user.confirm.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' %>">
+  <% end %>
+<% else %>
+  <h1>
+    <%= t "user.confirm.introduction_1" %>
+    <span class="deemphasize">
+      <%= t "user.confirm.introduction_2" %>
+    </span>
+  </h1>
+
+  <p class='deemphasize'><%= t "user.confirm.reconfirm_html",
+                               :reconfirm => url_for(:action => 'confirm_resend')%></p>
+<% end %>