Frio: Adopt changes to search_item.tpl as well.

diff --git a/include/conversation.php b/include/conversation.php
index a52502ec3923a226a4e7c2b4e830872f86e8838a..d889ba002021f3e27919bac2a4afa8a49befed4a 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -668,10 +668,14 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                                        $owner_name_e = $owner_name;
                                }
 
+                               if ($item['item_network'] == "")
+                                       $item['item_network'] = $item['network'];
+
                                $tmp_item = array(
                                        'template' => $tpl,
                                        'id' => (($preview) ? 'P0' : $item['item_id']),
                                        'network' => $item['item_network'],
+                                       'network_name' => network_to_name($item['item_network'], $profile_link),
                                        'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
                                        'profile_url' => $profile_link,
                                        'item_photo_menu' => item_photo_menu($item),

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 3bf74d7fd770a6782a8957edad4dffe757221281..35c490738a0603fba59d2c37c559a222e04f62ce 100644 (file)
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -1092,9 +1092,11 @@ section #jotOpen {
 
 /* Thread hover effects */
 .wall-item-container .wall-item-content a,
+.wall-item-container a,
 .wall-item-container .fakelink,
 .toplevel_item .fakelink,
 .toplevel_item .wall-item-container .btn-link,
+.wall-item-container .btn-link,
 .toplevel_item .wall-item-container .wall-item-responses a {
     color: #555;
     -webkit-transition: all 0.25s ease-in-out;

diff --git a/view/theme/frio/templates/search_item.tpl b/view/theme/frio/templates/search_item.tpl
index 89c05b058e75f0a6d0068577743b5820e43d0a4a..122a86ae860ddff8223c7a465207e1c8258348b7 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}}