X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/362f237e91541b7cef44629432ae500f4b0518f4..3227f401935e809edc91d360339220a89567db7a:/app/views/user/new.html.erb

diff --git a/app/views/user/new.html.erb b/app/views/user/new.html.erb
index 4e3f4428d..04c86b5a8 100644
--- a/app/views/user/new.html.erb
+++ b/app/views/user/new.html.erb
@@ -1,6 +1,6 @@
 <h1><%= t 'user.new.heading' %></h1>
 
-<% if Acl.find_by_address(request.remote_ip, :conditions => {:k => "no_account_creation"}) %>
+<% if Acl.address(request.remote_ip).where(:k => "no_account_creation").exists? %>
 
 <p><%= t 'user.new.no_auto_account_create' %></p>
 
@@ -12,7 +12,7 @@
 
 <%= error_messages_for 'user' %>
 
-<% form_tag :action => 'terms' do %>
+<%= form_tag :action => 'terms' do %>
   <%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %>
 
   <table id="signupForm">
@@ -26,7 +26,7 @@
     </tr>
     <tr>
       <td></td>
-      <td><span class="minorNote"><%= t 'user.new.not displayed publicly' %></span></td>
+      <td><span class="minorNote"><%= raw(t 'user.new.not displayed publicly') %></span></td>
     </tr>
 
     <tr><td colspan="2">&nbsp;<!--vertical spacer--></td></tr>
@@ -41,9 +41,9 @@
 
     <tr id="openid_spacer"><td colspan="2">&nbsp;<!--vertical spacer--></td></tr>
 
-    <tr id="openid_url">
+    <tr id="openid_field">
       <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>
@@ -59,7 +59,7 @@
     <tr>
       <td></td>
       <td>
-        <span id="openid_prompt" class="minorNote"><%= link_to_function(t('user.new.use openid', :logo => openid_logo)) { |page| page.hide 'openid_prompt'; page.show 'openid_spacer', 'openid_url', 'openid_note' } %></span>
+        <span id="openid_prompt" class="minorNote"><%= link_to_function(t('user.new.use openid', :logo => openid_logo), "enableOpenID()") %></span>
         <span id="openid_note" class="minorNote"><%= t 'user.new.openid no password' %></span>
       </td>
     </tr>
@@ -68,23 +68,39 @@
 
     <tr>
       <td></td>
-      <td align="right"><%= submit_tag t('user.new.continue'), :tabindex => 6 %></td>
+      <td class="submitButton"><%= submit_tag t('user.new.continue'), :tabindex => 6 %></td>
     </tr>
   </table>
 <% end %>
 
-<%=
-  update_page_tag do |page|
-    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
-%>
-
-<%= javascript_include_tag 'https://ethnio.com/remotes/62786' %>
+<script type="text/javascript">
+function enableOpenID()
+{
+  $("openid_prompt").hide();
+
+  $("openid_spacer").show();
+  $("openid_field").show();
+  $("openid_note").show();
+
+  $("openid_url").disabled = false;
+}
+
+function disableOpenID()
+{
+  $("openid_prompt").show();
+
+  $("openid_spacer").hide();
+  $("openid_field").hide();
+  $("openid_note").hide();
+
+  $("openid_url").disabled = true;
+}
+
+<% if params[:openid] or (@user and @user.openid_url and not @user.openid_url.empty?) -%>
+enableOpenID();
+<% else -%>
+disableOpenID();
+<% end -%>
+</script>
 
 <% end %>