Inline validation errors on sign up page
This commit is contained in:
parent
6ab52cd256
commit
c5fc21e6a6
4 changed files with 17 additions and 9 deletions
|
@ -1712,7 +1712,17 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
|
||||||
.field_with_errors {
|
.field_with_errors {
|
||||||
padding: 2px;
|
padding: 2px;
|
||||||
background-color: #ff7070;
|
background-color: #ff7070;
|
||||||
display: table;
|
display: inline-block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.formError {
|
||||||
|
display: inline-block;
|
||||||
|
padding: 5px 10px;
|
||||||
|
margin-top: 5px;
|
||||||
|
border-radius: 4px;
|
||||||
|
font-size: 12px;
|
||||||
|
color: #fff;
|
||||||
|
background-color: #ff7070;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Rules for rails validation error boxes */
|
/* Rules for rails validation error boxes */
|
||||||
|
|
|
@ -5,8 +5,6 @@
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<%= form_for :user, :url => { :action => 'create' }, :html => { :class => 'signup-form-wrapper standard-form fillL col6 pad2' } do %>
|
<%= form_for :user, :url => { :action => 'create' }, :html => { :class => 'signup-form-wrapper standard-form fillL col6 pad2' } do %>
|
||||||
<%= error_messages_for 'user' %>
|
|
||||||
|
|
||||||
<%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %>
|
<%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %>
|
||||||
|
|
||||||
<fieldset>
|
<fieldset>
|
||||||
|
@ -15,12 +13,14 @@
|
||||||
<%= t 'user.new.email address' %>
|
<%= t 'user.new.email address' %>
|
||||||
</label>
|
</label>
|
||||||
<%= email_field(:user, :email, { :tabindex => 1 }) %>
|
<%= email_field(:user, :email, { :tabindex => 1 }) %>
|
||||||
|
<%= error_message_on(:user, :email) %>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-row">
|
<div class="form-row">
|
||||||
<label for="email_confirmation" class="standard-label">
|
<label for="email_confirmation" class="standard-label">
|
||||||
<%= t 'user.new.confirm email address' %>
|
<%= t 'user.new.confirm email address' %>
|
||||||
</label>
|
</label>
|
||||||
<%= email_field(:user, :email_confirmation, { :tabindex => 2 }) %>
|
<%= email_field(:user, :email_confirmation, { :tabindex => 2 }) %>
|
||||||
|
<%= error_message_on(:user, :email_confirmation) %>
|
||||||
</div>
|
</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' %>
|
<%= t 'user.new.display name' %>
|
||||||
</label>
|
</label>
|
||||||
<%= text_field(:user, :display_name, { :tabindex => 3 }) %>
|
<%= text_field(:user, :display_name, { :tabindex => 3 }) %>
|
||||||
|
<%= error_message_on(:user, :display_name) %>
|
||||||
</div>
|
</div>
|
||||||
<span class="form-help deemphasize"><%= t 'user.new.display name description' %></span>
|
<span class="form-help deemphasize"><%= t 'user.new.display name description' %></span>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
@ -41,6 +42,7 @@
|
||||||
<%= raw t 'user.new.openid', :logo => openid_logo %>
|
<%= raw t 'user.new.openid', :logo => openid_logo %>
|
||||||
</label>
|
</label>
|
||||||
<%= url_field(:user, :openid_url, { :id => "openid_url", :tabindex => 4, :class => "openid_url" }) %>
|
<%= url_field(:user, :openid_url, { :id => "openid_url", :tabindex => 4, :class => "openid_url" }) %>
|
||||||
|
<%= error_message_on(:user, :openid_url) %>
|
||||||
</div>
|
</div>
|
||||||
<span class="form-help deemphasize"><%= t 'user.new.openid no password' %></span>
|
<span class="form-help deemphasize"><%= t 'user.new.openid no password' %></span>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
@ -51,12 +53,14 @@
|
||||||
<%= t 'user.new.password' %>
|
<%= t 'user.new.password' %>
|
||||||
</label>
|
</label>
|
||||||
<%= password_field(:user, :pass_crypt, {:tabindex => 5 }) %>
|
<%= password_field(:user, :pass_crypt, {:tabindex => 5 }) %>
|
||||||
|
<%= error_message_on(:user, :pass_crypt) %>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-row">
|
<div class="form-row">
|
||||||
<label class="standard-label">
|
<label class="standard-label">
|
||||||
<%= t 'user.new.confirm password' %>
|
<%= t 'user.new.confirm password' %>
|
||||||
</label>
|
</label>
|
||||||
<%= password_field(:user, :pass_crypt_confirmation, { :tabindex => 6 }) %>
|
<%= password_field(:user, :pass_crypt_confirmation, { :tabindex => 6 }) %>
|
||||||
|
<%= error_message_on(:user, :pass_crypt_confirmation) %>
|
||||||
</div>
|
</div>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
||||||
|
|
|
@ -259,7 +259,6 @@ class UserControllerTest < ActionController::TestCase
|
||||||
end
|
end
|
||||||
assert_response :success
|
assert_response :success
|
||||||
assert_template 'new'
|
assert_template 'new'
|
||||||
assert_select "div#errorExplanation"
|
|
||||||
assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_email"
|
assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_email"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -279,7 +278,6 @@ class UserControllerTest < ActionController::TestCase
|
||||||
end
|
end
|
||||||
assert_response :success
|
assert_response :success
|
||||||
assert_template 'new'
|
assert_template 'new'
|
||||||
assert_select "div#errorExplanation"
|
|
||||||
assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_email"
|
assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_email"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -299,7 +297,6 @@ class UserControllerTest < ActionController::TestCase
|
||||||
end
|
end
|
||||||
assert_response :success
|
assert_response :success
|
||||||
assert_template 'new'
|
assert_template 'new'
|
||||||
assert_select "div#errorExplanation"
|
|
||||||
assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_display_name"
|
assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_display_name"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -319,7 +316,6 @@ class UserControllerTest < ActionController::TestCase
|
||||||
end
|
end
|
||||||
assert_response :success
|
assert_response :success
|
||||||
assert_template 'new'
|
assert_template 'new'
|
||||||
assert_select "div#errorExplanation"
|
|
||||||
assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_display_name"
|
assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_display_name"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,6 @@ class UserCreationTest < ActionController::IntegrationTest
|
||||||
assert_response :success
|
assert_response :success
|
||||||
assert_template 'user/new'
|
assert_template 'user/new'
|
||||||
assert_equal response.headers['Content-Language'][0..1], localer.to_s[0..1] unless localer == :root
|
assert_equal response.headers['Content-Language'][0..1], localer.to_s[0..1] unless localer == :root
|
||||||
assert_select "div#errorExplanation"
|
|
||||||
assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_email"
|
assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_email"
|
||||||
assert_no_missing_translations
|
assert_no_missing_translations
|
||||||
end
|
end
|
||||||
|
@ -48,7 +47,6 @@ class UserCreationTest < ActionController::IntegrationTest
|
||||||
end
|
end
|
||||||
assert_response :success
|
assert_response :success
|
||||||
assert_template 'user/new'
|
assert_template 'user/new'
|
||||||
assert_select "div#errorExplanation"
|
|
||||||
assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_display_name"
|
assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_display_name"
|
||||||
assert_no_missing_translations
|
assert_no_missing_translations
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue