Merge branch 'openID' of git://git.openstreetmap.org/rails into openid

[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 3186c78dd4baa1b8fffee7d5e443521472d7686f..408ba771fc510e7244276709a9f0c4db18851e57 100644 (file)
--- a/app/views/user/confirm.html.erb
+++ b/app/views/user/confirm.html.erb
@@ -1,30 +1,17 @@
+<script>
+$("content").style.display = "none";
+</script>
+

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

-<div style="overflow: auto; width: 80%; height: 60%;">
-<p><%= t 'legal.contributor_terms.intro' %></p>
-<ol>
-<li><%= t 'legal.contributor_terms.section_1' %></li>
-<li><%= t 'legal.contributor_terms.section_2' %></li>
-<li><%= t 'legal.contributor_terms.section_3' %></li>
-<p><%= t 'legal.contributor_terms.active_defn_1' %></p>
-<p><%= t 'legal.contributor_terms.active_defn_2' %></p>
-<li><%= t 'legal.contributor_terms.section_4' %></li>
-<li><%= t 'legal.contributor_terms.section_5' %></li>
-<li><%= t 'legal.contributor_terms.section_6' %></li>
-<ol>
-<li><%= t 'legal.contributor_terms.section_6_1' %></li>
-<li><%= t 'legal.contributor_terms.section_6_2' %></li>
-</ol>
-<li><%= t 'legal.contributor_terms.section_7' %></li>
-</ol>
-</div>
-
-<form method="post">
-<input type="hidden" name="confirm_string" value="<%= params[:confirm_string] %>"/>
-<label for="confirm_pd_checkbox"><%= t 'user.confirm.consider_pd' %></label><input id="confirm_pd_checkbox" type="checkbox" name="consider_pd"/><br/>
-<input type="submit" name="confirm_action" value="<%= t 'user.confirm.button' %>"/>
+<form id="confirm" method="post">
+  <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' %>">

 </form>
 
 </form>
 

-
+<script>
+$("confirm").submit();
+</script>