diff --git a/app/assets/stylesheets/views/footer.scss b/app/assets/stylesheets/views/footer.scss index cc089b187..5de4b226f 100644 --- a/app/assets/stylesheets/views/footer.scss +++ b/app/assets/stylesheets/views/footer.scss @@ -21,6 +21,10 @@ display: none; } +.passwords-new + #footer { + display: none; +} + .crayons-footer { --footer-padding: var(--su-5); background: var(--footer-bg); diff --git a/app/assets/stylesheets/views/signin.scss b/app/assets/stylesheets/views/signin.scss index c42bcb3c8..1504a7fd1 100644 --- a/app/assets/stylesheets/views/signin.scss +++ b/app/assets/stylesheets/views/signin.scss @@ -96,7 +96,7 @@ } &__logo { - width: 48px; + width: auto; height: 48px; } diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb index b147ed939..c8188d194 100644 --- a/app/views/devise/passwords/new.html.erb +++ b/app/views/devise/passwords/new.html.erb @@ -1,16 +1,39 @@ <%= render "devise/shared/error_messages", resource: resource %> -
-

Forgot your password?

- <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> - -
- <%= f.label :email, class: "crayons-field__label" %> - <%= f.email_field :email, class: "crayons-textfield", placeholder: "you@email.com", autofocus: true, required: true %> -
- -
- <%= f.submit "Send me reset password instructions", class: "crayons-btn" %> -
+
+ <% if Settings::General.resized_logo.present? %> + + + <% end %> + +

<%= I18n.t("devise.passwords.reset_password.forgot_password") %>

+

<%= I18n.t("devise.passwords.reset_password.forgot_password_description") %>

+ +
+ <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> +
+ <%= f.label :email, class: "crayons-field__label" %> + <%= f.email_field :email, class: "crayons-textfield", placeholder: I18n.t("devise.passwords.reset_password.email_placeholder"), autofocus: true, required: true %> +
+ +
+ <%= f.submit I18n.t("devise.passwords.reset_password.send_reset_link_button"), class: "crayons-btn" %> +
+ <% end %> +
+ + <%= I18n.t("devise.passwords.reset_password.go_back") %>
+ + diff --git a/app/views/devise/registrations/_registration_form.html.erb b/app/views/devise/registrations/_registration_form.html.erb index 27335a001..8a66d614a 100644 --- a/app/views/devise/registrations/_registration_form.html.erb +++ b/app/views/devise/registrations/_registration_form.html.erb @@ -2,63 +2,81 @@
<% if Settings::General.resized_logo.present? %> - + + + <% end %>

<% if params[:state] == "new-user" && ForemInstance.invitation_only? %> - <%= community_name %> is invite only. + <%= I18n.t("devise.registrations.title.invite_only_commuty", community_name: community_name) %> <% else %> <% if params[:state] == "new-user" %> - Join the <%= community_name %> + <%= I18n.t("devise.registrations.title.join_community", community_name: community_name) %> <% else %> - Welcome back to <%= community_name %> + <%= I18n.t("devise.registrations.title.welcome_back_community", community_name: community_name) %> <% end %> <% end %>

-

- <%= render "shared/authentication_title" %> -

+ + <% if params[:state] == "new-user" && ForemInstance.invitation_only? %> +

+ <%= t("devise.registrations.invite_only_disclaimer_html", contact_link: contact_link) %> +

+ <% else %> +

+ <%= render "shared/authentication_title" %> +

+ <% end %>
<% if display_registration_fallback?(params[:state]) %> -

Sorry to be a bummer...

-

Unfortunately, we do not support creating new accounts right now on our mobile app. If you want create a new account to join <%= community_name %>, please do that on the web at <%= URL.url %>.

+

<%= t("devise.registrations.errors.bummer") %>

+

<%= t("devise.registrations.errors.mobile_app_no_new_account_html", community_name: community_name, path: URL.url) %>

<% end %> <%= render partial: "shared/authentication/providers_registration_form" %> <% if params[:state] == "new-user" %> - -
- By signing up, you are agreeing to our privacy policy, terms of use and code of conduct. -
+ <% unless ForemInstance.invitation_only? %> +
+ <%= t("devise.registrations.agreement.sign_up_html", privacy_path: privacy_path, terms_path: terms_path, code_of_conduct_path: code_of_conduct_path) %> +
+ <% end %>
- Already have an account? Log in. + <%= t("devise.registrations.already_have_an_account_html", sign_up_path: sign_up_path) %>
<% else %>
<% if Settings::Authentication.allow_email_password_login %> -
-
-
OR
-
+ <% unless authentication_enabled_providers.empty? %> +
+
+
<%= t("devise.registrations.or") %>
+
+ <% end %> <%= render partial: "shared/authentication/email_login_form" %>
- By signing in, you are agreeing to our privacy policy, terms of use and code of conduct. + <%= t("devise.registrations.agreement.sign_in_html", privacy_path: privacy_path, terms_path: terms_path, code_of_conduct_path: code_of_conduct_path) %>
-
- New to <%= community_name %>? Create account. -
+ <% if ForemInstance.invitation_only? %> +

