Merge pull request #1000 from fabrixxm/master

[friendica.git] / view / theme / vier / templates / wall_thread.tpl

diff --git a/view/theme/vier/templates/wall_thread.tpl b/view/theme/vier/templates/wall_thread.tpl
index 3062b518f301b375a13d629a5406e7b6b88773fe..049ae184749186a7cb4b21b4b1ff8112380d5876 100644 (file)
--- a/view/theme/vier/templates/wall_thread.tpl
+++ b/view/theme/vier/templates/wall_thread.tpl
@@ -96,9 +96,11 @@
                </div>
                <div class="wall-item-actions">
                        <div class="wall-item-actions-social">
-                       {{if $item.threaded}}{{if $item.comment}}
-                               <span id="comment-{{$item.id}}" class="fakelink togglecomment" onclick="openClose('item-comments-{{$item.id}}');"><i class="icon-comment"></i></span>
-                       {{/if}}{{/if}}
+                       {{if $item.threaded}}
+                       {{/if}}
+                       {{if $item.comment}}
+                               <span id="comment-{{$item.id}}" class="fakelink togglecomment" onclick="commentExpand({{$item.id}}); openClose('item-comments-{{$item.id}}');"><i class="icon-reply"></i></span>
+                       {{/if}}
                        {{if $item.vote}}
                                {{if $item.vote.like}}
                                <a href="#" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"><i class="icon-thumbs-up icon-large"></i></a>
@@ -171,11 +173,20 @@
 {{if $item.comment_lastcollapsed}}</div>{{/if}}
 {{/if}}
 
-{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
-<div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}">{{$item.comment}}</div>
-{{/if}}{{/if}}{{/if}}
+{{if $item.total_comments_num}}
+       {{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
+               <div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}">{{$item.comment}}</div>
+       {{/if}}{{/if}}{{/if}}
 
+       {{if $item.flatten}}
+               <div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}">{{$item.comment}}</div>
+       {{/if}}
+{{else}}
+       {{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
+               <div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}" style="display: none;">{{$item.comment}}</div>
+       {{/if}}{{/if}}{{/if}}
 
-{{if $item.flatten}}
-<div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}">{{$item.comment}}</div>
+       {{if $item.flatten}}
+               <div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}" style="display: none;">{{$item.comment}}</div>
+       {{/if}}
 {{/if}}