Merge pull request #4840 from AndyHee/doc20180413

[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 dc339c83d053b060ebe5ee4c60f59b29ae5e2195..927dc9bfaa7441b2e8fc56b0d7fa88b14d3a59fd 100644 (file)
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -154,16 +154,16 @@ as the value of $top_child_total (this is done at the end of this file)
                <div class="dropdown pull-left"><!-- Dropdown -->
                        {{if $item.thread_level==1}}
                        <div class="hidden-sm hidden-xs contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}} p-author h-card">
-                               <a class="userinfo" id="wall-item-photo-menu-{{$item.id}} u-url" href="{{$item.profile_url}}">
+                               <a class="userinfo  u-url" id="wall-item-photo-menu-{{$item.id}}" href="{{$item.profile_url}}">
                                        <div class="contact-photo-image-wrapper">
                                                <img src="{{$item.thumb}}" class="contact-photo media-object {{$item.sparkle}} p-name u-photo" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
                                        </div>
                                </a>
                        </div>
                        <div class="hidden-lg hidden-md contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}">
-                               <a class="userinfo" id="wall-item-photo-menu-{{$item.id}}" href="{{$item.profile_url}}">
+                               <a class="userinfo u-url" id="wall-item-photo-menu-xs-{{$item.id}}" href="{{$item.profile_url}}">
                                        <div class="contact-photo-image-wrapper">
-                                               <img src="{{$item.thumb}}" class="contact-photo-xs media-object {{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
+                                               <img src="{{$item.thumb}}" class="contact-photo-xs media-object {{$item.sparkle}}" id="wall-item-photo-xs-{{$item.id}}" alt="{{$item.name}}" />
                                        </div>
                                </a>
                        </div>
@@ -182,9 +182,9 @@ as the value of $top_child_total (this is done at the end of this file)
                        {{* The avatar picture for comments *}}
                        {{if $item.thread_level!=1}}
                        <div class="contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}} p-author h-card">
-                               <a class="userinfo" id="wall-item-photo-menu-{{$item.id}} u-url" href="{{$item.profile_url}}">
+                               <a class="userinfo u-url" id="wall-item-photo-menu-{{$item.id}}" href="{{$item.profile_url}}">
                                        <div class="contact-photo-image-wrapper">
-                                               <img src="{{$item.thumb}}" class="contact-photo-xs media-object {{$item.sparkle}} p-name u-photo" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
+                                               <img src="{{$item.thumb}}" class="contact-photo-xs media-object {{$item.sparkle}} p-name u-photo" id="wall-item-photo-comment-{{$item.id}}" alt="{{$item.name}}" />
                                        </div>
                                </a>
                        </div>
@@ -245,7 +245,7 @@ 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-->
@@ -263,23 +263,25 @@ as the value of $top_child_total (this is done at the end of this file)
                        <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 +325,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;" />