Skip to content

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

UX: add cancel + footernote (#40940)

chapoi841dff088f08
diff --git a/app/assets/stylesheets/common/modal/manage-reports-modal.scss b/app/assets/stylesheets/common/modal/manage-reports-modal.scss
index b64c69840b1..14c51ed7042 100644
--- a/app/assets/stylesheets/common/modal/manage-reports-modal.scss
+++ b/app/assets/stylesheets/common/modal/manage-reports-modal.scss
@@ -127,6 +127,19 @@
.d-modal__footer {
justify-content: flex-end;
+
+ @include viewport.until(sm) {
+ flex-direction: column;
+ align-items: flex-end;
+ gap: var(--space-2);
+ }
+ }
+
+ &__footer-note {
+ margin: 0;
+ margin-right: auto;
+ color: var(--primary-medium);
+ font-size: var(--font-down-1);
}
.de-cta__description {
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index d0987557549..f37e0b9015c 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -7168,6 +7168,7 @@ en:
disable: "Disable %{title}"
move_up: "Move %{title} up"
move_down: "Move %{title} down"
+ footer_note: "These changes will apply for all users."
configure:
button: "Configure"
diff --git a/frontend/discourse/admin/components/modal/manage-reports.gjs b/frontend/discourse/admin/components/modal/manage-reports.gjs
index ba20a2c6348..c2b4a223e33 100644
--- a/frontend/discourse/admin/components/modal/manage-reports.gjs
+++ b/frontend/discourse/admin/components/modal/manage-reports.gjs
@@ -486,13 +486,25 @@ export default class ManageReports extends Component {
</:aboveFooter>
<:footer>
- <DButton
- @label="admin.dashboard.reports_section.modal.apply"
- @action={{this.apply}}
- @disabled={{this.applying}}
- @isLoading={{this.applying}}
- class="btn-primary manage-reports__apply"
- />
+ <p class="manage-reports__footer-note">
+ {{i18n "admin.dashboard.reports_section.modal.footer_note"}}
+ </p>
+ <div class="manage-reports__footer-actions">
+
+ <DButton
+ @label="js.cancel_value"
+ @action={{@closeModal}}
+ class="btn-transparent manage-reports__cancel"
+ />
+ <DButton
+ @label="admin.dashboard.reports_section.modal.apply"
+ @action={{this.apply}}
+ @disabled={{this.applying}}
+ @isLoading={{this.applying}}
+ class="btn-primary manage-reports__apply"
+ />
+ </div>
+
</:footer>
</DModal>
</template>