diff --git a/app/assets/javascripts/admin/templates/badges-award.hbs b/app/assets/javascripts/admin/templates/badges-award.hbs index cf60ff513f..bf9def194a 100644 --- a/app/assets/javascripts/admin/templates/badges-award.hbs +++ b/app/assets/javascripts/admin/templates/badges-award.hbs @@ -1,22 +1,28 @@ {{#d-section class="award-badge"}} -
-

{{i18n 'admin.badges.mass_award.title'}}

-
- {{#if model}} - {{icon-or-image model}} - {{model.name}} - {{else}} - {{I18n 'admin.badges.mass_award.no_badge_selected'}} - {{/if}} -
-
-

{{I18n 'admin.badges.mass_award.upload_csv'}}

- -
- {{d-button - class="btn-primary" - action=(action 'massAward') - disabled=saving - label="admin.badges.save"}} -
-{{/d-section}} \ No newline at end of file +

{{i18n 'admin.badges.mass_award.title'}}

+

{{i18n 'admin.badges.mass_award.description'}}

+ + {{#if model}} +
+
+ {{#if model}} + {{icon-or-image model}} + {{model.name}} + {{else}} + {{I18n 'admin.badges.mass_award.no_badge_selected'}} + {{/if}} +
+
+

{{I18n 'admin.badges.mass_award.upload_csv'}}

+ +
+ {{d-button + class="btn-primary" + action=(action 'massAward') + disabled=saving + label="admin.badges.mass_award.perform"}} +
+ {{else}} + {{I18n 'admin.badges.mass_award.no_badge_selected'}} + {{/if}} +{{/d-section}} diff --git a/app/assets/javascripts/admin/templates/badges.hbs b/app/assets/javascripts/admin/templates/badges.hbs index e1ade47b01..f5ff6c7a0d 100644 --- a/app/assets/javascripts/admin/templates/badges.hbs +++ b/app/assets/javascripts/admin/templates/badges.hbs @@ -6,10 +6,10 @@ {{d-icon "plus"}} {{i18n 'admin.badges.new'}} {{/link-to}} - - {{#link-to 'adminBadges.award' 'new' class="btn btn-primary"}} - {{d-icon "certificate"}} - {{i18n 'admin.badges.mass_award.button'}} + + {{#link-to 'adminBadges.award' 'new' class="btn"}} + {{d-icon "upload"}} + {{i18n 'admin.badges.mass_award.title'}} {{/link-to}} @@ -28,4 +28,4 @@ {{outlet}} - \ No newline at end of file + diff --git a/app/assets/stylesheets/common/admin/badges.scss b/app/assets/stylesheets/common/admin/badges.scss index c1f1bd43d1..f7d2b367f2 100644 --- a/app/assets/stylesheets/common/admin/badges.scss +++ b/app/assets/stylesheets/common/admin/badges.scss @@ -141,11 +141,9 @@ .badge-display-name { margin-left: 5px; } - - .badge-placeholder { - width: 100%; - text-align: center; - } + } + .badge-required { + font-weight: bold; } } diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 27721798d9..07f788fad0 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -4494,12 +4494,13 @@ en: what_are_badges_title: "What are badges?" badge_query_examples_title: "Badge query examples" mass_award: - button: Award Badge - title: Award a badge to a group of users - no_badge_selected: No badge selected + title: Bulk Award + description: Award the same badge to many users at once. + no_badge_selected: Please select a badge to get started. + perform: "Award Badge to Users" upload_csv: Upload a CSV with user emails - aborted: Be sure you selected the badge you want to award and the csv file containing user emails - success: Badge awarding initiated, users will receive the selected badge soon. + aborted: Please upload a CSV containing user emails + success: Your CSV was received and users will receive their badge shortly. emoji: title: "Emoji"