Issue 9135: Display only reshared posts at the top
This commit is contained in:
parent
fb7f7435c0
commit
42dcd6646e
|
@ -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'];
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1985,6 +1985,7 @@ ul.dropdown-menu li:hover {
|
|||
}
|
||||
|
||||
/* Media Classes */
|
||||
.wall-item-ammounce,
|
||||
.media .time,
|
||||
.media .shared-time,
|
||||
.media .delivery,
|
||||
|
|
|
@ -81,7 +81,7 @@ as the value of $top_child_total (this is done at the end of this file)
|
|||
<span class="uriid" style="display: none;">{{$item.uriid}}</span>
|
||||
{{/if}}
|
||||
<div class="media {{$item.shiny}}">
|
||||
{{if $item.responses.announce && $mode != 'display'}}
|
||||
{{if $item.reshared}}
|
||||
<div class="wall-item-ammounce wall-item-responses" id="wall-item-ammounce-{{$item.id}}">{{$item.responses.announce.output nofilter}}</div>
|
||||
{{/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}}
|
||||
<div class="wall-item-responses">
|
||||
{{foreach $item.responses as $verb=>$response}}
|
||||
{{if $verb != 'announce' || $mode == 'display'}}
|
||||
<div class="wall-item-{{$verb}}" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.output nofilter}}</div>
|
||||
{{/if}}
|
||||
{{/foreach}}
|
||||
</div>
|
||||
{{/if}}
|
||||
|
|
Loading…
Reference in New Issue
Block a user