diff --git a/app/assets/javascripts/discourse/templates/badges/show.js.handlebars b/app/assets/javascripts/discourse/templates/badges/show.js.handlebars index 13ce2b81d5e..d11597f6a2a 100644 --- a/app/assets/javascripts/discourse/templates/badges/show.js.handlebars +++ b/app/assets/javascripts/discourse/templates/badges/show.js.handlebars @@ -11,6 +11,8 @@ {{user-badge badge=this}} {{displayDescription}} {{i18n badges.granted count=grant_count}} + {{i18n badges.allow_title}} {{{view.allowTitle}}}
{{i18n badges.multiple_grant}} {{{view.multipleGrant}}} + diff --git a/app/assets/javascripts/discourse/views/badges-show.js.es6 b/app/assets/javascripts/discourse/views/badges-show.js.es6 index ff84b71473e..b26d1e8932d 100644 --- a/app/assets/javascripts/discourse/views/badges-show.js.es6 +++ b/app/assets/javascripts/discourse/views/badges-show.js.es6 @@ -8,4 +8,10 @@ **/ export default Discourse.View.extend(Discourse.LoadMore, { eyelineSelector: '.badge-user', + tickOrX: function(field){ + var icon = this.get('controller.model.' + field) ? "fa-check" : "fa-times"; + return ""; + }, + allowTitle: function() { return this.tickOrX("allow_title"); }.property(), + multipleGrant: function() { return this.tickOrX("multiple_grant"); }.property() }); diff --git a/app/assets/stylesheets/common/base/user-badges.scss b/app/assets/stylesheets/common/base/user-badges.scss index f38288743fd..48ab3d85fd6 100644 --- a/app/assets/stylesheets/common/base/user-badges.scss +++ b/app/assets/stylesheets/common/base/user-badges.scss @@ -69,6 +69,7 @@ table.badges-listing { margin: 20px 0; border-bottom: 1px solid scale-color-diff(); + width: 90%; .user-badge { font-size: $base-font-size; @@ -79,8 +80,6 @@ table.badges-listing { } td.grant-count { - font-size: 0.8em; - color: $primary; text-align: right; } @@ -88,6 +87,14 @@ table.badges-listing { white-space: nowrap; } + td.info { + font-size: 0.9em; + text-align: right; + } + + td.description { + } + tr { border-top: 1px solid scale-color-diff(); } diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 006ffa18e6c..57e2a067051 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1935,6 +1935,8 @@ en: badges: title: Badges + allow_title: "allow badge as title?" + multiple_grant: "awarded multiple times?" badge_count: one: "1 Badge" other: "%{count} Badges"