Report duplicate OpenID URLs cleanly

[rails.git] / app / views / user / new.html.erb

diff --git a/app/views/user/new.html.erb b/app/views/user/new.html.erb
index 992ec9be1aa4790e90017b4c8e1927737612fe73..4e3f4428d6f11194c339f31fa1d115ee1ddf4b23 100644 (file)
--- 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">
@@ -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