Remove unnecessary div/class/css
This commit is contained in:
John Firebaugh
parent
5cbaceb45f
commit
58cd5bfb11
4 changed files with 62 additions and 91 deletions
|
|
@ -172,32 +172,6 @@ p.search_results_entry {
|
|||
}
|
||||
}
|
||||
|
||||
/* Rules for the signup form */
|
||||
|
||||
#signupForm input[type="text"], #signupForm input[type="password"] {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
#signupForm input#user_email {
|
||||
max-width: 30em;
|
||||
}
|
||||
|
||||
#signupForm input#user_email_confirmation {
|
||||
max-width: 30em;
|
||||
}
|
||||
|
||||
#signupForm input#user_display_name {
|
||||
max-width: 20em;
|
||||
}
|
||||
|
||||
#signupForm input#user_pass_crypt {
|
||||
max-width: 20em;
|
||||
}
|
||||
|
||||
#signupForm input#user_pass_crypt_confirmation {
|
||||
max-width: 20em;
|
||||
}
|
||||
|
||||
/* Rules for the login form */
|
||||
|
||||
#login_login input#user_email {
|
||||
|
|
|
|||
|
|
@ -4,72 +4,69 @@
|
|||
<div class='header-illustration new-user-arm'></div>
|
||||
<% end %>
|
||||
|
||||
<%= form_for :user, :url => { :action => 'create' }, :html => { :class => 'signup-form-wrapper 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? %>
|
||||
|
||||
<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" %>
|
||||
<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>
|
||||
|
||||
<%= submit_tag t('user.new.continue'), :tabindex => 6 %>
|
||||
<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 %>
|
||||
<% end %>
|
||||
|
||||
<div class='col6 deemphasize pad2'>
|
||||
|
|
|
|||
|
|
@ -260,7 +260,7 @@ class UserControllerTest < ActionController::TestCase
|
|||
assert_response :success
|
||||
assert_template 'new'
|
||||
assert_select "div#errorExplanation"
|
||||
assert_select "div#signupForm > 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
|
||||
|
||||
def test_user_create_submit_duplicate_email_uppercase
|
||||
|
|
@ -280,7 +280,7 @@ class UserControllerTest < ActionController::TestCase
|
|||
assert_response :success
|
||||
assert_template 'new'
|
||||
assert_select "div#errorExplanation"
|
||||
assert_select "div#signupForm > 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
|
||||
|
||||
def test_user_create_submit_duplicate_name
|
||||
|
|
@ -300,7 +300,7 @@ class UserControllerTest < ActionController::TestCase
|
|||
assert_response :success
|
||||
assert_template 'new'
|
||||
assert_select "div#errorExplanation"
|
||||
assert_select "div#signupForm > 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
|
||||
|
||||
def test_user_create_submit_duplicate_name_uppercase
|
||||
|
|
@ -320,7 +320,7 @@ class UserControllerTest < ActionController::TestCase
|
|||
assert_response :success
|
||||
assert_template 'new'
|
||||
assert_select "div#errorExplanation"
|
||||
assert_select "div#signupForm > 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
|
||||
|
||||
def test_user_terms_new_user
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ class UserCreationTest < ActionController::IntegrationTest
|
|||
assert_template 'user/new'
|
||||
assert_equal response.headers['Content-Language'][0..1], localer.to_s[0..1] unless localer == :root
|
||||
assert_select "div#errorExplanation"
|
||||
assert_select "div#signupForm > 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
|
||||
end
|
||||
end
|
||||
|
|
@ -49,7 +49,7 @@ class UserCreationTest < ActionController::IntegrationTest
|
|||
assert_response :success
|
||||
assert_template 'user/new'
|
||||
assert_select "div#errorExplanation"
|
||||
assert_select "div#signupForm > 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
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue