strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Frio: Adopt changes to search_item.tpl as well.

Browse source
This commit is contained in:
Michael Vogel 2016-05-28 13:08:43 +02:00
parent add258ac08
commit 4a388e84af
3 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/conversation.php
View file

@ -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),

2
view/theme/frio/css/style.css
View file

@ -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;

17
view/theme/frio/templates/search_item.tpl
View file

@ -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}}