Merge pull request #9200 from annando/global-direction

Improve "direction" icons on "vier", new direction "global"
This commit is contained in:
Tobias Diekershoff 2020-09-14 14:10:43 +02:00 committed by GitHub
commit cade34cd2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 2 deletions

View file

@ -769,6 +769,10 @@ function conversation_fetch_comments($thread_items, $pinned) {
case Item::PT_STORED:
$row['direction'] = ['direction' => 8, 'title' => DI::l10n()->t('Stored')];
break;
default:
if ($row['uid'] == 0) {
$row['direction'] = ['direction' => 9, 'title' => DI::l10n()->t('Global')];
}
}
if (($row['gravity'] == GRAVITY_PARENT) && !$row['origin'] && ($row['author-id'] == $row['owner-id']) &&

View file

@ -17,6 +17,8 @@
<i class="fa fa-at" aria-hidden="true" title="{{$direction.title}}"></i>
{{elseif $direction.direction == 8}}
<i class="fa fa-share" aria-hidden="true" title="{{$direction.title}}"></i>
{{elseif $direction.direction == 9}}
<i class="fa fa-globe" aria-hidden="true" title="{{$direction.title}}"></i>
{{/if}}
</span>
{{/if}}

View file

@ -6,17 +6,19 @@
{{elseif $direction.direction == 2}}
<i class="icon-download" aria-hidden="true" title="{{$direction.title}}"></i>
{{elseif $direction.direction == 3}}
<i class="icon-share" aria-hidden="true" title="{{$direction.title}}"></i>
<i class="icon-retweet" aria-hidden="true" title="{{$direction.title}}"></i>
{{elseif $direction.direction == 4}}
<i class="icon-tag" aria-hidden="true" title="{{$direction.title}}"></i>
{{elseif $direction.direction == 5}}
<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>
<i class="icon-user" aria-hidden="true" title="{{$direction.title}}"></i>
{{elseif $direction.direction == 7}}
<i class="icon-forward" aria-hidden="true" title="{{$direction.title}}"></i>
{{elseif $direction.direction == 8}}
<i class="icon-share" aria-hidden="true" title="{{$direction.title}}"></i>
{{elseif $direction.direction == 9}}
<i class="icon-globe" aria-hidden="true" title="{{$direction.title}}"></i>
{{/if}}
</span>
{{/if}}