diff options
author | Habeas Codice <habeascodice@federated.social> | 2014-11-18 12:14:14 -0800 |
---|---|---|
committer | Habeas Codice <habeascodice@federated.social> | 2014-11-18 12:14:14 -0800 |
commit | 6413395a76d57960708f17016f04a682b3643aa7 (patch) | |
tree | 32ba1c7156f4e7c4bc72dcea384bfedf2d35834c /view/tpl/conv_list.tpl | |
parent | 6cc906fd1d7226e4db2f546551c14fe04ea815e7 (diff) | |
parent | 1d96e165e00ed54df0573bda79c2a274f21aeb16 (diff) | |
download | volse-hubzilla-6413395a76d57960708f17016f04a682b3643aa7.tar.gz volse-hubzilla-6413395a76d57960708f17016f04a682b3643aa7.tar.bz2 volse-hubzilla-6413395a76d57960708f17016f04a682b3643aa7.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view/tpl/conv_list.tpl')
-rwxr-xr-x | view/tpl/conv_list.tpl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index 71554a9b3..b9a966e93 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -164,7 +164,8 @@ {{/if}} </div> <div class="clear"></div> - <div class="wall-item-list-comments"><a href="{{$item.llink}}">{{$item.comment_count_txt}}</a></div> + <div class="wall-item-list-comments"><a href="{{$item.llink}}">{{$item.comment_count_txt}}{{if $item.unseen_comments}} +<span class="unseen-wall-indicator-{{$item.id}}">, {{$item.list_unseen_txt}}{{/if}}</span></a>{{if $item.unseen_comments}}<span class="unseen-wall-indicator-{{$item.id}}"> <button class="btn btn-default" title="{{$item.markseen}}" onclick="markItemRead({{$item.id}}); return false;"><i class="icon-check"></i></span>{{/if}}</div> </div> <div class="wall-item-wrapper-end"></div> <div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div> |