- {{#if
- (or
- this.passwordValidation.ok
- (and
- this.passwordValidationVisible
- this.passwordValidation.reason
- )
- )
- }}
+ {{#if this.showPasswordValidation}}
{
assert.step("buildPostForm");
diff --git a/app/assets/stylesheets/common/base/login-signup-page.scss b/app/assets/stylesheets/common/base/login-signup-page.scss
index 177f5dcaa10..7cae704c50f 100644
--- a/app/assets/stylesheets/common/base/login-signup-page.scss
+++ b/app/assets/stylesheets/common/base/login-signup-page.scss
@@ -248,6 +248,9 @@ body.signup-page {
.create-account__password-info {
display: flex;
justify-content: space-between;
+ .create-account__password-tip-validation {
+ display: flex;
+ }
}
.inline-spinner {
diff --git a/app/assets/stylesheets/common/modal/login-modal.scss b/app/assets/stylesheets/common/modal/login-modal.scss
index 6351dc98bdc..ae455800426 100644
--- a/app/assets/stylesheets/common/modal/login-modal.scss
+++ b/app/assets/stylesheets/common/modal/login-modal.scss
@@ -242,6 +242,9 @@
.create-account__password-info {
display: flex;
justify-content: space-between;
+ .create-account__password-tip-validation {
+ display: flex;
+ }
}
}
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index d0e0f4d8846..278e1bba42c 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1885,6 +1885,10 @@ en:
persistent_sessions: "Users will remain logged in when the web browser is closed"
maximum_session_age: "User will remain logged in for n hours since last visit"
full_page_login: "Show the login and signup forms in a full page (when unchecked, users will see the forms in a modal). "
+ signup_form_email_instructions: Email instructions to show on the signup form (overrides the default field description).
+ signup_form_username_instructions: Username instructions to show on the signup form.
+ signup_form_full_name_instructions: Full name instructions to show on the signup form.
+ signup_form_password_instructions: Password instructions to show on the signup form.
ga_version: "Version of Google Universal Analytics to use: v3 (analytics.js), v4 (gtag)"
ga_universal_tracking_code: "Google Universal Analytics tracking code ID, eg: UA-12345678-9; see
https://google.com/analytics"
ga_universal_domain_name: "Google Universal Analytics domain name, eg: mysite.com; see
https://google.com/analytics"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index da1a2545243..6f00a34b811 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -631,6 +631,18 @@ login:
full_page_login:
default: false
client: true
+ signup_form_email_instructions:
+ client: true
+ default: ""
+ signup_form_username_instructions:
+ client: true
+ default: ""
+ signup_form_full_name_instructions:
+ client: true
+ default: ""
+ signup_form_password_instructions:
+ client: true
+ default: ""
users:
min_username_length: