Show author badges on assets and comments
Comments layout is still broken, marked as TODO(Pablo).
This commit is contained in:
@@ -142,7 +142,7 @@ def after_fetching_user(user):
|
|||||||
return
|
return
|
||||||
|
|
||||||
# Remove all fields except public ones.
|
# Remove all fields except public ones.
|
||||||
public_fields = {'full_name', 'username', 'email', 'extension_props_public'}
|
public_fields = {'full_name', 'username', 'email', 'extension_props_public', 'badges'}
|
||||||
for field in list(user.keys()):
|
for field in list(user.keys()):
|
||||||
if field not in public_fields:
|
if field not in public_fields:
|
||||||
del user[field]
|
del user[field]
|
||||||
|
@@ -33,7 +33,8 @@ def get_user_info(user_id):
|
|||||||
# TODO: put those fields into a config var or module-level global.
|
# TODO: put those fields into a config var or module-level global.
|
||||||
return {'email': user.email,
|
return {'email': user.email,
|
||||||
'full_name': user.full_name,
|
'full_name': user.full_name,
|
||||||
'username': user.username}
|
'username': user.username,
|
||||||
|
'badges_html': (user.badges and user.badges.html) or ''}
|
||||||
|
|
||||||
|
|
||||||
def setup_app(app):
|
def setup_app(app):
|
||||||
|
@@ -754,6 +754,24 @@ section.node-details-container
|
|||||||
&.status
|
&.status
|
||||||
color: $color-text-dark
|
color: $color-text-dark
|
||||||
|
|
||||||
|
ul.blender-id-badges
|
||||||
|
padding-left: 0
|
||||||
|
list-style-type: none
|
||||||
|
display: flex
|
||||||
|
|
||||||
|
> li
|
||||||
|
margin: 0
|
||||||
|
padding: 0
|
||||||
|
|
||||||
|
> a
|
||||||
|
display: block
|
||||||
|
padding: 2px
|
||||||
|
|
||||||
|
img
|
||||||
|
// TODO(Pablo): fix this so that it keeps the aspect ratio okay when the original image isn't square.
|
||||||
|
max-width: 16px
|
||||||
|
max-height: 16px
|
||||||
|
|
||||||
.node-details-license
|
.node-details-license
|
||||||
color: $color-text-dark-secondary
|
color: $color-text-dark-secondary
|
||||||
&:hover
|
&:hover
|
||||||
|
@@ -10,6 +10,9 @@
|
|||||||
.comment-content
|
.comment-content
|
||||||
.comment-body
|
.comment-body
|
||||||
p.comment-author {{ comment._user.full_name }}
|
p.comment-author {{ comment._user.full_name }}
|
||||||
|
//- TODO(Pablo): due to the broad styling done on the .comment-content class the
|
||||||
|
//- styling for the badges that I put in _project.sass isn't applied properly here.
|
||||||
|
| {{ comment._user.badges_html|safe }}
|
||||||
|
|
||||||
span {{comment.properties | markdowned('content') }}
|
span {{comment.properties | markdowned('content') }}
|
||||||
|
|
||||||
|
@@ -47,6 +47,7 @@
|
|||||||
|
|
||||||
li(title="Author")
|
li(title="Author")
|
||||||
| {{ node.user.full_name }}
|
| {{ node.user.full_name }}
|
||||||
|
| {{ node.user.badges.html|safe }}
|
||||||
|
|
||||||
li(
|
li(
|
||||||
title="Created {{ node._created }} (updated {{ node._updated | pretty_date_time }})")
|
title="Created {{ node._created }} (updated {{ node._updated | pretty_date_time }})")
|
||||||
|
Reference in New Issue
Block a user