nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

adds password_confirmation field to registration page

Browse source
This commit is contained in:
Fabián Rodríguez 2012-10-11 19:45:52 -02:00
parent d979ac4499
commit 40f5314184
6 changed files with 31 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/assets/stylesheets/new_styles/_registration.scss
View file

@ -39,4 +39,16 @@
max-width : 95%; max-width : 95%;
} }
form {
.control-label,
.controls {
margin-left : auto;
width : auto;
}
.controls {
float : right;
}
}
} }

10
app/views/registrations/new.html.erb
View file

@ -50,6 +50,16 @@
<%= f.password_field :password, :placeholder => "••••••••", :title => t('registrations.new.enter_password'), :required => true, :pattern => "......+" %> <%= f.password_field :password, :placeholder => "••••••••", :title => t('registrations.new.enter_password'), :required => true, :pattern => "......+" %>
</div> </div>
</div> </div>
<div class="control-group">
<label class="control-label" for="user_password_confirmation">
<%= t('.password_confirmation') %>
</label>
<div class="controls">
<%= f.password_field :password_confirmation, :placeholder => "••••••••", :title => t('registrations.new.enter_password_again'), :required => true, :pattern => "......+" %>
</div>
</div>
<%= invite_hidden_tag(invite) %> <%= invite_hidden_tag(invite) %>
</fieldset> </fieldset>

1
config/locales/diaspora/en.yml
View file

@ -687,6 +687,7 @@ en:
email: "EMAIL" email: "EMAIL"
username: "USERNAME" username: "USERNAME"
password: "PASSWORD" password: "PASSWORD"
password_confirmation: "PASSWORD CONFIRMATION"
continue: "Continue" continue: "Continue"
create: create:
success: "You've joined Diaspora!" success: "You've joined Diaspora!"

2
features/accepts_invitation.feature
View file

@ -7,6 +7,7 @@ Feature: invitation acceptance
| user_username | ohai | | user_username | ohai |
| user_email | woot@sweet.com | | user_email | woot@sweet.com |
| user_password | secret | | user_password | secret |
| user_password_confirmation | secret |
And I press "Continue" And I press "Continue"
Then I should be on the getting started page Then I should be on the getting started page
And I should see "Well, hello there!" And I should see "Well, hello there!"
@ -24,6 +25,7 @@ Feature: invitation acceptance
| user_username | ohai | | user_username | ohai |
| user_email | woot@sweet.com | | user_email | woot@sweet.com |
| user_password | secret | | user_password | secret |
| user_password_confirmation | secret |
And I press "Continue" And I press "Continue"
Then I should be on the getting started page Then I should be on the getting started page
And I should see "Well, hello there!" And I should see "Well, hello there!"

1
features/signs_up.feature
View file

@ -7,6 +7,7 @@ Feature: new user registration
| user_username | ohai | | user_username | ohai |
| user_email | ohai@example.com | | user_email | ohai@example.com |
| user_password | secret | | user_password | secret |
| user_password_confirmation | secret |
And I press "Continue" And I press "Continue"
Then I should be on the getting started page Then I should be on the getting started page
And I should see "Well, hello there!" and "Who are you?" and "What are you into?" And I should see "Well, hello there!" and "Who are you?" and "What are you into?"

1
features/step_definitions/user_steps.rb
View file

@ -209,6 +209,7 @@ When /^I fill in the new user form$/ do
step 'I fill in "user_username" with "ohai"' step 'I fill in "user_username" with "ohai"'
step 'I fill in "user_email" with "ohai@example.com"' step 'I fill in "user_email" with "ohai@example.com"'
step 'I fill in "user_password" with "secret"' step 'I fill in "user_password" with "secret"'
step 'I fill in "user_password_confirmation" with "secret"'
end end
And /^I should be able to friend Alice$/ do And /^I should be able to friend Alice$/ do