FEATURE: explain which badges can be titles

This commit is contained in:
Sam 2014-07-09 16:03:53 +10:00
parent 8fcc019ff8
commit 9c14385a86
4 changed files with 19 additions and 2 deletions

View File

@ -11,6 +11,8 @@
<td class='badge'>{{user-badge badge=this}}</td> <td class='badge'>{{user-badge badge=this}}</td>
<td class='description'>{{displayDescription}}</td> <td class='description'>{{displayDescription}}</td>
<td class='grant-count'>{{i18n badges.granted count=grant_count}}</td> <td class='grant-count'>{{i18n badges.granted count=grant_count}}</td>
<td class='info'>{{i18n badges.allow_title}} {{{view.allowTitle}}}<br>{{i18n badges.multiple_grant}} {{{view.multipleGrant}}}
</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

View File

@ -8,4 +8,10 @@
**/ **/
export default Discourse.View.extend(Discourse.LoadMore, { export default Discourse.View.extend(Discourse.LoadMore, {
eyelineSelector: '.badge-user', eyelineSelector: '.badge-user',
tickOrX: function(field){
var icon = this.get('controller.model.' + field) ? "fa-check" : "fa-times";
return "<i class='fa " + icon + "'></i>";
},
allowTitle: function() { return this.tickOrX("allow_title"); }.property(),
multipleGrant: function() { return this.tickOrX("multiple_grant"); }.property()
}); });

View File

@ -69,6 +69,7 @@
table.badges-listing { table.badges-listing {
margin: 20px 0; margin: 20px 0;
border-bottom: 1px solid scale-color-diff(); border-bottom: 1px solid scale-color-diff();
width: 90%;
.user-badge { .user-badge {
font-size: $base-font-size; font-size: $base-font-size;
@ -79,8 +80,6 @@ table.badges-listing {
} }
td.grant-count { td.grant-count {
font-size: 0.8em;
color: $primary;
text-align: right; text-align: right;
} }
@ -88,6 +87,14 @@ table.badges-listing {
white-space: nowrap; white-space: nowrap;
} }
td.info {
font-size: 0.9em;
text-align: right;
}
td.description {
}
tr { tr {
border-top: 1px solid scale-color-diff(); border-top: 1px solid scale-color-diff();
} }

View File

@ -1935,6 +1935,8 @@ en:
badges: badges:
title: Badges title: Badges
allow_title: "allow badge as title?"
multiple_grant: "awarded multiple times?"
badge_count: badge_count:
one: "1 Badge" one: "1 Badge"
other: "%{count} Badges" other: "%{count} Badges"