X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e660e609661edadc1ed5ad49d6e83e936b2f91cd..10c9ca81c788c5aa3cd7a66d9cdbaedc14def1bc:/app/views/user/new.html.erb

diff --git a/app/views/user/new.html.erb b/app/views/user/new.html.erb
index e8400eb90..52abb3311 100644
--- a/app/views/user/new.html.erb
+++ b/app/views/user/new.html.erb
@@ -1,4 +1,6 @@
-<h1><%= t 'user.new.heading' %></h1>
+<% content_for :heading do %>
+  <h1><%= t 'user.new.heading' %></h1>
+<% end %>
 
 <p><%= t 'user.new.fill_form' %></p>
 
@@ -7,62 +9,67 @@
 <%= 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><%= email_field(:user, :email, { :size => 50, :maxlength => 255, :tabindex => 1 }) %></td>
-    </tr>
-    <tr>
-      <td class="fieldName"><%= t 'user.new.confirm email address' %></td>
-      <td><%= email_field(:user, :email_confirmation, { :size => 50, :maxlength => 255, :tabindex => 2 }) %></td>
-    </tr>
-    <tr>
-      <td></td>
-      <td><span class="minorNote"><%= raw(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 }) %></td></tr>
-    <tr>
-      <td></td>
-      <td><span class="minorNote"><%= t 'user.new.display name description' %></span></td>
-    </tr>
-
-    <tr id="openid_spacer"><td colspan="2">&nbsp;<!--vertical spacer--></td></tr>
-
-    <tr id="openid_field">
-      <td class="fieldName"><%= raw t 'user.new.openid', :logo => openid_logo %></td>
-      <td><%= url_field(:user, :openid_url, { :id => "openid_url", :size => 50, :maxlength => 255, :tabindex => 4, :class => "openid_url" }) %></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 => 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(raw(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>
-
-    <tr><td colspan="2" >&nbsp;<!--vertical spacer--></td></tr>
-
-    <tr>
-      <td></td>
-      <td class="submitButton"><%= submit_tag t('user.new.continue'), :tabindex => 6 %></td>
-    </tr>
-  </table>
+  <div id="signupForm" class="standard-form">
+
+    <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>
+
+    <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>
+
+    <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>
+
+    <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>
+
+    <div id="openid_prompt" class="form-row">
+      <%= link_to raw(t("user.new.use openid", :logo => openid_logo)), "#", :id => "openid_enable" %>
+    </div>
+
+    <%= submit_tag t('user.new.continue'), :tabindex => 6 %>
+  </div>
 <% end %>
 
 <script type="text/javascript">
@@ -70,7 +77,6 @@ function enableOpenID()
 {
   $("#openid_prompt").hide();
 
-  $("#openid_spacer").show();
   $("#openid_field").show();
   $("#openid_note").show();
 
@@ -81,16 +87,19 @@ function disableOpenID()
 {
   $("#openid_prompt").show();
 
-  $("#openid_spacer").hide();
   $("#openid_field").hide();
   $("#openid_note").hide();
 
   $("#openid_url").prop("disabled", true);
 }
 
-<% if params[:openid] or (@user and @user.openid_url and not @user.openid_url.empty?) -%>
-enableOpenID();
-<% else -%>
-disableOpenID();
-<% end -%>
+$(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>