github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-27 09:56:17 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2287 from vikhyat/badge-system

Browse Source 
Display username and granted_at on badge page
This commit is contained in:
Régis Hanol 2014-04-22 11:22:12 +02:00
commit 005f2023a2
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/discourse/templates/badges/show.js.handlebars
View File

@ -1,4 +1,4 @@
<div class='container badges'>
<div class='container show-badge'>
<h1>
{{#link-to 'badges.index'}}{{i18n badges.title}}{{/link-to}}
<i class='fa fa-angle-right'></i>
@ -18,7 +18,13 @@
<br>
{{#each userBadges}}
{{#link-to 'userActivity' user}}
{{avatar user imageSize="large"}}
<div class="badge-user">
{{avatar user imageSize="large"}}
<div class="details">
<span class="username">{{user.username}}</span>
{{unboundDate granted_at}}
</div>
</div>
{{/link-to}}
{{/each}}
{{else}}

21
app/assets/stylesheets/desktop/user-badges.scss → app/assets/stylesheets/common/base/user-badges.scss
View File

@ -74,3 +74,24 @@ table.badges-listing {
border-top: 1px solid $primary-border-color;
}
}
/* /badges/:id/:slug page styling. */
.show-badge {
.badge-user {
display: inline-block;
padding: 5px 10px;
border: 1px solid $secondary_border_color;
margin-bottom: 3px;
.details {
float: right;
margin: 0 10px;
padding-top: 3px;
color: $primary_text_color;
}
.date {
display: block;
color: $secondary_text_color;
}
}
}