Merge pull request #2860 from annando/1610-duplicate-check

[friendica.git] / view / theme / frio / templates / search_item.tpl

diff --git a/view/theme/frio/templates/search_item.tpl b/view/theme/frio/templates/search_item.tpl
index 89c05b058e75f0a6d0068577743b5820e43d0a4a..9722a6e1d44e4aa5c5bc63298be91adf96a171e8 100644 (file)
--- a/view/theme/frio/templates/search_item.tpl
+++ b/view/theme/frio/templates/search_item.tpl
@@ -10,13 +10,22 @@
 <div class="panel">    
        <div class="wall-item-container panel-body{{$item.indent}} {{$item.shiny}} {{$item.previewing}}" >
                <div class="media">
-                       {{* Put addional actions in a top-right dorpdown menu *}}
-                       {{if $item.star || $item.drop.dropping || $item.edpost}}
+                       {{* Put additional actions in a top-right dropdown menu *}}
+
                        <ul class="nav nav-pills preferences">
+                               <li><span class="wall-item-network" title="{{$item.app}}">{{$item.network_name}}</span></li>
+
+                               {{if $item.plink || $item.star || $item.drop.dropping || $item.edpost}}
                                <li class="dropdown">
                                        <a class="dropdown-toggle" data-toggle="dropdown"  href="#" id="dropdownMenuTools-{{$item.id}}" role="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-angle-down"></i></a>
 
                                        <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenuTools-{{$item.id}}">
+                                               {{if $item.plink}}      {{*link to the original source of the item *}}
+                                               <li role="menuitem">
+                                                       <a title="{{$item.plink.title}}" href="{{$item.plink.href}}" class="navicon plink"><i class="fa fa-external-link"></i> {{$item.plink.title}}</a>
+                                               </li>
+                                               {{/if}}
+
                                                {{if $item.edpost}} {{* edit the posting *}}
                                                <li role="menuitem">
                                                        <a href="#" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}" class="navicon pencil"><i class="fa fa-pencil"></i> {{$item.edpost.1}}</a>
@@ -50,8 +59,8 @@
                                                {{/if}}
                                        </ul>
                                </li>
+                               {{/if}}
                        </ul>
-                       {{/if}}
 
                        {{* The avatar picture and the photo-menu *}}
                        <div class="dropdown pull-left"><!-- Dropdown -->
@@ -80,7 +89,7 @@
 
                                        <div class="additional-info text-muted">
                                                <div id="wall-item-ago-{{$item.id}}" class="wall-item-ago">
-                                                       <small><span class="time" title="{{$item.localtime}}" data-toggle="tooltip">{{$item.ago}}</span></small>
+                                                       <small><a href="{{$item.plink.orig}}"><span class="time" title="{{$item.localtime}}" data-toggle="tooltip">{{$item.ago}}</span></a></small>
                                                </div>
 
                                                {{if $item.location}}
@@ -160,29 +169,34 @@
 
                                        {{* Buttons for like and dislike *}}
                                        {{if $item.vote}}
-                                       <div class="vote-like pull-left">
+                                               {{if $item.vote.like}}
                                                <a role="button" href="#" class="button-likes" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false;">{{$item.vote.like.0}}</a>
+                                               {{/if}}
+
+                                               {{if $item.vote.like AND $item.vote.dislike}}
+                                               <span role="presentation" class="separator">&nbsp;•&nbsp;</span>
+                                               {{/if}}
 
                                                {{if $item.vote.dislike}}
-                                               <span role="presentation" class="seperator">&nbsp;•&nbsp;</span>
                                                <a role="button" href="#" class="button-likes" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false;">{{$item.vote.dislike.0}}</a>
                                                {{/if}}
 
-                                               {{if $item.comment}}<span role="presentation" class="seperator">&nbsp;•&nbsp;</span>{{/if}}
-                                       </div>
+                                               {{if ($item.vote.like OR $item.vote.dislike) AND $item.comment}}
+                                               <span role="presentation" class="separator">&nbsp;•&nbsp;</span>
+                                               {{/if}}
                                        {{/if}}
 
                                        {{* Butten to open the comment text field *}}
                                        {{if $item.comment}}
-                                       <div id="button-reply" class="pull-left">
-                                               <a role="button" class="" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});">{{$item.switchcomment}} </a>
-                                       </div>
+                                       <a role="button" class="" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});">{{$item.switchcomment}} </a>
                                        {{/if}}
 
                                        {{* Button for sharing the item *}}
                                        {{if $item.vote}}
+                                               {{if ($item.vote.like OR $item.vote.dislike OR $item.comment) AND $item.vote.share}}
+                                               <span role="presentation" class="separator">&nbsp;•&nbsp;</span>
+                                               {{/if}}
                                                {{if $item.vote.share}}
-                                               <span role="presentation" class="seperator">&nbsp;•&nbsp;</span>
                                                <a role="button" href="#" class="" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false;"><i class="fa fa-retweet"></i>&nbsp;{{$item.vote.share.0}}</a>
                                                {{/if}}
                                        {{/if}}