Skip to content

A platform for community discussion. Free, open, simple.

UX: move regular buttons to new hover buttons in admin onboarding banner (#38826)

Gabriel Grubba63454e99f906
diff --git a/app/assets/stylesheets/common/components/admin-onboarding-banner.scss b/app/assets/stylesheets/common/components/admin-onboarding-banner.scss
index 7e502ae56b6..c881e1a40d7 100644
--- a/app/assets/stylesheets/common/components/admin-onboarding-banner.scss
+++ b/app/assets/stylesheets/common/components/admin-onboarding-banner.scss
@@ -108,13 +108,42 @@
.modal-options {
display: flex;
flex-direction: column;
- gap: var(--space-8);
+ gap: var(--space-4);
}
- .option {
- p {
- margin: var(--space-2) 0;
+ &__card {
+ display: flex;
+ flex-direction: column;
+ align-items: start;
+ text-align: left;
+ width: 100%;
+ padding: var(--space-4);
+ border: 1px solid var(--content-border-color);
+ border-radius: var(--d-border-radius);
+ background: var(--secondary);
+
+ &:focus-visible,
+ &:hover {
+ outline: 2px solid var(--tertiary);
+
+ .start-posting-options-modal__title {
+ color: var(--tertiary);
+ }
}
+
+ &:disabled {
+ opacity: 0.5;
+ pointer-events: none;
+ }
+ }
+
+ &__title {
+ display: block;
+ font-weight: bold;
+ }
+
+ &__body {
+ max-width: var(--modal-max-width);
}
}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 5fb62562e8a..893b37481c3 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -501,7 +501,7 @@ en:
start_posting:
title: "Start Posting"
description: "Give people something to talk about together"
- action: "Icebreaker ideas"
+ action: "See ideas"
choose_option: "How would you like to start?"
predefined_topics: "Icebreaker templates"
predefined_topics_subtitle: "Give new members something to talk about, pick a template to edit and make your own."
diff --git a/frontend/discourse/app/components/admin-onboarding/predefined-topics-option.gjs b/frontend/discourse/app/components/admin-onboarding/predefined-topics-option.gjs
index 60ee9170555..639dc2073f2 100644
--- a/frontend/discourse/app/components/admin-onboarding/predefined-topics-option.gjs
+++ b/frontend/discourse/app/components/admin-onboarding/predefined-topics-option.gjs
@@ -9,7 +9,6 @@ export default class PredefinedTopicsOption extends StartPostingOption {
name = "predefined-option";
title = "admin_onboarding_banner.start_posting.predefined_topics";
body = "admin_onboarding_banner.start_posting.predefined_topics_description";
- actionLabel = "admin_onboarding_banner.start_posting.use_predefined";
@action
onSelect() {
diff --git a/frontend/discourse/app/components/admin-onboarding/start-posting-option.gjs b/frontend/discourse/app/components/admin-onboarding/start-posting-option.gjs
index d6e60639c8e..557b501a61c 100644
--- a/frontend/discourse/app/components/admin-onboarding/start-posting-option.gjs
+++ b/frontend/discourse/app/components/admin-onboarding/start-posting-option.gjs
@@ -1,6 +1,6 @@
import Component from "@glimmer/component";
+import { on } from "@ember/modifier";
import { action } from "@ember/object";
-import DButton from "discourse/components/d-button";
import concatClass from "discourse/helpers/concat-class";
import { i18n } from "discourse-i18n";
@@ -17,28 +17,24 @@ export default class StartPostingOption extends Component {
throw new Error("Body is required for StartPostingOption");
}
- get actionLabel() {
- throw new Error("ButtonLabel is required for StartPostingOption");
- }
-
@action
onSelect() {
throw new Error("onSelect is required for StartPostingOption");
}
<template>
- <div class={{concatClass "option" this.name}}>
- <h3>{{i18n this.title}}</h3>
- <p>
+ <button
+ type="button"
+ class={{concatClass "start-posting-options-modal__card" this.name}}
+ disabled={{this.disableAction}}
+ {{on "click" this.onSelect}}
+ >
+ <span class="start-posting-options-modal__title">
+ {{i18n this.title}}
+ </span>
+ <p class="start-posting-options-modal__body">
{{i18n this.body}}
</p>
- {{#unless this.hideAction}}
- <DButton
- @label={{this.actionLabel}}
- @action={{this.onSelect}}
- class="btn-default"
- />
- {{/unless}}
- </div>
+ </button>
</template>
}
diff --git a/frontend/discourse/tests/acceptance/admin-onboarding-banner-test.gjs b/frontend/discourse/tests/acceptance/admin-onboarding-banner-test.gjs
index d78b73be799..e7e5a24724b 100644
--- a/frontend/discourse/tests/acceptance/admin-onboarding-banner-test.gjs
+++ b/frontend/discourse/tests/acceptance/admin-onboarding-banner-test.gjs
@@ -108,7 +108,6 @@ acceptance("Admin - Onboarding Banner", function (needs) {
title = "admin_onboarding_banner.start_posting.extra_option";
body =
"admin_onboarding_banner.start_posting.extra_option_description";
- actionLabel = "admin_onboarding_banner.start_posting.use_extra";
@action
onSelect() {
@@ -129,13 +128,13 @@ acceptance("Admin - Onboarding Banner", function (needs) {
await step.clickAction();
- assert.dom(".option").exists({ count: 2 });
- await click(".extra-option .btn");
+ assert.dom(".start-posting-options-modal__card").exists({ count: 2 });
+ await click(".start-posting-options-modal__card.extra-option");
step.isChecked();
});
- test("registered posting-option can hide its button when step is complete", async function (assert) {
+ test("registered posting-option can be disabled when step is complete", async function (assert) {
withPluginApi((api) => {
api.registerValueTransformer(
"admin-onboarding-start-posting-options",
@@ -148,7 +147,6 @@ acceptance("Admin - Onboarding Banner", function (needs) {
title = "admin_onboarding_banner.start_posting.extra_option";
body =
"admin_onboarding_banner.start_posting.extra_option_description";
- actionLabel = "admin_onboarding_banner.start_posting.use_extra";
@action
onSelect() {
@@ -164,9 +162,8 @@ acceptance("Admin - Onboarding Banner", function (needs) {
title = "admin_onboarding_banner.start_posting.extra_option";
body =
"admin_onboarding_banner.start_posting.extra_option_description";
- actionLabel = "admin_onboarding_banner.start_posting.use_extra";
- get hideAction() {
+ get disableAction() {
return this.args.isComplete;
}
@@ -184,18 +181,18 @@ acceptance("Admin - Onboarding Banner", function (needs) {
await withStep("start_posting", assert).clickAction();
- assert.dom(".option").exists({ count: 3 });
+ assert.dom(".start-posting-options-modal__card").exists({ count: 3 });
assert
- .dom(".hideable-option .btn")
- .exists("button is visible before step completion");
+ .dom(".start-posting-options-modal__card.hideable-option")
+ .isNotDisabled("card is enabled before step completion");
- await click(".completing-option .btn");
+ await click(".start-posting-options-modal__card.completing-option");
await withStep("start_posting", assert).clickAction();
assert
- .dom(".hideable-option .btn")
- .doesNotExist("button is hidden after step completion");
+ .dom(".start-posting-options-modal__card.hideable-option")
+ .isDisabled("card is disabled after step completion");
});
test("it can complete `invite_collaborators` step", async function (assert) {