diff options
| -rw-r--r-- | Zotlabs/Lib/AccessList.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Lib/ThreadItem.php | 1 | ||||
| -rw-r--r-- | view/css/conversation.css | 8 | ||||
| -rw-r--r-- | view/tpl/conv_item.tpl | 3 | ||||
| -rw-r--r-- | view/tpl/conv_list.tpl | 3 | ||||
| -rw-r--r-- | view/tpl/search_item.tpl | 3 |
6 files changed, 19 insertions, 1 deletions
diff --git a/Zotlabs/Lib/AccessList.php b/Zotlabs/Lib/AccessList.php index f47440714..a073d5946 100644 --- a/Zotlabs/Lib/AccessList.php +++ b/Zotlabs/Lib/AccessList.php @@ -23,7 +23,7 @@ class AccessList { ); if (($z) && $z[0]['deleted']) { q('UPDATE pgrp SET deleted = 0 WHERE id = %d', intval($z[0]['id'])); - notice(t('A deleted list with this name was revived. Existing item permissions <strong>may</strong> apply to this list and any future members. If this is not what you intended, please create another list with a different name.') . EOL); + notice(t('A deleted privacy group with this name was revived. Existing item permissions <strong>may</strong> apply to this privacy group and any future members. If this is not what you intended, please create another privacy group with a different name.') . EOL); } $hash = self::by_id($uid, $r); return $hash; diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index e7cb2d5de..4675df04e 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -424,6 +424,7 @@ class ThreadItem { 'mids' => $json_mids, 'parent' => $item['parent'], 'author_id' => (($item['author']['xchan_addr']) ? $item['author']['xchan_addr'] : $item['author']['xchan_url']), + 'author_is_group_actor' => (($item['author']['xchan_pubforum']) ? t('Forum') : ''), 'isevent' => $isevent, 'attend' => $attend, 'consensus' => $consensus, diff --git a/view/css/conversation.css b/view/css/conversation.css index 88081c2c6..14adc8df0 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -115,6 +115,14 @@ position: relative; } +.wall-item-photo-group-actor { + position: absolute; + right: 3px; + top: 0px; + color: #fff; + text-shadow: 1px 1px 3px rgba(0, 0, 0, .5); +} + .wall-item-photo-caret { position: absolute; left: 3px; diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 0a07319c8..e9d5e3c63 100644 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -36,6 +36,9 @@ <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}"> <img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" loading="lazy" data-bs-toggle="dropdown" /> + {{if $item.author_is_group_actor}} + <i class="fa fa-comments-o wall-item-photo-group-actor" title="{{$item.author_is_group_actor}}"></i> + {{/if}} {{if $item.thread_author_menu}} <i class="fa fa-caret-down wall-item-photo-caret cursor-pointer" data-bs-toggle="dropdown"></i> <div class="dropdown-menu"> diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index b4071ba16..0463afdcb 100644 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -30,6 +30,9 @@ <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}"> <img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" data-bs-toggle="dropdown" loading="lazy" /></a> + {{if $item.author_is_group_actor}} + <i class="fa fa-comments-o wall-item-photo-group-actor" title="{{$item.author_is_group_actor}}"></i> + {{/if}} {{if $item.thread_author_menu}} <i class="fa fa-caret-down wall-item-photo-caret cursor-pointer" data-bs-toggle="dropdown"></i> <div class="dropdown-menu"> diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index f3d0a8d03..cb9ad57cc 100644 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -24,6 +24,9 @@ <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}"> <img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" data-bs-toggle="dropdown" loading="lazy" /> + {{if $item.author_is_group_actor}} + <i class="fa fa-comments-o wall-item-photo-group-actor" title="{{$item.author_is_group_actor}}"></i> + {{/if}} {{if $item.thread_author_menu}} <i class="fa fa-caret-down wall-item-photo-caret cursor-pointer" data-bs-toggle="dropdown"></i> <div class="dropdown-menu"> |