Merge pull request #7017 from annando/reshare-known-contact

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

diff --git a/view/templates/wall_thread.tpl b/view/templates/wall_thread.tpl
index 05185c32c334a5faba8903b3ed36fa31982fba58..01cd7559f188fe57f6982c0a4104084f89827b21 100644 (file)
--- a/view/templates/wall_thread.tpl
+++ b/view/templates/wall_thread.tpl
@@ -1,7 +1,12 @@
 
 {{if $item.comment_firstcollapsed}}
-       <div class="hide-comments-outer">
-       <span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
+       <div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});">
+               <span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">
+                       {{$item.num_comments}} - {{$item.show_text}}
+               </span>
+               <span id="hide-comments-{{$item.id}}" class="hide-comments" style="display: none">
+                       {{$item.num_comments}} - {{$item.hide_text}}
+               </span>
        </div>
        <div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
 {{/if}}
@@ -31,7 +36,7 @@
                                <span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
                 <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
                     <ul>
-                        {{$item.item_photo_menu}}
+                        {{$item.item_photo_menu nofilter}}
                     </ul>
                 </div>
 
@@ -40,7 +45,7 @@
                        <div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
                                {{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
                                {{else}}<div class="wall-item-lock"></div>{{/if}}
-                               <div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
+                               <div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location nofilter}}</div>
                        </div>
                </div>
                <div class="wall-item-author">
@@ -54,7 +59,7 @@
                        <div class="body-tag">
                        {{if !$item.suppress_tags}}
                                {{foreach $item.tags as $tag}}
-                               <span class="tag">{{$tag}}</span>
+                               <span class="tag">{{$tag nofilter}}</span>
                                {{/foreach}}
                        {{/if}}
                        </div>
@@ -111,7 +116,7 @@
        <div class="wall-item-wrapper-end"></div>
        {{if $item.responses}}
                {{foreach $item.responses as $verb=>$response}}
-                       <div class="wall-item-{{$verb}} {{$item.indent}}" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.output}}</div>
+                       <div class="wall-item-{{$verb}} {{$item.indent}}" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.output nofilter}}</div>
                {{/foreach}}
        {{/if}}
                        {{if $item.threaded}}