From 4a388e84af5f0cf44057f1b6f86f3f9e9e365749 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 28 May 2016 13:08:43 +0200 Subject: [PATCH] Frio: Adopt changes to search_item.tpl as well. --- include/conversation.php | 4 ++++ view/theme/frio/css/style.css | 2 ++ view/theme/frio/templates/search_item.tpl | 17 +++++++++++++---- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index a52502ec39..d889ba0020 100644 --- 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 3bf74d7fd7..35c490738a 100644 --- 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 89c05b058e..122a86ae86 100644 --- a/view/theme/frio/templates/search_item.tpl +++ b/view/theme/frio/templates/search_item.tpl @@ -10,13 +10,22 @@
- {{* 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 *}} + - {{/if}} {{* The avatar picture and the photo-menu *}}