Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes NodeBB/NodeBB#4752 #293

Merged
merged 1 commit into from
Jun 21, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions templates/partials/topics_list.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
<meta itemprop="name" content="{function.stripTags, title}">

<div class="col-md-7 col-sm-9 col-xs-10 content">
<div class="avatar pull-left">
<div class="avatar pull-left" title="{topics.user.username}">
<!-- IF showSelect -->
<div class="select" component="topic/select">
<!-- IF topics.thumb -->
<img src="{topics.thumb}" class="user-img" title="{topics.user.username}" />
<img src="{topics.thumb}" class="user-img" />
<!-- ELSE -->
<!-- IF topics.user.picture -->
<img component="user/picture" data-uid="{topics.user.uid}" src="{topics.user.picture}" class="user-img" title="{topics.user.username}" />
<img component="user/picture" data-uid="{topics.user.uid}" src="{topics.user.picture}" class="user-img" />
<!-- ELSE -->
<div class="user-icon" style="background-color: {topics.user.icon:bgColor};" title="{topics.user.username}">{topics.user.icon:text}</div>
<div class="user-icon" style="background-color: {topics.user.icon:bgColor};">{topics.user.icon:text}</div>
<!-- ENDIF topics.user.picture -->
<!-- ENDIF topics.thumb -->
<i class="fa fa-check"></i>
Expand All @@ -24,12 +24,12 @@
<!-- IF !showSelect -->
<a href="<!-- IF topics.user.userslug -->{config.relative_path}/user/{topics.user.userslug}<!-- ELSE -->#<!-- ENDIF topics.user.userslug -->" class="pull-left">
<!-- IF topics.thumb -->
<img src="{topics.thumb}" class="user-img" title="{topics.user.username}" />
<img src="{topics.thumb}" class="user-img" />
<!-- ELSE -->
<!-- IF topics.user.picture -->
<img component="user/picture" data-uid="{topics.user.uid}" src="{topics.user.picture}" class="user-img" title="{topics.user.username}" />
<img component="user/picture" data-uid="{topics.user.uid}" src="{topics.user.picture}" class="user-img" />
<!-- ELSE -->
<div class="user-icon" style="background-color: {topics.user.icon:bgColor};" title="{topics.user.username}">{topics.user.icon:text}</div>
<div class="user-icon" style="background-color: {topics.user.icon:bgColor};">{topics.user.icon:text}</div>
<!-- ENDIF topics.user.picture -->
<!-- ENDIF topics.thumb -->
</a>
Expand Down