From bd66c67398a50a181458cdc0d2c5b33075cb5dc9 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Sun, 24 Aug 2014 22:20:59 -0700 Subject: [PATCH] whoops, used font awesome 3.2 styles :( --- .../javascripts/admin/templates/dashboard.js.handlebars | 2 +- .../javascripts/admin/templates/user_index.js.handlebars | 4 ++-- .../javascripts/admin/templates/users_list.js.handlebars | 2 +- .../javascripts/discourse/components/poster-name.js.es6 | 2 +- app/assets/javascripts/discourse/models/user.js | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/admin/templates/dashboard.js.handlebars b/app/assets/javascripts/admin/templates/dashboard.js.handlebars index 93b8f5dad84..435fbaaee45 100644 --- a/app/assets/javascripts/admin/templates/dashboard.js.handlebars +++ b/app/assets/javascripts/admin/templates/dashboard.js.handlebars @@ -58,7 +58,7 @@
- + diff --git a/app/assets/javascripts/admin/templates/user_index.js.handlebars b/app/assets/javascripts/admin/templates/user_index.js.handlebars index 90fd817b6c8..02a04a8d03a 100644 --- a/app/assets/javascripts/admin/templates/user_index.js.handlebars +++ b/app/assets/javascripts/admin/templates/user_index.js.handlebars @@ -199,13 +199,13 @@
{{#if can_revoke_admin}} {{/if}} {{#if can_grant_admin}} {{/if}} diff --git a/app/assets/javascripts/admin/templates/users_list.js.handlebars b/app/assets/javascripts/admin/templates/users_list.js.handlebars index 3376ca0b58a..3618935c9fd 100644 --- a/app/assets/javascripts/admin/templates/users_list.js.handlebars +++ b/app/assets/javascripts/admin/templates/users_list.js.handlebars @@ -86,7 +86,7 @@ {{/if}}
diff --git a/app/assets/javascripts/discourse/components/poster-name.js.es6 b/app/assets/javascripts/discourse/components/poster-name.js.es6 index ee0e5a40a13..e0033f1ab71 100644 --- a/app/assets/javascripts/discourse/components/poster-name.js.es6 +++ b/app/assets/javascripts/discourse/components/poster-name.js.es6 @@ -85,7 +85,7 @@ var PosterNameComponent = Em.Component.extend({ if(post.get('admin')) { desc = I18n.t('user.admin_tooltip'); - return ''; + return ''; } else if(post.get('moderator')) { desc = I18n.t('user.moderator_tooltip'); return ''; diff --git a/app/assets/javascripts/discourse/models/user.js b/app/assets/javascripts/discourse/models/user.js index c1146e8a35a..5d198687735 100644 --- a/app/assets/javascripts/discourse/models/user.js +++ b/app/assets/javascripts/discourse/models/user.js @@ -81,7 +81,7 @@ Discourse.User = Discourse.Model.extend({ if(this.get('admin')) { desc = I18n.t('user.admin', {user: name}); - return ''; + return ''; } if(this.get('moderator')){ desc = I18n.t('user.moderator', {user: name});
{{i18n admin.dashboard.admins}} {{i18n admin.dashboard.admins}} {{#link-to 'adminUsersList.admins'}}{{admins}}{{/link-to}} {{i18n admin.dashboard.suspended}} {{#link-to 'adminUsersList.suspended'}}{{suspended}}{{/link-to}} - {{#if admin}}{{/if}} + {{#if admin}}{{/if}} {{#if moderator}}{{/if}}