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

Remove #sign-up-text, change placeholder text to lower-case, fix tests

Browse source
This commit is contained in:
flaburgan 2015-02-19 00:07:41 +01:00
parent b3558d0db1
commit 2b19b4bfc9
10 changed files with 20 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/assets/stylesheets/new_styles/_forms.scss
View file

@ -100,16 +100,7 @@ form.block-form {
top: 130px;
}
input::-moz-placeholder { text-transform: uppercase; }
input::-webkit-input-placeholder { text-transform: uppercase; }
input:-ms-input-placeholder { text-transform: uppercase; }
}
input[type=submit] {
text-align: center;
display: block;
width: 100%;
padding: 8px 0;
::placeholder { text-transform: uppercase; }
}
}

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

@ -21,13 +21,8 @@
font-size : 35px;
}
#sign-up-text {
margin-bottom : 0.5em;
}
#create-something-text,
#diaspora-hearts,
#sign-up-text {
#diaspora-hearts {
font-family : Roboto-Light;
}

2
app/views/passwords/edit.haml
View file

@ -23,7 +23,7 @@
= f.password_field :password_confirmation, class: "input-block-level form-control", required: true, placeholder: t('devise.passwords.edit.confirm_password'), autocapitalize: "none", autocorrect: "off"
= hidden_field(:user, :remember_me, value: 1)
= f.submit t('devise.passwords.edit.change_password'), class: "btn"
= f.submit t('devise.passwords.edit.change_password'), class: "btn btn-block"
.text-center
= link_to t('devise.shared.links.sign_in'), new_session_path(resource_name)

2
app/views/passwords/new.haml
View file

@ -18,7 +18,7 @@
= t('devise.passwords.new.email')
%i.entypo.mail
= f.text_field :email, class: "input-block-level form-control", required: true, autocapitalize: "off", placeholder: t('devise.passwords.new.email'), autocorrect: "off", autofocus: true
= f.submit t('devise.passwords.new.send_password_instructions'), class: "btn"
= f.submit t('devise.passwords.new.send_password_instructions'), class: "btn btn-block"
.text-center
= link_to t('devise.shared.links.sign_in'), new_session_path(resource_name)

2
app/views/registrations/new.haml
View file

@ -41,4 +41,4 @@
- if AppConfig.settings.terms.enable?
%p#terms.text-center
= t('.terms', terms_link: link_to(t('.terms_link'), terms_path, target: "_blank")).html_safe
= f.submit t('.sign_up'), class: "btn", data: {disable_with: t('.submitting')}
= f.submit t('.sign_up'), class: "btn btn-block btn-large", data: {disable_with: t('.submitting')}

6
config/locales/devise/devise.en.yml
View file

@ -30,13 +30,13 @@ en:
updated: 'Your password was changed successfully. You are now signed in.'
edit:
change_password: "Change my password"
new_password: "NEW PASSWORD"
confirm_password: "CONFIRM PASSWORD"
new_password: "New password"
confirm_password: "Confirm password"
new:
forgot_password: "Forgot your password?"
no_account: 'No account with this email exists'
reset_password: "Reset password"
email: "EMAIL ADDRESS"
email: "Email address"
send_password_instructions: "Send me reset password instructions"
confirmations:
send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.'

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

@ -839,7 +839,7 @@ en:
Sign in here: %{login_url}. If you’ve forgotten your sign-in details, you can ask for a reminder on that page.
Hoping to see you again,
The diaspora* email robot!
people:
zero: "No people"
@ -1009,11 +1009,11 @@ en:
enter_password_again: "Enter the same password as before"
hey_make: "HEY,<br/>MAKE<br/>SOMETHING."
diaspora: "<3 diaspora*"
sign_up: "SIGN UP"
email: "EMAIL"
username: "USERNAME"
password: "PASSWORD"
password_confirmation: "PASSWORD CONFIRMATION"
sign_up: "Sign up"
email: "Email"
username: "Username"
password: "Password"
password_confirmation: "Password confirmation"
submitting: "Submitting..."
terms: "By creating an account you accept the %{terms_link}."
terms_link: "terms of service"

4
features/desktop/accepts_invitation.feature
View file

@ -4,7 +4,7 @@ Feature: invitation acceptance
Given I have been invited by an admin
And I am on my acceptance form page
And I fill in the new user form
And I press "Continue"
And I press "Sign up"
Then I should be on the getting started page
And I should see "Well, hello there!"
And I fill in the following:
@ -19,7 +19,7 @@ Feature: invitation acceptance
Given I have been invited by bob
And I am on my acceptance form page
And I fill in the new user form
And I press "Continue"
And I press "Sign up"
Then I should be on the getting started page
And I should see "Well, hello there!"
And I fill in the following:

2
features/desktop/invitations.feature
View file

@ -5,6 +5,6 @@ Feature: Invitations
When I visit alice's invitation code url
# Then I should see the "alice is excited" message
When I fill in the new user form
And I press "Continue"
And I press "Sign up"
Then I should see the "welcome to diaspora" message
And I should be able to friend Alice

6
features/desktop/signs_up.feature
View file

@ -71,20 +71,20 @@ Feature: new user registration
And I go to the new user registration page
And I fill in the following:
| user_username | $%&(/&%$&/=)(/ |
And I press "Continue"
And I press "Sign up"
Then I should not be able to sign up
And I should have a validation error on "user_username, user_password, user_email"
When I fill in the following:
| user_username | valid_user |
| user_email | this is not a valid email $%&/()( |
And I press "Continue"
And I press "Sign up"
Then I should not be able to sign up
And I should have a validation error on "user_password, user_email"
When I fill in the following:
| user_email | valid@email.com |
| user_password | 1 |
And I press "Continue"
And I press "Sign up"
Then I should not be able to sign up
And I should have a validation error on "user_password, user_password_confirmation"