Merge pull request #5619 from annando/dba-item

[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 877d04e880be3b04fef7abbf9888544899af6ab5..53efacda7020899ca4ea1229280d6758b9f31481 100644 (file)
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -245,10 +245,10 @@ as the value of $top_child_total (this is done at the end of this file)
                {{if $item.thread_level==1}}<hr />{{/if}}
 
                {{* item content *}}
-               <div itemprop="description" class="wall-item-content {{$item.type}}" id="wall-item-content-{{$item.id}}">
+               <div class="wall-item-content {{$item.type}}" id="wall-item-content-{{$item.id}}">
                        {{* insert some space if it's an top-level post *}}
                        {{if $item.thread_level==1}}
-                       <div style="height:10px;">&nbsp;</div> <!-- use padding/margin instead-->
+                       <div class="wall-spacer">&nbsp;</div> <!-- use padding/margin instead-->
                        {{/if}}
 
                        {{if $item.title}}
@@ -260,26 +260,27 @@ as the value of $top_child_total (this is done at the end of this file)
 
                <!-- TODO -->
                <div class="wall-item-bottom">
-                       <div class="wall-item-links">
-                       </div>
+                       <div class="wall-item-links"></div>
                        <div class="wall-item-tags">
-                               {{foreach $item.hashtags as $tag}}
-                                       <span class='tag label btn-info sm'>{{$tag}} <i class="fa fa-bolt" aria-hidden="true"></i></span>
-                               {{/foreach}}
-
-                               {{foreach $item.mentions as $tag}}
-                                       <span class='mention label btn-warning sm'>{{$tag}} <i class="fa fa-user" aria-hidden="true"></i></span>
-                               {{/foreach}}
+               {{if !$item.suppress_tags}}
+                       {{foreach $item.hashtags as $tag}}
+                               <span class="tag label btn-info sm">{{$tag}} <i class="fa fa-bolt" aria-hidden="true"></i></span>
+                       {{/foreach}}
+
+                       {{foreach $item.mentions as $tag}}
+                               <span class="mention label btn-warning sm">{{$tag}} <i class="fa fa-user" aria-hidden="true"></i></span>
+                       {{/foreach}}
+               {{/if}}
 
-                               {{foreach $item.folders as $cat}}
-                                       <span class='folder label btn-danger sm'><span class="p-category">{{$cat.name}}</span></a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
-                               {{/foreach}}
+                       {{foreach $item.folders as $cat}}
+                               <span class="folder label btn-danger sm"><span class="p-category">{{$cat.name}}</span></a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
+                       {{/foreach}}
 
-                               {{foreach $item.categories as $cat}}
-                                       <span class='category label btn-success sm'><span class="p-category">{{$cat.name}}</span></a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
-                               {{/foreach}}
+                       {{foreach $item.categories as $cat}}
+                               <span class="category label btn-success sm"><span class="p-category">{{$cat.name}}</span></a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
+                       {{/foreach}}
                        </div>
-                               {{if $item.edited}}<div class="itemedited text-muted">{{$item.edited['label']}} (<span title="{{$item.edited['date']}}">{{$item.edited['relative']}}</span>)</div>{{/if}}
+                       {{if $item.edited}}<div class="itemedited text-muted">{{$item.edited['label']}} (<span title="{{$item.edited['date']}}">{{$item.edited['relative']}}</span>)</div>{{/if}}
                </div>
                <!-- ./TODO -->
 
@@ -323,7 +324,7 @@ as the value of $top_child_total (this is done at the end of this file)
                                                {{if $item.vote.like OR $item.vote.dislike OR $item.comment}}
                                        <span role="presentation" class="separator">•</span>
                                                {{/if}}
-                                       <button type="button" class="btn-link button-votes" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet" aria-hidden="true"></i>&nbsp;{{$item.vote.share.1}}</a>
+                                       <button type="button" class="btn-link button-votes" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet" aria-hidden="true"></i>&nbsp;{{$item.vote.share.1}}</button>
                                        {{/if}}
                                {{/if}}
                                <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />