Merge pull request #13758 from Raroun/frio_More_space_between_photo_permissions_and_s...

[friendica.git] / view / theme / quattro / templates / wall_item_tag.tpl

diff --git a/view/theme/quattro/templates/wall_item_tag.tpl b/view/theme/quattro/templates/wall_item_tag.tpl
index 90ceafce52d6bc1bb26601eea9b3a257127f88a4..023bde9705fc15b049e82190c33c8b8c4d6f4d05 100644 (file)
--- a/view/theme/quattro/templates/wall_item_tag.tpl
+++ b/view/theme/quattro/templates/wall_item_tag.tpl
@@ -2,12 +2,12 @@
 {{else}}
 {{if $item.comment_firstcollapsed}}
        <div class="hide-comments-outer">
-               <span id="hide-comments-total-{{$item.id}}" 
+               <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" 
+                       <span id="hide-comments-{{$item.id}}"
+                               class="hide-comments fakelink"
                                onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
-                       {{if $item.thread_level==3}} - 
+                       {{if $item.thread_level==3}} -
                        <span id="hide-thread-{{$item}}-id"
                                class="fakelink"
                                onclick="showThread({{$item.id}});">expand</span> /
@@ -30,21 +30,21 @@
                                        <img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
                                </a>
                                <ul class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
-                               {{$item.item_photo_menu nofilter}}
+                               {{$item.item_photo_menu_html nofilter}}
                                </ul>
-                               
+
                        </div>
-                       <div class="wall-item-location">{{$item.location}}</div>        
+                       <div class="wall-item-location">{{$item.location_html nofilter}}</div>
                </div>
                <div class="wall-item-content">
-                       {{$item.ago}} {{$item.body nofilter}}
+                       {{$item.ago}} {{$item.body_html nofilter}}
                </div>
                        <div class="wall-item-tools">
-                               {{if $item.drop.pagedrop}}
+                               {{if $item.drop && $item.drop.pagedrop}}
                                        <input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
                                {{/if}}
-                               {{if $item.drop.dropping}}
-                                       <a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
+                               {{if $item.drop && $item.drop.dropping}}
+                                       <a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.label}}">{{$item.drop.label}}</a>
                                {{/if}}
                        </div>
        </div>
@@ -58,10 +58,10 @@
 {{/if}}
 
 {{* top thread comment box *}}
-{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
-<div class="wall-item-comment-wrapper" >{{$item.comment nofilter}}</div>
+{{if $item.threaded}}{{if $item.comment_html}}{{if $item.thread_level==1}}
+<div class="wall-item-comment-wrapper">{{$item.comment_html nofilter}}</div>
 {{/if}}{{/if}}{{/if}}
 
 {{if $item.flatten}}
-<div class="wall-item-comment-wrapper" >{{$item.comment nofilter}}</div>
+<div class="wall-item-comment-wrapper">{{$item.comment_html nofilter}}</div>
 {{/if}}