Use smaller logos for OpenID logins

[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 d6bbd16f55dcd423a4c2bfa701298ed00a963201..e4644e8151758a6180acc98d07ced0db70d0863f 100644 (file)
--- a/app/views/user/terms.html.erb
+++ b/app/views/user/terms.html.erb
@@ -33,12 +33,13 @@
   </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', 'pass_crypt') %>
       <%= hidden_field('user', 'pass_crypt_confirmation') %>
       <%= 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") %>
     <% end %>
     <div id="buttons">
       <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %>


@@ -46,11 +47,5 @@
     </div>
   </p>
   <br clear="all" />
     </div>
   </p>
   <br clear="all" />

-  <hr />
-  <p>
-    <ul>
-      <li><%= link_to(t('user.terms.summary'), t('user.terms.summary_url'), :target => :new)%></li>
-      <li><%= link_to(t('user.terms.translations'), t('user.terms.translations_url'), :target => :new)%></li>
-    </ul>
-  </p>
+  <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 %>