From 0357370b0dc801e5883d72e7f465bd6d6ce33217 Mon Sep 17 00:00:00 2001 From: Vikhyat Korrapati Date: Tue, 22 Apr 2014 15:13:26 +0530 Subject: [PATCH] Use the user-badge component in the admin user badges page. --- .../javascripts/admin/templates/user_badges.js.handlebars | 6 ++---- config/locales/client.en.yml | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/admin/templates/user_badges.js.handlebars b/app/assets/javascripts/admin/templates/user_badges.js.handlebars index cc69a79b7..2401b9cee 100644 --- a/app/assets/javascripts/admin/templates/user_badges.js.handlebars +++ b/app/assets/javascripts/admin/templates/user_badges.js.handlebars @@ -27,8 +27,7 @@ - - + @@ -36,8 +35,7 @@ {{#each}} - - +
{{i18n admin.badges.name}}{{i18n admin.badges.badge_type}}{{i18n admin.badges.badge}} {{i18n admin.badges.granted_by}} {{i18n admin.badges.granted_at}}
{{badge.displayName}}{{badge.badge_type.name}}{{user-badge badge=badge}} {{#link-to 'adminUser' badge.granted_by}} {{avatar granted_by imageSize="tiny"}} diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 54a483880..7893b1c6b 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1709,6 +1709,7 @@ en: new_badge: New Badge new: New name: Name + badge: Badge display_name: Display Name description: Description badge_type: Badge Type