diff options
| author | Habeas Codice <habeascodice@federated.social> | 2014-11-19 21:11:11 -0800 |
|---|---|---|
| committer | Habeas Codice <habeascodice@federated.social> | 2014-11-19 21:11:11 -0800 |
| commit | c8af19c69c03b39d5eded833a2d9d8ed9ab5826c (patch) | |
| tree | 16ded6330f1baa9d8e889978c9e093f1e90d7d85 /view/tpl/conv_list.tpl | |
| parent | 92d0a9404ff92da23b558f9a73a3150f97b6a08e (diff) | |
| parent | 18cae8a78cb3df8ffcd9e4787c3b572c799036da (diff) | |
| download | volse-hubzilla-c8af19c69c03b39d5eded833a2d9d8ed9ab5826c.tar.gz volse-hubzilla-c8af19c69c03b39d5eded833a2d9d8ed9ab5826c.tar.bz2 volse-hubzilla-c8af19c69c03b39d5eded833a2d9d8ed9ab5826c.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view/tpl/conv_list.tpl')
| -rwxr-xr-x | view/tpl/conv_list.tpl | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index b9a966e93..aec1a78ab 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -104,7 +104,12 @@ </ul> </div> <div id="like-rotator-{{$item.id}}" class="like-rotator"></div> - <div class="wall-item-tools-left{{if $item.like_count && $item.dislike_count}} btn-group{{/if}}"> + <div class="wall-item-tools-left{{if $item.unseen_comments || $item.like_count || $item.dislike_count}} btn-group{{/if}}"> + + + <div class="wall-item-list-comments btn-group"><button class="btn btn-default btn-sm" onclick="window.location.href='{{$item.llink}}'; return false;">{{$item.comment_count_txt}}{{if $item.unseen_comments}} +<span class="unseen-wall-indicator-{{$item.id}}">, {{$item.list_unseen_txt}}{{/if}}</span></button></div>{{if $item.unseen_comments}}<div class="unseen-wall-indicator-{{$item.id}} btn-group"><button class="btn btn-default btn-sm" title="{{$item.markseen}}" onclick="markItemRead({{$item.id}}); return false;"><i class="icon-check"></i></div>{{/if}} + {{if $item.like_count}} <div class="btn-group"> <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="wall-item-like-{{$item.id}}">{{$item.like_count}} {{$item.like_button_label}}</button> @@ -164,8 +169,6 @@ {{/if}} </div> <div class="clear"></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> |