X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a53c7bf623f7a08706eaf73de44380fbf11b14ad..e5c80c80ade40c3360f49eb70a9db8464ffa9169:/app/views/user/new.html.erb

diff --git a/app/views/user/new.html.erb b/app/views/user/new.html.erb
index 61bba4bbb..cf9d0a8ce 100644
--- a/app/views/user/new.html.erb
+++ b/app/views/user/new.html.erb
@@ -10,21 +10,19 @@
 
 <p><%= t 'user.new.fill_form' %></p>
 
-<p><%= t 'user.new.license_agreement' %></p>
-
 <%= error_messages_for 'user' %>
 
-<% form_tag :action => 'save' do %>
-  <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>
+<% form_tag :action => 'terms' do %>
+  <%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %>
 
   <table id="signupForm">
     <tr>
       <td class="fieldName"><%= t 'user.new.email address' %></td>
-      <td><%= text_field(:user, :email, { :size => 50, :maxlength => 255, :tabindex => 1, :value => @email }) %></td>
+      <td><%= text_field(:user, :email, { :size => 50, :maxlength => 255, :tabindex => 1, :value => params[:email] }) %></td>
     </tr>
     <tr>
       <td class="fieldName"><%= t 'user.new.confirm email address' %></td>
-      <td><%= text_field(:user, :email_confirmation, { :size => 50, :maxlength => 255, :tabindex => 2 }) %></td>
+      <td><%= text_field(:user, :email_confirmation, { :size => 50, :maxlength => 255, :tabindex => 2, :value => params[:email] }) %></td>
     </tr>
     <tr>
       <td></td>
@@ -35,7 +33,7 @@
 
     <tr>
       <td class="fieldName"><%= t 'user.new.display name' %></td>
-      <td><%= text_field(:user, :display_name, { :size => 30, :maxlength => 255, :tabindex => 3, :value => @nickname }) %></td></tr>
+      <td><%= text_field(:user, :display_name, { :size => 30, :maxlength => 255, :tabindex => 3, :value => params[:nickname] }) %></td></tr>
     <tr>
       <td></td>
       <td><span class="minorNote"><%= t 'user.new.display name description' %></span></td>
@@ -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 => @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,17 +68,20 @@
 
     <tr>
       <td></td>
-      <td align="right"><%= submit_tag t('user.new.signup'), :tabindex => 6 %></td>
+      <td class="submitButton"><%= submit_tag t('user.new.continue'), :tabindex => 6 %></td>
     </tr>
   </table>
 <% end %>
 
 <%=
   update_page_tag do |page|
-    page[:openid_spacer].hide unless @openID
-    page[:openid_url].hide unless @openID
-    page[:openid_note].hide unless @openID
-    page[:openid_prompt].hide if @openID
+    if params[:openid] or (@user and @user.openid_url)
+      page[:openid_prompt].hide
+    else
+      page[:openid_spacer].hide
+      page[:openid_url].hide
+      page[:openid_note].hide
+    end
   end
 %>