Merge branch 'develop' into task/6778-add-storage-move-to-cron

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

diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index 0fcb84bad0e3923875a7ab8d60c77d5b8c31aff2..bd069f5cd7e87f3cb6ed28784911f89f7d195a80 100644 (file)
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -42,11 +42,11 @@ as the value of $top_child_total (this is done at the end of this file)
                <div class="hide-comments-outer-wrapper">
                        <div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});">
                                <span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">
-                                       <i class="fa fa-plus-square" aria-hidden="true"></i>
+                                       <i class="fa fa-caret-right" aria-hidden="true"></i>
                                        {{$item.num_comments}} - {{$item.show_text}}
                                </span>
                                <span id="hide-comments-{{$item.id}}" class="hide-comments" style="display: none">
-                                       <i class="fa fa-minus-square" aria-hidden="true"></i>
+                                       <i class="fa fa-caret-down" aria-hidden="true"></i>
                                        {{$item.num_comments}} - {{$item.hide_text}}
                                </span>
                        </div>
@@ -293,8 +293,11 @@ as the value of $top_child_total (this is done at the end of this file)
                        {{foreach $item.mentions as $tag}}
                                <span class="mention label btn-warning sm">{{$tag nofilter}} <i class="fa fa-user" aria-hidden="true"></i></span>
                        {{/foreach}}
-               {{/if}}
 
+                       {{*foreach $item.implicit_mentions as $tag}}
+                               <span class="mention label label-default sm">{{$tag nofilter}} <i class="fa fa-eye-slash" aria-hidden="true"></i></span>
+                       {{/foreach*}}
+               {{/if}}
                        {{foreach $item.folders as $cat}}
                                <span class="folder label btn-danger sm p-category">{{$cat.name}}{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
                        {{/foreach}}
@@ -408,24 +411,22 @@ as the value of $top_child_total (this is done at the end of this file)
                {{* Insert the comment box of the top level post at the bottom of the thread.
                        Display this comment box if there are any comments. If not hide it. In this
                        case it could be opend with the "comment" button *}}
-               {{if $item.total_comments_num}}
+               {{if $item.comment && $item.thread_level==1}}
+                       {{if $item.total_comments_num}}
                        <div class="comment-fake-form" id="comment-fake-form-{{$item.id}}">
                                <textarea id="comment-fake-text-{{$item.id}}" class="comment-fake-text-empty form-control" placeholder="{{$item.reply_label}}" onFocus="commentOpenUI(this, {{$item.id}});"  rows="1"></textarea>
                        </div>
-               {{/if}}
-               {{if $item.comment && $item.thread_level==1}}
+                       {{/if}}
                        <div class="wall-item-comment-wrapper well well-small" id="item-comments-{{$item.id}}" data-display="block" style="display: none">{{$item.comment nofilter}}</div>
                {{/if}}
        </div><!-- /media -->
 </div><!-- ./panel-body or ./wall-item-container -->
 
-
 {{if $mode == display}}
 {{else}}
 {{if $item.comment_lastcollapsed}}</div>{{/if}}
 {{/if}}
 
-
 {{* close the comment-container div if no more thread_level = 2 children are left *}}
 {{if $item.thread_level==2 && $top_child_nr==$top_child_total}}
 </div><!--./comment-container-->