- <% end %>
- <%= f.submit t('.continue'), class: "new-btn", data: {disable_with: t('.submitting')} %>
- <% end %>
-
-
-
-
diff --git a/app/views/sessions/new.html.haml b/app/views/sessions/new.html.haml
index 48337eaf0..97d6a67f1 100644
--- a/app/views/sessions/new.html.haml
+++ b/app/views/sessions/new.html.haml
@@ -1,40 +1,42 @@
- content_for :page_title do
- = AppConfig.settings.pod_name + " / " + t('devise.sessions.new.sign_in')
+ = AppConfig.settings.pod_name + " - " + t('devise.sessions.new.sign_in')
.container-fluid#login
- .row-fluid
- .span12.text-center
- .branding-asterisk
- %h1
- = AppConfig.settings.pod_name
+ .text-center
+ .branding-asterisk
+ %h1
+ = AppConfig.settings.pod_name
- .row-fluid
- .span4.offset4
- = form_for resource, :as => resource_name, :url => session_path(resource_name), :html => {:class => 'form-signin'}, :autocomplete => 'off' do |f|
- %fieldset
- = f.text_field :username,
- :placeholder => t('registrations.new.username'),
- :class => 'input-block-level form-control',
- :required => true,
- :pattern => '[A-Za-z0-9_.@\-]+',
- :autocapitalize => 'off',
- :autocorrect => 'off',
- :autofocus => true
- %i.entypo.user
+ = form_for resource, as: resource_name, url: session_path(resource_name), html: {class: 'block-form'}, autocomplete: 'off' do |f|
+ %fieldset
+ %label{for: "user_username"}
+ = t('registrations.new.username')
+ %i.entypo.user
+ = f.text_field :username,
+ placeholder: t('registrations.new.username'),
+ class: 'input-block-level form-control',
+ required: true,
+ pattern: '[A-Za-z0-9_.@\-]+',
+ autocapitalize: 'none',
+ autocorrect: 'off',
+ autofocus: true
- = f.password_field :password,
- :placeholder => t('registrations.new.password'),
- :class => 'input-block-level form-control',
- :required => true
- %i.entypo.lock
+ %label{for: "user_password"}
+ = t('registrations.new.password')
+ %i.entypo.lock
+ = f.password_field :password,
+ placeholder: t('registrations.new.password'),
+ class: 'input-block-level form-control',
+ required: true,
+ autocapitalize: 'none',
+ autocorrect: 'off'
- = f.hidden_field :remember_me, :value => 1
- = f.submit t('devise.sessions.new.sign_in'), :class => 'btn btn-large btn-block green'
+ = f.hidden_field :remember_me, value: 1
+ = f.submit t('devise.sessions.new.sign_in'), class: 'btn btn-large btn-block'
- - if display_password_reset_link?
- .text-center
- = link_to t('devise.shared.links.forgot_your_password'), new_password_path(resource_name), :id => "forgot_password_link"
-
- - if display_registration_link?
- .text-center
- = link_to t('devise.shared.links.sign_up'), new_registration_path(resource_name)
+ .text-center
+ - if display_password_reset_link?
+ = link_to t('devise.shared.links.forgot_your_password'), new_password_path(resource_name), id: "forgot_password_link"
+ %br
+ - if display_registration_link?
+ = link_to t('devise.shared.links.sign_up'), new_registration_path(resource_name)
diff --git a/app/views/simple_captcha/_simple_captcha.haml b/app/views/simple_captcha/_simple_captcha.haml
index bc7d70bc4..f8adfb468 100644
--- a/app/views/simple_captcha/_simple_captcha.haml
+++ b/app/views/simple_captcha/_simple_captcha.haml
@@ -1,4 +1,3 @@
-.control-label
+.captcha_img
= simple_captcha_options[:image]
-.controls
- = simple_captcha_options[:field]
\ No newline at end of file
+= simple_captcha_options[:field]
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 720a0aa19..d31afd681 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -829,17 +829,17 @@ en:
subject: "Your diaspora* account has been flagged for removal due to inactivity"
body: |-
Hello,
-
+
It looks as though you no longer want your account at %{pod_url}, as you haven’t used it for %{after_days} days. To ensure our active users get the best performance from this diaspora* pod, we’d like to remove unwanted accounts from our database.
-
+
We’d love you to stay part of diaspora*’s community, and you’re welcome to keep your account live if you want to.
-
+
If you want to keep your account live, all you need to do is to sign in to your account before %{remove_after}. When you sign in, take a moment to have a look around diaspora*. It has changed a lot since you last looked in, and we think you’ll like the improvements we’ve made. Follow some #tags to find content you love.
-
+
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,12 +1009,11 @@ en:
enter_password_again: "Enter the same password as before"
hey_make: "HEY, MAKE SOMETHING."
diaspora: "<3 diaspora*"
- sign_up: "SIGN UP"
- email: "EMAIL"
- username: "USERNAME"
- password: "PASSWORD"
- password_confirmation: "PASSWORD CONFIRMATION"
- continue: "Continue"
+ 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"
diff --git a/features/desktop/accepts_invitation.feature b/features/desktop/accepts_invitation.feature
index cf6923e04..5588bc806 100644
--- a/features/desktop/accepts_invitation.feature
+++ b/features/desktop/accepts_invitation.feature
@@ -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:
diff --git a/features/desktop/change_password.feature b/features/desktop/change_password.feature
index 7c604faf6..da03e0989 100644
--- a/features/desktop/change_password.feature
+++ b/features/desktop/change_password.feature
@@ -12,16 +12,18 @@ Feature: Change password
Then I should be on the stream page
Scenario: Reset my password
- Given a user with email "forgetful@users.net"
+ Given a user named "Georges Abitbol" with email "forgetful@users.net"
Given I am on forgot password page
When I fill out forgot password form with "forgetful@users.net"
And I submit forgot password form
Then I should see "You will receive an email with instructions"
When I follow the "Change my password" link from the last sent email
- Then I should see "NEW PASSWORD"
When I fill out reset password form with "supersecret" and "supersecret"
And I submit reset password form
Then I should be on the stream page
+ And I sign out manually
+ And I sign in manually as "georges_abitbol" with password "supersecret"
+ Then I should be on the stream page
Scenario: Attempt to reset password with invalid email
Given I am on forgot password page
diff --git a/features/desktop/invitations.feature b/features/desktop/invitations.feature
index 291869a44..ac94f985d 100644
--- a/features/desktop/invitations.feature
+++ b/features/desktop/invitations.feature
@@ -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
diff --git a/features/desktop/signs_up.feature b/features/desktop/signs_up.feature
index 83aa6ac9c..46ee98c3f 100644
--- a/features/desktop/signs_up.feature
+++ b/features/desktop/signs_up.feature
@@ -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"