diff --git a/app/assets/javascripts/discourse/app/controllers/account-created-index.js b/app/assets/javascripts/discourse/app/controllers/account-created-index.js index 003a9a55ac..10091881d1 100644 --- a/app/assets/javascripts/discourse/app/controllers/account-created-index.js +++ b/app/assets/javascripts/discourse/app/controllers/account-created-index.js @@ -1,7 +1,23 @@ +import I18n from "I18n"; import Controller from "@ember/controller"; +import getUrl from "discourse-common/lib/get-url"; +import discourseComputed from "discourse-common/utils/decorators"; import { resendActivationEmail } from "discourse/lib/user-activation"; +import { wavingHandURL } from "discourse/lib/waving-hand-url"; export default Controller.extend({ + envelopeImageUrl: getUrl("/images/envelope.svg"), + + @discourseComputed + welcomeTitle() { + return I18n.t("invites.welcome_to", { + site_name: this.siteSettings.title, + }); + }, + + @discourseComputed + wavingHandURL: () => wavingHandURL(), + actions: { sendActivationEmail() { resendActivationEmail(this.get("accountCreated.username")).then(() => { diff --git a/app/assets/javascripts/discourse/app/templates/account-created/index.hbs b/app/assets/javascripts/discourse/app/templates/account-created/index.hbs index 8532e0351d..ce2f438b93 100644 --- a/app/assets/javascripts/discourse/app/templates/account-created/index.hbs +++ b/app/assets/javascripts/discourse/app/templates/account-created/index.hbs @@ -1,6 +1,22 @@ -
- {{html-safe this.accountCreated.message}} +
+ + +
+
+
+ {{i18n +
+
+
+ {{html-safe this.accountCreated.message}} +
+ {{#if this.accountCreated.show_controls}} + + {{/if}} +
+
+
-{{#if this.accountCreated.show_controls}} - -{{/if}} diff --git a/app/assets/javascripts/discourse/tests/acceptance/account-created-test.js b/app/assets/javascripts/discourse/tests/acceptance/account-created-test.js index e9baaf8e00..e2e06f0ad7 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/account-created-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/account-created-test.js @@ -16,7 +16,7 @@ acceptance("Account Created", function () { assert.ok(exists(".account-created")); assert.strictEqual( - query(".account-created .ac-message").innerText.trim(), + query(".account-created .success-info").innerText.trim(), "Hello World", "it displays the message" ); @@ -35,7 +35,7 @@ acceptance("Account Created", function () { assert.ok(exists(".account-created")); assert.strictEqual( - query(".account-created .ac-message").innerText.trim(), + query(".account-created .success-info").innerText.trim(), "Hello World", "it displays the message" ); @@ -43,7 +43,7 @@ acceptance("Account Created", function () { await click(".activation-controls .resend"); assert.strictEqual(currentRouteName(), "account-created.resent"); - const email = query(".account-created .ac-message b").innerText; + const email = query(".account-created b").innerText; assert.strictEqual(email, "eviltrout@example.com"); }); @@ -88,7 +88,7 @@ acceptance("Account Created", function () { await click(".activation-controls .btn-primary"); assert.strictEqual(currentRouteName(), "account-created.resent"); - const email = query(".account-created .ac-message b").innerText; + const email = query(".account-created b").innerText; assert.strictEqual(email, "newemail@example.com"); }); }); diff --git a/app/assets/stylesheets/common/base/activation.scss b/app/assets/stylesheets/common/base/activation.scss index 06a59860be..e3be4947bc 100644 --- a/app/assets/stylesheets/common/base/activation.scss +++ b/app/assets/stylesheets/common/base/activation.scss @@ -13,11 +13,16 @@ font-size: $font-up-1; line-height: $line-height-large; } - .activation-controls { button { margin-right: 0.5em; } } + .ac-page { + border-radius: 10px; + margin-top: 25px; + box-shadow: 0 4px 14px rgba(0, 0, 0, 0.15); + border-top: 6px solid var(--tertiary); + } } } diff --git a/app/assets/stylesheets/common/base/login.scss b/app/assets/stylesheets/common/base/login.scss index f5cfd93f8c..fb5b68549e 100644 --- a/app/assets/stylesheets/common/base/login.scss +++ b/app/assets/stylesheets/common/base/login.scss @@ -309,11 +309,13 @@ .invite-success { border-radius: 10px; margin-top: 25px; + border-top: 6px solid var(--tertiary); } .invite-form { margin-bottom: 50px; max-width: 33em; + border-top: 6px solid var(--tertiary); .tip { display: block; }