Minor tweaks to badge CSV upload

app/assets/javascripts/admin/templates/badges-award.hbs

@@ -1,22 +1,28 @@
 {{#d-section class="award-badge"}}
-  <form class="form-horizontal">
-    <h1>{{i18n 'admin.badges.mass_award.title'}}</h1>
-    <div class='badge-preview'>
-      {{#if model}}
-        {{icon-or-image model}}
-        <span class="badge-display-name">{{model.name}}</span>
-      {{else}}
-        <span class='badge-placeholder'>{{I18n 'admin.badges.mass_award.no_badge_selected'}}</span>
-      {{/if}}
-    </div>
-    <div>
-      <h4>{{I18n 'admin.badges.mass_award.upload_csv'}}</h4>
-      <input type='file' id='massAwardCSVUpload' accept='.csv' />
-    </div>
-    {{d-button
-        class="btn-primary"
-        action=(action 'massAward')
-        disabled=saving
-        label="admin.badges.save"}}
-  </form>
-{{/d-section}}
+  <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'>
+        {{#if model}}
+          {{icon-or-image model}}
+          <span class="badge-display-name">{{model.name}}</span>
+        {{else}}
+          <span class='badge-placeholder'>{{I18n 'admin.badges.mass_award.no_badge_selected'}}</span>
+        {{/if}}
+      </div>
+      <div>
+        <h4>{{I18n 'admin.badges.mass_award.upload_csv'}}</h4>
+        <input type='file' id='massAwardCSVUpload' accept='.csv' />
+      </div>
+      {{d-button
+          class="btn-primary"
+          action=(action 'massAward')
+          disabled=saving
+          label="admin.badges.mass_award.perform"}}
+    </form>
+  {{else}}
+    <span class='badge-required'>{{I18n 'admin.badges.mass_award.no_badge_selected'}}</span>
+  {{/if}}
+{{/d-section}}

app/assets/javascripts/admin/templates/badges.hbs

@@ -6,10 +6,10 @@
         {{d-icon "plus"}}
         <span>{{i18n 'admin.badges.new'}}</span>
       {{/link-to}}
-      
-      {{#link-to 'adminBadges.award' 'new' class="btn btn-primary"}}
-        {{d-icon "certificate"}}
-        <span>{{i18n 'admin.badges.mass_award.button'}}</span>
+
+      {{#link-to 'adminBadges.award' 'new' class="btn"}}
+        {{d-icon "upload"}}
+        <span>{{i18n 'admin.badges.mass_award.title'}}</span>
       {{/link-to}}
     </div>
   </div>
@@ -28,4 +28,4 @@
     </ul>
   </div>
   {{outlet}}
-</div>
+</div>

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;
   }
 }
 

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"