First pass at banishing the words "bug" and "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 cd8da54daa3b2f2081b562e93659722608345f5a..e4644e8151758a6180acc98d07ced0db70d0863f 100644 (file)
--- a/app/views/user/terms.html.erb
+++ b/app/views/user/terms.html.erb
@@ -13,7 +13,7 @@
             :before => update_page do |page|
               page.replace_html 'contributorTerms', image_tag('searching.gif')
             end,
             :before => update_page do |page|
               page.replace_html 'contributorTerms', image_tag('searching.gif')
             end,

-            :url => {:legale => legale, :has_decline => params.has_key?(:user)}
+            :url => {:legale => legale}

           )
       %>
       <%= label_tag "legale_#{legale}", t('user.terms.legale_names.' + name) %>
           )
       %>
       <%= label_tag "legale_#{legale}", t('user.terms.legale_names.' + name) %>


@@ -22,7 +22,7 @@
 <% end %>
 
 <div id="contributorTerms">
 <% end %>
 
 <div id="contributorTerms">

-  <%= render :partial => "terms", :locals => { :has_decline =>params.has_key?(:user) }  %>
+  <%= render :partial => "terms" %>

 </div>
 
 <% form_tag({:action => "save"}, { :id => "termsForm" }) do %>
 </div>
 
 <% form_tag({:action => "save"}, { :id => "termsForm" }) do %>


@@ -33,7 +33,7 @@
   </p>
   <p>
     <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>
   </p>
   <p>
     <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>

-    <% if params[:user] %>
+    <% if @user.new_record? %>

       <%= hidden_field('user', 'email') %>
       <%= hidden_field('user', 'email_confirmation') %>
       <%= hidden_field('user', 'display_name') %>
       <%= hidden_field('user', 'email') %>
       <%= hidden_field('user', 'email_confirmation') %>
       <%= hidden_field('user', 'display_name') %>


@@ -42,10 +42,10 @@
       <%= hidden_field('user', 'openid_url') %>
     <% end %>
     <div id="buttons">
       <%= hidden_field('user', 'openid_url') %>
     <% end %>
     <div id="buttons">

-      <% if params[:user] %>
-        <%= 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>
       <%= 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 %>
 <% end %>