Merge pull request #6516 from Ixiter/develop

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

diff --git a/view/theme/quattro/templates/wall_thread.tpl b/view/theme/quattro/templates/wall_thread.tpl
index 89832403fcfa7ac0d7d844ad6b26fb8e623e562e..1d2295278b91f2dad1a8c8c82c4e69d53f063e70 100644 (file)
--- a/view/theme/quattro/templates/wall_thread.tpl
+++ b/view/theme/quattro/templates/wall_thread.tpl
@@ -45,7 +45,7 @@
                                </a>
                                <a href="#" rel="#wall-item-photo-menu-{{$item.id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$item.id}}">menu</a>
                                <ul class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
-                               {{$item.item_photo_menu}}
+                               {{$item.item_photo_menu nofilter}}
                                </ul>
 
                        </div>
@@ -56,11 +56,11 @@
                                </a>
                        </div>
                        {{/if}}
-                       <div class="wall-item-location">{{$item.location}}</div>
+                       <div class="wall-item-location">{{$item.location nofilter}}</div>
                </div>
                <div class="wall-item-content">
                        {{if $item.title}}<h2><a href="{{$item.plink.href}}" class="{{$item.sparkle}} p-name">{{$item.title}}</a></h2>{{/if}}
-                       <span class="e-content {{if !$item.title}}p-name{{/if}}">{{$item.body}}</span>
+                       <span class="wall-item-body e-content {{if !$item.title}}p-name{{/if}}">{{$item.body nofilter}}</span>
                </div>
        </div>
        <div class="wall-item-bottom">
@@ -69,10 +69,10 @@
                <div class="wall-item-tags">
                {{if !$item.suppress_tags}}
                        {{foreach $item.hashtags as $tag}}
-                               <span class="tag">{{$tag}}</span>
+                               <span class="tag">{{$tag nofilter}}</span>
                        {{/foreach}}
-                       {{foreach $item.mentions as $tag}}
-                               <span class="mention">{{$tag}}</span>
+                       {{foreach $item.mentions as $tag}}
+                               <span class="mention">{{$tag nofilter}}</span>
                        {{/foreach}}
                        {{foreach $item.folders as $cat}}
                                <span class="folder p-category">{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
@@ -140,7 +140,7 @@
                                        <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>
+                                       <a href="item/drop/{{$item.id}}/{{$item.return}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
                                {{/if}}
                                {{if $item.edpost}}
                                        <a class="icon edit s16" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
@@ -153,7 +153,7 @@
                <div class="wall-item-links"></div>
                {{if $item.responses}}
                        {{foreach $item.responses as $verb=>$response}}
-                               <div class="wall-item-{{$verb}}" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.output}}</div>
+                               <div class="wall-item-{{$verb}}" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.output nofilter}}</div>
                        {{/foreach}}
                {{/if}}
        </div>
@@ -162,7 +162,7 @@
        <div class="wall-item-bottom commentbox">
                <div class="wall-item-links"></div>
                <div class="wall-item-comment-wrapper">
-                                       {{$item.comment}}
+                                       {{$item.comment nofilter}}
                </div>
        </div>
        {{/if}}{{/if}}{{/if}}
@@ -187,10 +187,10 @@
 
 {{* top thread comment box *}}
 {{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
-<div class="wall-item-comment-wrapper" >{{$item.comment}}</div>
+<div class="wall-item-comment-wrapper" >{{$item.comment nofilter}}</div>
 {{/if}}{{/if}}{{/if}}
 
 
 {{if $item.flatten}}
-<div class="wall-item-comment-wrapper" >{{$item.comment}}</div>
+<div class="wall-item-comment-wrapper" >{{$item.comment nofilter}}</div>
 {{/if}}