A platform for community discussion. Free, open, simple.
UX: Align gamification leaderboards admin with admin UI guidelines (#44951)
David Battersbyd5f9897a2e4f
diff --git a/plugins/discourse-gamification/admin/assets/javascripts/admin/components/admin-create-leaderboard.gjs b/plugins/discourse-gamification/admin/assets/javascripts/admin/components/admin-create-leaderboard.gjsindex 60fc0e8f509..4831ae6e34f 100644--- a/plugins/discourse-gamification/admin/assets/javascripts/admin/components/admin-create-leaderboard.gjs+++ b/plugins/discourse-gamification/admin/assets/javascripts/admin/components/admin-create-leaderboard.gjs@@ -83,7 +83,6 @@ export default class AdminCreateLeaderboard extends Component {class="new-leaderboard__cancel form-kit__button btn-default"@action={{@onCancel}}@label="gamification.cancel"- @title="gamification.cancel"/></form.Actions></Form>diff --git a/plugins/discourse-gamification/admin/assets/javascripts/admin/components/admin-edit-leaderboard.gjs b/plugins/discourse-gamification/admin/assets/javascripts/admin/components/admin-edit-leaderboard.gjsindex 4ffb3194bba..053d2c5e031 100644--- a/plugins/discourse-gamification/admin/assets/javascripts/admin/components/admin-edit-leaderboard.gjs+++ b/plugins/discourse-gamification/admin/assets/javascripts/admin/components/admin-edit-leaderboard.gjs@@ -154,7 +154,7 @@ export default class AdminEditLeaderboard extends Component {<template><BackButton- @label="gamification.back"+ @label="gamification.back_to_leaderboards"@route="adminPlugins.show.discourse-gamification-leaderboards"/><Formdiff --git a/plugins/discourse-gamification/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-gamification-leaderboards.js b/plugins/discourse-gamification/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-gamification-leaderboards.jsindex dc70d0306cd..4a53d78be92 100644--- a/plugins/discourse-gamification/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-gamification-leaderboards.js+++ b/plugins/discourse-gamification/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-gamification-leaderboards.js@@ -2,6 +2,7 @@ import EmberObject from "@ember/object";import { trackedArray } from "@ember/reactive/collections";import { service } from "@ember/service";import DiscourseRoute from "discourse/routes/discourse";+import { i18n } from "discourse-i18n";import GamificationLeaderboard from "discourse/plugins/discourse-gamification/discourse/models/gamification-leaderboard";export default class DiscourseGamificationLeaderboards extends DiscourseRoute {@@ -24,4 +25,8 @@ export default class DiscourseGamificationLeaderboards extends DiscourseRoute {gamificationPlugin.extras.gamification_recalculate_scores_remaining,});}++ titleToken() {+ return i18n("gamification.leaderboard.title");+ }}diff --git a/plugins/discourse-gamification/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-gamification-leaderboards/show.js b/plugins/discourse-gamification/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-gamification-leaderboards/show.jsindex 989588d509c..b5708b32b7d 100644--- a/plugins/discourse-gamification/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-gamification-leaderboards/show.js+++ b/plugins/discourse-gamification/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-gamification-leaderboards/show.js@@ -20,4 +20,8 @@ export default class DiscourseGamificationLeaderboardShow extends DiscourseRoute`/admin/plugins/discourse-gamification/leaderboards/${id}`).then((response) => GamificationLeaderboard.create(response.leaderboard));}++ titleToken() {+ return this.currentModel?.name;+ }}diff --git a/plugins/discourse-gamification/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-gamification-leaderboards/index.gjs b/plugins/discourse-gamification/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-gamification-leaderboards/index.gjsindex b6cb79d1730..88451784c37 100644--- a/plugins/discourse-gamification/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-gamification-leaderboards/index.gjs+++ b/plugins/discourse-gamification/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-gamification-leaderboards/index.gjs@@ -1,5 +1,6 @@import { concat, fn } from "@ember/helper";import { LinkTo } from "@ember/routing";+import AdminConfigAreaEmptyList from "discourse/admin/components/admin-config-area-empty-list";import DMenu from "discourse/float-kit/components/d-menu";import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";import DButton from "discourse/ui-kit/d-button";@@ -26,14 +27,12 @@ export default <template>@action={{fn (mut @controller.creatingNew) true}}@icon="plus"@label="gamification.leaderboard.new"- @title="gamification.leaderboard.new"/><actions.Defaultclass="leaderboard-admin__btn-recalculate"@action={{@controller.recalculateScores}}@label="gamification.recalculate"- @title="gamification.recalculate"/>{{/if}}</:actions>@@ -110,7 +109,7 @@ export default <template>class="btn btn-default leaderboard-admin__edit btn-text btn-small"@model={{leaderboard}}@route="adminPlugins.show.discourse-gamification-leaderboards.show"- >{{i18n "gamification.edit"}} </LinkTo>+ >{{i18n "gamification.edit"}}</LinkTo><DMenu@icon="ellipsis-vertical"@@ -144,14 +143,11 @@ export default <template></table>{{else}}{{#unless @controller.creatingNew}}- <div class="admin-plugin-config-area__empty-list">- {{i18n "gamification.leaderboard.none"}}- <DButton- class="btn-default btn-small leaderboard-admin__cta-new"- @action={{fn (mut @controller.creatingNew) true}}- @label="gamification.leaderboard.cta"- />- </div>+ <AdminConfigAreaEmptyList+ @ctaAction={{fn (mut @controller.creatingNew) true}}+ @ctaLabel="gamification.leaderboard.cta"+ @emptyLabel="gamification.leaderboard.none"+ />{{/unless}}{{/if}}</div>diff --git a/plugins/discourse-gamification/assets/stylesheets/admin/leaderboard.scss b/plugins/discourse-gamification/assets/stylesheets/admin/leaderboard.scssindex 0345733655d..3b102be7f5f 100644--- a/plugins/discourse-gamification/assets/stylesheets/admin/leaderboard.scss+++ b/plugins/discourse-gamification/assets/stylesheets/admin/leaderboard.scss@@ -1,27 +1,4 @@.leaderboard-admin {- &__title {- display: inline-block;- }-- &__cta-new {- display: flex;- margin-top: 1rem;- }-- &__btn-recalculate {- float: right;- margin-right: 1rem;- }-- &__btn-new {- float: right;- }-- &__btn-back {- margin-bottom: 1rem;- padding-left: 0;- }-&__creator-link {display: flex;width: fit-content;@@ -30,12 +7,6 @@}}-.leaderboard-edit {- &__cancel {- margin-left: 1rem;- }-}-.leaderboard-scoring-details {margin-top: 1em;diff --git a/plugins/discourse-gamification/config/locales/client.en.yml b/plugins/discourse-gamification/config/locales/client.en.ymlindex 5b3d7ade24b..d5df62d71f5 100644--- a/plugins/discourse-gamification/config/locales/client.en.yml+++ b/plugins/discourse-gamification/config/locales/client.en.yml@@ -81,7 +81,7 @@ en:close: "Close"delete: "Delete"edit: "Edit"- back: "Back"+ back_to_leaderboards: "Back to leaderboards"save: "Save"apply: "Apply"recalculate: "Recalculate scores"