From 553e0290a6a3fb1371f15e3988cbe09504b27727 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Mon, 25 Aug 2014 22:49:26 -0700 Subject: [PATCH] mods can use shield glyph as well, don't need two --- .../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 435fbaaee45..4abbef9cbe7 100644 --- a/app/assets/javascripts/admin/templates/dashboard.js.handlebars +++ b/app/assets/javascripts/admin/templates/dashboard.js.handlebars @@ -64,7 +64,7 @@ {{#link-to 'adminUsersList.suspended'}}{{suspended}}{{/link-to}} - {{i18n admin.dashboard.moderators}} + {{i18n admin.dashboard.moderators}} {{#link-to 'adminUsersList.moderators'}}{{moderators}}{{/link-to}} {{i18n admin.dashboard.blocked}} {{#link-to 'adminUsersList.blocked'}}{{blocked}}{{/link-to}} diff --git a/app/assets/javascripts/admin/templates/user_index.js.handlebars b/app/assets/javascripts/admin/templates/user_index.js.handlebars index 02a04a8d03a..1d5d5c099b9 100644 --- a/app/assets/javascripts/admin/templates/user_index.js.handlebars +++ b/app/assets/javascripts/admin/templates/user_index.js.handlebars @@ -218,13 +218,13 @@
{{#if can_revoke_moderation}} {{/if}} {{#if can_grant_moderation}} {{/if}} diff --git a/app/assets/javascripts/admin/templates/users_list.js.handlebars b/app/assets/javascripts/admin/templates/users_list.js.handlebars index 3618935c9fd..1dced303fff 100644 --- a/app/assets/javascripts/admin/templates/users_list.js.handlebars +++ b/app/assets/javascripts/admin/templates/users_list.js.handlebars @@ -87,7 +87,7 @@ {{/if}} {{#if admin}}{{/if}} - {{#if moderator}}{{/if}} + {{#if moderator}}{{/if}} {{/each}} diff --git a/app/assets/javascripts/discourse/components/poster-name.js.es6 b/app/assets/javascripts/discourse/components/poster-name.js.es6 index e0033f1ab71..4331af9d93a 100644 --- a/app/assets/javascripts/discourse/components/poster-name.js.es6 +++ b/app/assets/javascripts/discourse/components/poster-name.js.es6 @@ -88,7 +88,7 @@ var PosterNameComponent = Em.Component.extend({ return ''; } else if(post.get('moderator')) { desc = I18n.t('user.moderator_tooltip'); - return ''; + return ''; } } }); diff --git a/app/assets/javascripts/discourse/models/user.js b/app/assets/javascripts/discourse/models/user.js index 5d198687735..6896cf2dd5e 100644 --- a/app/assets/javascripts/discourse/models/user.js +++ b/app/assets/javascripts/discourse/models/user.js @@ -85,7 +85,7 @@ Discourse.User = Discourse.Model.extend({ } if(this.get('moderator')){ desc = I18n.t('user.moderator', {user: name}); - return ''; + return ''; } return null; }.property('admin','moderator'),