IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Minor tweaks to badge CSV upload

Browse Source
This commit is contained in:
Robin Ward 2020-01-13 12:44:22 -05:00
parent 4e8aaacce8
commit e4a85e2a80
4 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/admin/templates/badges-award.hbs
View File

@ -1,6 +1,9 @@
{{#d-section class="award-badge"}} {{#d-section class="award-badge"}}
<form class="form-horizontal">
<h1>{{i18n 'admin.badges.mass_award.title'}}</h1> <h1>{{i18n 'admin.badges.mass_award.title'}}</h1>
<p>{{i18n 'admin.badges.mass_award.description'}}</p>
{{#if model}}
<form class="form-horizontal">
<div class='badge-preview'> <div class='badge-preview'>
{{#if model}} {{#if model}}
{{icon-or-image model}} {{icon-or-image model}}
@ -17,6 +20,9 @@
class="btn-primary" class="btn-primary"
action=(action 'massAward') action=(action 'massAward')
disabled=saving disabled=saving
label="admin.badges.save"}} label="admin.badges.mass_award.perform"}}
</form> </form>
{{else}}
<span class='badge-required'>{{I18n 'admin.badges.mass_award.no_badge_selected'}}</span>
{{/if}}
{{/d-section}} {{/d-section}}

6
app/assets/javascripts/admin/templates/badges.hbs
View File

@ -7,9 +7,9 @@
<span>{{i18n 'admin.badges.new'}}</span> <span>{{i18n 'admin.badges.new'}}</span>
{{/link-to}} {{/link-to}}
{{#link-to 'adminBadges.award' 'new' class="btn btn-primary"}} {{#link-to 'adminBadges.award' 'new' class="btn"}}
{{d-icon "certificate"}} {{d-icon "upload"}}
<span>{{i18n 'admin.badges.mass_award.button'}}</span> <span>{{i18n 'admin.badges.mass_award.title'}}</span>
{{/link-to}} {{/link-to}}
</div> </div>
</div> </div>

6
app/assets/stylesheets/common/admin/badges.scss
View File

@ -141,11 +141,9 @@
.badge-display-name { .badge-display-name {
margin-left: 5px; margin-left: 5px;
} }
.badge-placeholder {
width: 100%;
text-align: center;
} }
.badge-required {
font-weight: bold;
} }
} }

11
config/locales/client.en.yml
View File

@ -4494,12 +4494,13 @@ en:
what_are_badges_title: "What are badges?" what_are_badges_title: "What are badges?"
badge_query_examples_title: "Badge query examples" badge_query_examples_title: "Badge query examples"
mass_award: mass_award:
button: Award Badge title: Bulk Award
title: Award a badge to a group of users description: Award the same badge to many users at once.
no_badge_selected: No badge selected no_badge_selected: Please select a badge to get started.
perform: "Award Badge to Users"
upload_csv: Upload a CSV with user emails 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 aborted: Please upload a CSV containing user emails
success: Badge awarding initiated, users will receive the selected badge soon. success: Your CSV was received and users will receive their badge shortly.
emoji: emoji:
title: "Emoji" title: "Emoji"