diff --git a/include/conversation.php b/include/conversation.php index 0baf4a819e..93c7fb4061 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -758,6 +758,7 @@ function conversation_fetch_comments($thread_items, $pinned) { if (!empty($direction)) { foreach ($parentlines as $line) { $comments[$line]['direction'] = $direction; + $comments[$line]['reshared'] = DI::l10n()->t('%s reshared this.', $actor['name']); if (!empty($actor) && DI::pConfig()->get(local_user(), 'system', 'display_resharer') ) { $comments[$line]['owner-link'] = $actor['link']; $comments[$line]['owner-avatar'] = $actor['avatar']; diff --git a/src/Object/Post.php b/src/Object/Post.php index 0f2a0c6518..788fdedde6 100644 --- a/src/Object/Post.php +++ b/src/Object/Post.php @@ -419,6 +419,12 @@ class Post } } + if (!empty($item['reshared'])) { + $reshared = $item['reshared']; + } else { + $reshared = ''; + } + $tmp_item = [ 'template' => $this->getTemplate(), 'type' => implode("", array_slice(explode("/", $item['verb']), -1)), @@ -497,6 +503,7 @@ class Post 'uriid' => $item['uri-id'], 'return' => (DI::args()->getCommand()) ? bin2hex(DI::args()->getCommand()) : '', 'direction' => $direction, + 'reshared' => $reshared, 'delivery' => [ 'queue_count' => $item['delivery_queue_count'], 'queue_done' => $item['delivery_queue_done'] + $item['delivery_queue_failed'], /// @todo Possibly display it separately in the future diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 95e551f94c..12aa1df852 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -1985,6 +1985,7 @@ ul.dropdown-menu li:hover { } /* Media Classes */ +.wall-item-ammounce, .media .time, .media .shared-time, .media .delivery, diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl index 6e8e013dcc..a4f980827a 100644 --- a/view/theme/frio/templates/wall_thread.tpl +++ b/view/theme/frio/templates/wall_thread.tpl @@ -81,7 +81,7 @@ as the value of $top_child_total (this is done at the end of this file) {{/if}}
- {{if $item.responses.announce && $mode != 'display'}} + {{if $item.reshared}}
{{$item.responses.announce.output nofilter}}
{{/if}} {{* The avatar picture and the photo-menu *}} @@ -530,9 +530,7 @@ as the value of $top_child_total (this is done at the end of this file) {{if $item.responses}}
{{foreach $item.responses as $verb=>$response}} - {{if $verb != 'announce' || $mode == 'display'}}
{{$response.output nofilter}}
- {{/if}} {{/foreach}}
{{/if}}