X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/155ed85bf5b90fc0419289354904a3f9945dda3f..347c12b5ead21bdb3b127b603b9d8f3c6f8f0d16:/app/views/user/new.html.erb

diff --git a/app/views/user/new.html.erb b/app/views/user/new.html.erb
index 992ec9be1..5ff4ed028 100644
--- a/app/views/user/new.html.erb
+++ b/app/views/user/new.html.erb
@@ -10,11 +10,9 @@
 
 <p><%= t 'user.new.fill_form' %></p>
 
-<p><%= t 'user.new.license_agreement' %></p>
-
 <%= error_messages_for 'user' %>
 
-<% form_tag :action => 'save' do %>
+<% form_tag :action => 'terms' do %>
   <%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %>
 
   <table id="signupForm">
@@ -43,9 +41,9 @@
 
     <tr id="openid_spacer"><td colspan="2">&nbsp;<!--vertical spacer--></td></tr>
 
-    <tr id="openid_url">
+    <tr>
       <td class="fieldName"><%= t 'user.new.openid', :logo => openid_logo %></td>
-      <td><%= text_field(:user, :openid_url, { :size => 50, :maxlength => 255, :tabindex => 4, :value => params[:openid], :class => "openid_url" }) %></td>
+      <td><%= text_field(:user, :openid_url, { :id => "openid_url", :size => 50, :maxlength => 255, :tabindex => 4, :value => params[:openid], :class => "openid_url" }) %></td>
     </tr>
 
     <tr><td colspan="2">&nbsp;<!--vertical spacer--></td></tr>
@@ -70,14 +68,14 @@
 
     <tr>
       <td></td>
-      <td align="right"><%= submit_tag t('user.new.signup'), :tabindex => 6 %></td>
+      <td align="right"><%= submit_tag t('user.new.continue'), :tabindex => 6 %></td>
     </tr>
   </table>
 <% end %>
 
 <%=
   update_page_tag do |page|
-    if params[:openid] 
+    if params[:openid] or (@user and @user.openid_url)
       page[:openid_prompt].hide
     else
       page[:openid_spacer].hide