keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Issue 9167: Adding more direction indicators

Browse source
This commit is contained in:
Michael 2020-09-09 16:54:18 +00:00
parent 6c5af09589
commit 555856208e
3 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
include/conversation.php
View file

@ -741,13 +741,15 @@ function conversation_fetch_comments($thread_items, $pinned) {
$direction = ['direction' => 5, 'title' => DI::l10n()->t('%s commented on this.', $row['author-name'])]; $direction = ['direction' => 5, 'title' => DI::l10n()->t('%s commented on this.', $row['author-name'])];
} }
if (($row['gravity'] == GRAVITY_PARENT) && !$row['origin'] && ($row['author-id'] == $row['owner-id']) if (($row['gravity'] == GRAVITY_PARENT) && !$row['origin'] && ($row['author-id'] == $row['owner-id'])) {
&& !Contact::isSharing($row['author-id'], $row['uid'])) { if (!Contact::isSharing($row['author-id'], $row['uid'])) {
if ($row['post-type'] == Item::PT_TAG) { if ($row['post-type'] == Item::PT_TAG) {
$row['direction'] = ['direction' => 4, 'title' => DI::l10n()->t('Tagged')]; $row['direction'] = ['direction' => 4, 'title' => DI::l10n()->t('Tagged')];
}
$parentlines[] = $lineno;
} else {
$row['direction'] = ['direction' => 6, 'title' => DI::l10n()->t('You are following %s.', $row['author-name'])];
} }
$parentlines[] = $lineno;
} }
if ($row['gravity'] == GRAVITY_PARENT) { if ($row['gravity'] == GRAVITY_PARENT) {

4
view/theme/frio/templates/sub/direction.tpl
View file

@ -11,6 +11,10 @@
<i class="fa fa-hashtag" aria-hidden="true" title="{{$direction.title}}"></i> <i class="fa fa-hashtag" aria-hidden="true" title="{{$direction.title}}"></i>
{{elseif $direction.direction == 5}} {{elseif $direction.direction == 5}}
<i class="fa fa-comment-o" aria-hidden="true" title="{{$direction.title}}"></i> <i class="fa fa-comment-o" aria-hidden="true" title="{{$direction.title}}"></i>
{{elseif $direction.direction == 6}}
<i class="fa fa-check" aria-hidden="true" title="{{$direction.title}}"></i>
{{elseif $direction.direction == 7}}
<i class="fa fa-at" aria-hidden="true" title="{{$direction.title}}"></i>
{{/if}} {{/if}}
</span> </span>
{{/if}} {{/if}}

4
view/theme/vier/templates/sub/direction.tpl
View file

@ -11,6 +11,10 @@
<i class="icon-tag" aria-hidden="true" title="{{$direction.title}}"></i> <i class="icon-tag" aria-hidden="true" title="{{$direction.title}}"></i>
{{elseif $direction.direction == 5}} {{elseif $direction.direction == 5}}
<i class="icon-commenting" aria-hidden="true" title="{{$direction.title}}"></i> <i class="icon-commenting" aria-hidden="true" title="{{$direction.title}}"></i>
{{elseif $direction.direction == 6}}
<i class="icon-ok-sign" aria-hidden="true" title="{{$direction.title}}"></i>
{{elseif $direction.direction == 7}}
<i class="icon-forward" aria-hidden="true" title="{{$direction.title}}"></i>
{{/if}} {{/if}}
</span> </span>
{{/if}} {{/if}}