diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php index 2015b260d..823e1df29 100644 --- a/Zotlabs/Lib/Enotify.php +++ b/Zotlabs/Lib/Enotify.php @@ -869,7 +869,7 @@ class Enotify { $x = array( 'notify_link' => $item['llink'], 'name' => $item[$who]['xchan_name'], - 'addr' => $item[$who]['xchan_addr'] ?? $item[$who]['xchan_url'], + 'addr' => $item[$who]['xchan_addr'] ? $item[$who]['xchan_addr'] : $item[$who]['xchan_url'], 'url' => $item[$who]['xchan_url'], 'photo' => $item[$who]['xchan_photo_s'], 'when' => (($edit) ? datetime_convert('UTC', date_default_timezone_get(), $item['edited']) : datetime_convert('UTC', date_default_timezone_get(), $item['created'])), diff --git a/Zotlabs/Widget/Channel_activities.php b/Zotlabs/Widget/Channel_activities.php index 06080f8c8..a799ea81e 100644 --- a/Zotlabs/Widget/Channel_activities.php +++ b/Zotlabs/Widget/Channel_activities.php @@ -179,7 +179,7 @@ class Channel_activities { $account = App::get_account(); - $r = q("SELECT channel_id, channel_name, xchan_photo_s FROM channel + $r = q("SELECT channel_id, channel_name, xchan_addr, xchan_photo_s FROM channel LEFT JOIN xchan ON channel_hash = xchan_hash WHERE channel_account_id = %d AND channel_id != %d AND channel_removed = 0", @@ -223,7 +223,7 @@ class Channel_activities { $i[] = [ 'url' => z_root() . '/manage/' . $rr['channel_id'], 'title' => '', - 'summary' => '' . $rr['channel_name'], + 'summary' => '
' . '' . $rr['channel_name'] . '
' . $rr['xchan_addr'] . '
', 'footer' => $footer ]; diff --git a/Zotlabs/Widget/Messages.php b/Zotlabs/Widget/Messages.php index 418e49169..a37a178f9 100644 --- a/Zotlabs/Widget/Messages.php +++ b/Zotlabs/Widget/Messages.php @@ -162,7 +162,7 @@ class Messages { $summary = '...'; } else { - $summary = substr_words($summary, 68); + $summary = substr_words($summary, 140); } switch(intval($item['item_private'])) { @@ -178,6 +178,7 @@ class Messages { $entries[$i]['author_name'] = $item['author']['xchan_name']; $entries[$i]['author_addr'] = (($item['author']['xchan_addr']) ? $item['author']['xchan_addr'] : $item['author']['xchan_url']); + $entries[$i]['author_img'] = $item['author']['xchan_photo_s']; $entries[$i]['info'] = $info; $entries[$i]['created'] = datetime_convert('UTC', date_default_timezone_get(), $item['created']); $entries[$i]['summary'] = $summary; @@ -282,6 +283,7 @@ class Messages { $entries[$i]['author_name'] = $notice['xname']; $entries[$i]['author_addr'] = $notice['url']; + $entries[$i]['author_img'] = $notice['photo'];// $item['author']['xchan_photo_s']; $entries[$i]['info'] = ''; $entries[$i]['created'] = datetime_convert('UTC', date_default_timezone_get(), $notice['created']); $entries[$i]['summary'] = $summary; diff --git a/view/css/widgets.css b/view/css/widgets.css index 463f53d22..6b5ef3986 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -242,6 +242,11 @@ a.wikilist { position: relative; } +/* messages (hq) */ +#messages-author-container { + z-index: 3 !important; +} + /* hq_controls */ .hq_controls_fixed_bottom_center { z-index: 1028; @@ -250,3 +255,4 @@ a.wikilist { left: 50%; transform: translateX(-50%); } + diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index e50a4f927..8edd8dafa 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -38,7 +38,7 @@ function contact_format(item) { var desc = ((item.label) ? item.nick + ' ' + item.label : item.nick); if(typeof desc === 'undefined') desc = ''; if(desc) desc = ' ('+desc+')'; - return "
{2}{4}
".format(item.taggable, item.photo, item.name, desc, typeof(item.link) !== 'undefined' ? item.link : desc.replace('(','').replace(')','')); + return "
{2}
{4}
".format(item.taggable, item.photo, item.name, desc, typeof(item.link) !== 'undefined' ? item.link : desc.replace('(','').replace(')','')); } else return ""; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 6675ebaf8..5d27071a5 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -774,20 +774,6 @@ div.jGrowl div.jGrowl-notification { text-overflow: ellipsis; } -.dropdown-notification, -.notification, -.member-item { - line-height: 1rem; - overflow: hidden; - text-overflow: ellipsis; - display: block; - white-space: nowrap; -} - -.notification.notification-forum { - font-size: 0.9rem; -} - #acl-search::-webkit-input-placeholder { /* non-fontawesome fonts set a fallback for text parts of the placeholder*/ font-family: ForkAwesome, sans-serif, arial, freesans; @@ -1202,15 +1188,15 @@ img.mail-conv-sender-photo { .menu-img-3 { width: 3rem; height: 3rem; - margin-right: 5px; + margin-right: .5rem; border-radius: var(--bs-border-radius); float: left; } .menu-img-2 { - height: 2rem; - width: 2rem; - margin-right: 5px; + height: 2.3rem; + width: 2.3rem; + margin-right: .5rem; border-radius: var(--bs-border-radius); float: left; } diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 4d5bd42be..d29de1b15 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -129,8 +129,8 @@ if(file_exists('view/theme/redbasic/css/style.css')) { $x .= $schemecss; } - $left_aside_width = 21; //unit: rem - $right_aside_width = 21; //unit: rem + $left_aside_width = 22; //unit: rem + $right_aside_width = 22; //unit: rem $main_width = $left_aside_width + $right_aside_width + intval($converse_width); diff --git a/view/tpl/channel_activities.tpl b/view/tpl/channel_activities.tpl index acce3cb13..3ec37e235 100644 --- a/view/tpl/channel_activities.tpl +++ b/view/tpl/channel_activities.tpl @@ -6,7 +6,7 @@
-
+
{{if $i.title}} {{$i.title}}
diff --git a/view/tpl/messages_widget.tpl b/view/tpl/messages_widget.tpl index 8dece872e..3bedf518f 100644 --- a/view/tpl/messages_widget.tpl +++ b/view/tpl/messages_widget.tpl @@ -25,17 +25,25 @@