From 23bac849733484f92724283a10dd694bf9116207 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 14 Sep 2020 10:43:16 +0000 Subject: [PATCH] Improve "direction" icons on "vier", new direction "global" --- include/conversation.php | 4 ++++ view/theme/frio/templates/sub/direction.tpl | 2 ++ view/theme/vier/templates/sub/direction.tpl | 6 ++++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index a995ea4ad1..8bfada619f 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -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']) && diff --git a/view/theme/frio/templates/sub/direction.tpl b/view/theme/frio/templates/sub/direction.tpl index 7873194332..50c7d5b8d4 100644 --- a/view/theme/frio/templates/sub/direction.tpl +++ b/view/theme/frio/templates/sub/direction.tpl @@ -17,6 +17,8 @@ {{elseif $direction.direction == 8}} + {{elseif $direction.direction == 9}} + {{/if}} {{/if}} diff --git a/view/theme/vier/templates/sub/direction.tpl b/view/theme/vier/templates/sub/direction.tpl index 4ebe216772..c4f959beb7 100644 --- a/view/theme/vier/templates/sub/direction.tpl +++ b/view/theme/vier/templates/sub/direction.tpl @@ -6,17 +6,19 @@ {{elseif $direction.direction == 2}} {{elseif $direction.direction == 3}} - + {{elseif $direction.direction == 4}} {{elseif $direction.direction == 5}} {{elseif $direction.direction == 6}} - + {{elseif $direction.direction == 7}} {{elseif $direction.direction == 8}} + {{elseif $direction.direction == 9}} + {{/if}} {{/if}}