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

diff --git a/app/views/user/new.html.erb b/app/views/user/new.html.erb
index 4e3f4428d..2b1138666 100644
--- a/app/views/user/new.html.erb
+++ b/app/views/user/new.html.erb
@@ -1,90 +1,104 @@
-<h1><%= t 'user.new.heading' %></h1>
-
-<% if Acl.find_by_address(request.remote_ip, :conditions => {:k => "no_account_creation"}) %>
-
-<p><%= t 'user.new.no_auto_account_create' %></p>
-
-<p><%= t 'user.new.contact_webmaster' %></p>
-
-<% else %>
+<% content_for :heading do %>
+  <h1><%= t 'user.new.heading' %></h1>
+<% end %>
 
 <p><%= t 'user.new.fill_form' %></p>
 
 <%= error_messages_for 'user' %>
 
-<% form_tag :action => 'terms' do %>
+<%= form_for :user, :url => { :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 => 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, :value => params[:email] }) %></td>
-    </tr>
-    <tr>
-      <td></td>
-      <td><span class="minorNote"><%= t 'user.new.not displayed publicly' %></span></td>
-    </tr>
-
-    <tr><td colspan="2">&nbsp;<!--vertical spacer--></td></tr>
-
-    <tr>
-      <td class="fieldName"><%= t 'user.new.display name' %></td>
-      <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>
-    </tr>
+  <div id="signupForm" class="standard-form">
+    <fieldset>
+      <div class="form-row">
+        <label for="email" class="fieldName">
+          <%= t 'user.new.email address' %>
+        </label>
+        <%= email_field(:user, :email, { :tabindex => 1 }) %>
+      </div>
+      <div class="form-row">
+        <label for="email_confirmation" class="fieldName">
+          <%= t 'user.new.confirm email address' %>
+        </label>
+        <%= email_field(:user, :email_confirmation, { :tabindex => 2 }) %>
+      </div>
+    <p class="form-help deemphasize"><%= raw(t 'user.new.not displayed publicly') %></p>
+    </fieldset>
+
+    <fieldset>
+      <div class="form-row">
+        <label for="display_name" class="fieldName">
+          <%= t 'user.new.display name' %>
+        </label>
+        <%= text_field(:user, :display_name, { :tabindex => 3 }) %>
+      </div>
+      <p class="form-help deemphasize"><%= t 'user.new.display name description' %></span>
+    </fieldset>
+
+    <fieldset id="openid_field">
+      <div class="form-row">
+        <label for="openid_url" class="fieldName">
+          <%= raw t 'user.new.openid', :logo => openid_logo %>
+        </label>
+        <%= url_field(:user, :openid_url, { :id => "openid_url", :tabindex => 4, :class => "openid_url" }) %>
+      </div>
+    </fieldset>
+
+    <fieldset>
+      <div class="form-row">
+        <label for='user[pass_crypt]' class="fieldName">
+          <%= t 'user.new.password' %>
+        </label>
+        <%= password_field(:user, :pass_crypt, {:tabindex => 5 }) %>
+      </div>
+      <div class="form-row">
+        <label class="fieldName">
+          <%= t 'user.new.confirm password' %>
+        </label>
+        <%= password_field(:user, :pass_crypt_confirmation, { :tabindex => 6 }) %>
+      </div>
+      <span id="openid_prompt" class="">
+        <%= link_to raw(t("user.new.use openid", :logo => openid_logo)), "#", :id => "openid_enable" %>
+      </span>
+      <span id="openid_note" class="">
+        <%= t 'user.new.openid no password' %>
+      </span>
+    </fieldset>
+    <%= submit_tag t('user.new.continue'), :tabindex => 6 %>
+  </div>
+<% end %>
 
-    <tr id="openid_spacer"><td colspan="2">&nbsp;<!--vertical spacer--></td></tr>
+<script type="text/javascript">
+function enableOpenID()
+{
+  $("#openid_prompt").hide();
 
-    <tr id="openid_url">
-      <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>
-    </tr>
+  $("#openid_spacer").show();
+  $("#openid_field").show();
+  $("#openid_note").show();
 
-    <tr><td colspan="2">&nbsp;<!--vertical spacer--></td></tr>
+  $("#openid_url").prop("disabled", false);
+}
 
-    <tr>
-      <td class="fieldName"><%= t 'user.new.password' %></td>
-      <td><%= password_field(:user, :pass_crypt, { :size => 30, :maxlength => 255, :tabindex => 5 }) %></td>
-    </tr>
-    <tr>
-      <td class="fieldName"><%= t 'user.new.confirm password' %></td>
-      <td><%= password_field(:user, :pass_crypt_confirmation, { :size => 30, :maxlength => 255, :tabindex => 6 }) %></td>
-    </tr>
-    <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_note" class="minorNote"><%= t 'user.new.openid no password' %></span>
-      </td>
-    </tr>
+function disableOpenID()
+{
+  $("#openid_prompt").show();
 
-    <tr><td colspan="2" >&nbsp;<!--vertical spacer--></td></tr>
+  $("#openid_spacer").hide();
+  $("#openid_field").hide();
+  $("#openid_note").hide();
 
-    <tr>
-      <td></td>
-      <td align="right"><%= submit_tag t('user.new.continue'), :tabindex => 6 %></td>
-    </tr>
-  </table>
-<% end %>
+  $("#openid_url").prop("disabled", true);
+}
 
-<%=
-  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
-%>
+$(document).ready(function () {
+  $("#openid_enable").click(enableOpenID);
 
-<%= javascript_include_tag 'https://ethnio.com/remotes/62786' %>
-
-<% end %>
+  <% if params[:openid] or (@user and @user.openid_url and not @user.openid_url.empty?) -%>
+  enableOpenID();
+  <% else -%>
+  disableOpenID();
+  <% end -%>
+});
+</script>