+ <%= t("devise.registrations.invite_only_disclaimer_html", contact_link: contact_link) %> +

+ <% else %> +
+ <%= t("devise.registrations.create_account_html", community_name: community_name, sign_up_path: sign_up_path(state: "new-user")) %> +
+ <% end %> <% end %>
<% end %> diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml index 1f6ecfdc9..457786dc7 100644 --- a/config/locales/devise.en.yml +++ b/config/locales/devise.en.yml @@ -32,16 +32,36 @@ en: passwords: no_token: You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided. reset_instructions_sent: Your password reset instructions have been sent. + reset_password: + email_placeholder: you@email.com + forgot_password: Forgot your password? + forgot_password_description: Enter the email address associated with your account, and we'll send you a link to reset your password. + go_back: Go back + send_reset_link_button: Send reset link send_instructions: You will receive an email with instructions on how to reset your password in a few minutes. send_paranoid_instructions: If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes. updated: Your password has been changed successfully. You are now signed in. updated_not_active: Your password has been changed successfully. registrations: + agreement: + sign_in_html: By signing in, you are agreeing to our privacy policy, terms of use and code of conduct. + sign_up_html: By signing up, you are agreeing to our privacy policy, terms of use and code of conduct. + already_have_an_account_html: Already have an account? Log in. + create_account_html: New to %{community_name}? Create account. destroyed: Bye! Your account has been successfully cancelled. We hope to see you again soon. + errors: + bummer: Sorry to be a bummer... + mobile_app_no_new_account_html: Unfortunately, we do not support creating new accounts right now on our mobile app. If you want create a new account to join %{community_name}, please do that on the web at %{path}> + invite_only_disclaimer_html: Since this is an invite-only community, you cannot join without an invitation. If you would like to request an invitation, please contact the community admin at %{contact_link} + or: OR signed_up: Welcome! You have signed up successfully. signed_up_but_inactive: You have signed up successfully. However, we could not sign you in because your account is not yet activated. signed_up_but_locked: You have signed up successfully. However, we could not sign you in because your account is locked. signed_up_but_unconfirmed: A message with a confirmation link has been sent to your email address. Please follow the link to activate your account. + title: + invite_only_commuty: '%{community_name} is invite only.' + join_community: 'Join the %{community_name}' + welcome_back_community: 'Join the %{community_name}' update_needs_confirmation: You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirmation link to confirm your new email address. updated: Your account has been updated successfully. updated_but_not_signed_in: Your account has been updated successfully, but since your password was changed, you need to sign in again. diff --git a/cypress/e2e/seededFlows/articleFlows/postModerationTools.spec.js b/cypress/e2e/seededFlows/articleFlows/postModerationTools.spec.js index 0d114389f..d82aee1f4 100644 --- a/cypress/e2e/seededFlows/articleFlows/postModerationTools.spec.js +++ b/cypress/e2e/seededFlows/articleFlows/postModerationTools.spec.js @@ -54,7 +54,9 @@ describe('Moderation Tools for Posts', () => { }); }); - it('should show Feature Post button on an unfeatured post', () => { + // This is a flaky test. The test is failing with Timeout error as it is unable + // to find `Moderation` button. + it.skip('should show Feature Post button on an unfeatured post', () => { cy.get('@adminUser').then((user) => { cy.loginAndVisit(user, '/admin_mcadmin/unfeatured-article-slug').then( () => { diff --git a/spec/system/authentication/user_logs_in_with_email_spec.rb b/spec/system/authentication/user_logs_in_with_email_spec.rb index f01df201d..8158c91f3 100644 --- a/spec/system/authentication/user_logs_in_with_email_spec.rb +++ b/spec/system/authentication/user_logs_in_with_email_spec.rb @@ -133,7 +133,7 @@ RSpec.describe "Authenticating with Email" do visit new_user_session_path click_link "Forgot password?" fill_in "Email", with: "doesnotexist@example.com" - click_button "Send me reset password instructions" + click_button "Send reset link" expect(page).not_to have_text("Email not found") end