Update validates_email_format_of plugin

[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 3e93ff20c6dacfda9d9a6a75c7df281137814836..db052bb24f8afdb5502d7fafd864424d92cfab26 100644 (file)
--- a/app/views/user/terms.html.erb
+++ b/app/views/user/terms.html.erb
@@ -3,7 +3,7 @@
 <p><%= t 'user.terms.read and accept' %></p>
 
 <!-- legale is <%= @legale %> -->
-<% form_tag :action => 'terms' do %>
+<%= form_tag :action => 'terms' do %>
   <p>
     <%= t 'user.terms.legale_select' %>
     <% [['france', 'FR'], ['italy', 'IT'], ['rest_of_world', 'GB']].each do |name,legale| %>
@@ -13,7 +13,7 @@
             :before => update_page do |page|
               page.replace_html 'contributorTerms', image_tag('searching.gif')
             end,
-            :url => {:legale => legale, :has_decline => @user.new_record?}
+            :url => {:legale => legale}
           )
       %>
       <%= label_tag "legale_#{legale}", t('user.terms.legale_names.' + name) %>
@@ -22,10 +22,10 @@
 <% end %>
 
 <div id="contributorTerms">
-  <%= render :partial => "terms", :locals => { :has_decline => @user.new_record? }  %>
+  <%= render :partial => "terms" %>
 </div>
 
-<% form_tag({:action => "save"}, { :id => "termsForm" }) 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') %>
@@ -42,10 +42,10 @@
       <%= hidden_field('user', 'openid_url') %>
     <% end %>
     <div id="buttons">
-      <% if @user.new_record? %>
-        <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %>
-      <% end %>
+      <%= 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 %>