X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/58cd5bfb11bccb5e326847b218809be2c93a00d5..d1cc387080152269cb142d150e06b0a27f8b98be:/app/views/user/new.html.erb?ds=sidebyside

diff --git a/app/views/user/new.html.erb b/app/views/user/new.html.erb
index 82d1b5d9c..d1772f996 100644
--- a/app/views/user/new.html.erb
+++ b/app/views/user/new.html.erb
@@ -4,9 +4,7 @@
   <div class='header-illustration new-user-arm'></div>
 <% end %>
 
-<%= form_for :user, :url => { :action => 'create' }, :html => { :class => 'signup-form-wrapper standard-form fillL col6 pad2' } do %>
-  <%= error_messages_for 'user' %>
-
+<%= form_for :user, :url => { :action => 'create' }, :html => { :class => 'standard-form fillL col6 inner22' } do %>
   <%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %>
 
   <fieldset>
@@ -15,14 +13,16 @@
         <%= t 'user.new.email address' %>
       </label>
       <%= email_field(:user, :email, { :tabindex => 1 }) %>
+      <%= error_message_on(:user, :email) %>
     </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 }) %>
+      <%= error_message_on(:user, :email_confirmation) %>
     </div>
-  <span class="form-help deemphasize"><%= raw(t 'user.new.not displayed publicly') %></span>
+    <span class="form-help deemphasize"><%= raw(t 'user.new.not displayed publicly') %></span>
   </fieldset>
 
   <fieldset>
@@ -31,6 +31,7 @@
         <%= t 'user.new.display name' %>
       </label>
       <%= text_field(:user, :display_name, { :tabindex => 3 }) %>
+      <%= error_message_on(:user, :display_name) %>
     </div>
     <span class="form-help deemphasize"><%= t 'user.new.display name description' %></span>
   </fieldset>
@@ -41,10 +42,9 @@
         <%= raw t 'user.new.openid', :logo => openid_logo %>
       </label>
       <%= url_field(:user, :openid_url, { :id => "openid_url", :tabindex => 4, :class => "openid_url" }) %>
+      <%= error_message_on(:user, :openid_url) %>
     </div>
-    <span id="openid_note" class="deemphasize">
-      <%= t 'user.new.openid no password' %>
-    </span>
+    <span class="form-help deemphasize"><%= t 'user.new.openid no password' %></span>
   </fieldset>
 
   <fieldset>
@@ -53,12 +53,14 @@
         <%= t 'user.new.password' %>
       </label>
       <%= password_field(:user, :pass_crypt, {:tabindex => 5 }) %>
+      <%= error_message_on(:user, :pass_crypt) %>
     </div>
     <div class="form-row">
       <label class="standard-label">
         <%= t 'user.new.confirm password' %>
       </label>
       <%= password_field(:user, :pass_crypt_confirmation, { :tabindex => 6 }) %>
+      <%= error_message_on(:user, :pass_crypt_confirmation) %>
     </div>
   </fieldset>
 
@@ -69,7 +71,7 @@
   <%= submit_tag t('user.new.continue'), :tabindex => 6 %>
 <% end %>
 
-<div class='col6 deemphasize pad2'>
+<div class='aside col6 deemphasize inner22'>
   <h4><%= t 'user.new.about.header' %></h4>
   <%= t 'user.new.about.html' %>
 </div>
@@ -78,27 +80,21 @@
 function enableOpenID()
 {
   $("#openid_prompt").hide();
-
   $("#openid_field").show();
-  $("#openid_note").show();
-
   $("#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?) -%>
+  <% if params[:openid] or (@user and @user.openid_url.present?) -%>
   enableOpenID();
   <% else -%>
   disableOpenID();