clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
parent 766d92aaa0 23bac84973
commit cade34cd2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/conversation.php
View File

@ -769,6 +769,10 @@ function conversation_fetch_comments($thread_items, $pinned) {
case Item::PT_STORED: case Item::PT_STORED:
$row['direction'] = ['direction' => 8, 'title' => DI::l10n()->t('Stored')]; $row['direction'] = ['direction' => 8, 'title' => DI::l10n()->t('Stored')];
break; 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']) && if (($row['gravity'] == GRAVITY_PARENT) && !$row['origin'] && ($row['author-id'] == $row['owner-id']) &&

2
view/theme/frio/templates/sub/direction.tpl
View File

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

6
view/theme/vier/templates/sub/direction.tpl
View File

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