From 730a5c5725cd82e51ede61d5d5df316b1221aa3b Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 3 Sep 2020 10:19:17 -0400 Subject: [PATCH 1/3] Improve post direction display - [frio] Change icon for commented direction - Update English translation string for commented direction --- include/conversation.php | 2 +- view/theme/frio/templates/sub/direction.tpl | 2 ++ view/theme/vier/templates/sub/direction.tpl | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/conversation.php b/include/conversation.php index c668e53d9..6fcdd6581 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -725,7 +725,7 @@ function conversation_fetch_comments($thread_items, $pinned) { if (!empty($parentlines) && empty($direction) && ($row['gravity'] == GRAVITY_COMMENT) && Contact::isSharing($row['author-id'], $row['uid'])) { - $direction = ['direction' => 2, 'title' => DI::l10n()->t('%s commented this.', $row['author-name'])]; + $direction = ['direction' => 5, 'title' => DI::l10n()->t('%s commented on this.', $row['author-name'])]; } 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 609a5105b..4113c9bee 100644 --- a/view/theme/frio/templates/sub/direction.tpl +++ b/view/theme/frio/templates/sub/direction.tpl @@ -9,6 +9,8 @@ {{elseif $direction.direction == 4}} + {{elseif $direction.direction == 5}} + {{/if}} {{/if}} diff --git a/view/theme/vier/templates/sub/direction.tpl b/view/theme/vier/templates/sub/direction.tpl index f884d51c2..08f40c3a3 100644 --- a/view/theme/vier/templates/sub/direction.tpl +++ b/view/theme/vier/templates/sub/direction.tpl @@ -9,6 +9,8 @@ {{elseif $direction.direction == 4}} + {{elseif $direction.direction == 5}} + {{/if}} {{/if}} From d849307725409b0ccc8ccff17100dac3a527a994 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 3 Sep 2020 10:45:57 -0400 Subject: [PATCH 2/3] [frio] Move reshare info on top of posts in network page - Increase consistency with other social media platforms display --- view/theme/frio/css/style.css | 16 +- view/theme/frio/templates/wall_thread.tpl | 220 +++++++++++----------- 2 files changed, 119 insertions(+), 117 deletions(-) diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 3f87f0170..9ef8c634e 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -1499,14 +1499,14 @@ aside .panel-body { } /* wall items action dropdown menu */ +.media [role=heading] { + position: relative; +} + .preferences { position: absolute; - right: 15px; - top: 10px; -} -.comment .preferences { - right: 10px; - top: 5px; + right: 0; + top: 0; } .wall-item-network { font-size: 13px; @@ -3413,10 +3413,6 @@ section .profile-match-wrapper { margin-top: 0; } - .preferences { - right: 10px; - } - .generic-page-wrapper, .videos-content-wrapper, .suggest-content-wrapper, .help-content-wrapper, .match-content-wrapper, .dirfind-content-wrapper, .directory-content-wrapper, .delegation-content-wrapper, .notes-content-wrapper, .message-content-wrapper, .apps-content-wrapper, #adminpage, .delegate-content-wrapper, .uexport-content-wrapper, .dfrn_request-content-wrapper, .friendica-content-wrapper, .credits-content-wrapper, .nogroup-content-wrapper, .profperm-content-wrapper, .invite-content-wrapper, .tos-content-wrapper, .fsuggest-content-wrapper { border-radius: 0; padding: 10px; diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl index 68d4b293f..6e8e013dc 100644 --- a/view/theme/frio/templates/wall_thread.tpl +++ b/view/theme/frio/templates/wall_thread.tpl @@ -81,6 +81,9 @@ as the value of $top_child_total (this is done at the end of this file) {{/if}}
+ {{if $item.responses.announce && $mode != 'display'}} +
{{$item.responses.announce.output nofilter}}
+ {{/if}} {{* The avatar picture and the photo-menu *}}
{{if $item.thread_level==1}} @@ -123,112 +126,113 @@ as the value of $top_child_total (this is done at the end of this file)
+ {{if $item.thread_level!=1}} +
{{*this is the media body for comments - this div must be closed at the end of the file *}} + {{/if}} - {{* contact info header*}} - {{if $item.thread_level==1}} -