Merge branch 'master' into openstreetbugs

[rails.git] / app / views / user / terms.html.erb

diff --git a/app/views/user/terms.html.erb b/app/views/user/terms.html.erb
index 5dac8f69284050f1ab480983594b61547b9eecd4..e4644e8151758a6180acc98d07ced0db70d0863f 100644 (file)
--- a/app/views/user/terms.html.erb
+++ b/app/views/user/terms.html.erb
@@ -1,6 +1,6 @@
 <h1><%= t 'user.terms.heading' %></h1>
 
-<p><%= t 'user.terms.press accept button' %></p>
+<p><%= t 'user.terms.read and accept' %></p>
 
 <!-- legale is <%= @legale %> -->
 <% form_tag :action => 'terms' do %>
@@ -25,7 +25,7 @@
   <%= render :partial => "terms" %>
 </div>
 
-<% form_tag :action => 'save' do %>
+<% form_tag({:action => "save"}, { :id => "termsForm" }) do %>
   <p>
     <label for="confirm_pd_checkbox"><%= t 'user.terms.consider_pd' %></label>
     <%= check_box('user', 'consider_pd') %>
@@ -33,14 +33,19 @@
   </p>
   <p>
     <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>
-    <%= hidden_field('user', 'email') %>
-    <%= hidden_field('user', 'email_confirmation') %>
-    <%= hidden_field('user', 'display_name') %>
-    <%= hidden_field('user', 'pass_crypt') %>
-    <%= hidden_field('user', 'pass_crypt_confirmation') %>
-    <div class="left_right_line">
-      <div class="left"><%= submit_tag(t('user.terms.decline'), :name => "decline") %></div>
-      <div class="right"><%= submit_tag(t('user.terms.agree'), :name => "agree") %></div>
+    <% if @user.new_record? %>
+      <%= hidden_field('user', 'email') %>
+      <%= hidden_field('user', 'email_confirmation') %>
+      <%= hidden_field('user', 'display_name') %>
+      <%= hidden_field('user', 'pass_crypt') %>
+      <%= hidden_field('user', 'pass_crypt_confirmation') %>
+      <%= hidden_field('user', 'openid_url') %>
+    <% end %>
+    <div id="buttons">
+      <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %>
+      <%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %>
     </div>
   </p>
+  <br clear="all" />
+  <p id="contributorGuidance"><%= t 'user.terms.guidance', :summary => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary', :translations => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %></p>
 <% end %>