X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/799bbc3d9fececc84b3940d8a9cb8681551a9ec0..2fb777c5be4c4b5b94b8bd5bee5f7670e3425e9d:/app/views/user/new.html.erb?ds=inline

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