From d849307725409b0ccc8ccff17100dac3a527a994 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Thu, 3 Sep 2020 10:45:57 -0400
Subject: [PATCH] [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 3f87f01703..9ef8c634ed 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 68d4b293f1..6e8e013dcc 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)
 <span class="uriid" style="display: none;">{{$item.uriid}}</span>
 {{/if}}
 	<div class="media {{$item.shiny}}">
+	{{if $item.responses.announce && $mode != 'display'}}
+		<div class="wall-item-ammounce wall-item-responses" id="wall-item-ammounce-{{$item.id}}">{{$item.responses.announce.output nofilter}}</div>
+	{{/if}}
 		{{* The avatar picture and the photo-menu *}}
 		<div class="dropdown pull-left"><!-- Dropdown -->
 			{{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)
 		</div><!-- ./Dropdown -->
 
 
+	{{if $item.thread_level!=1}}
+		<div class="media-body">{{*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}}
-		<div role="heading " aria-level="{{$item.thread_level}}" class="contact-info hidden-sm hidden-xs media-body"><!-- <= For computer -->
-			<h4 class="media-heading">
-				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo hover-card">
-					<span class="wall-item-name {{$item.sparkle}}">{{$item.name}}</span>
-				</a>
-			{{if $item.owner_url}}
-				{{$item.via}}
-				<a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link userinfo hover-card">
-					<span class="wall-item-name {{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span>
-				</a>
-			{{/if}}
-			{{if $item.lock}}
-				<span class="navicon lock fakelink" onClick="lockview(event, 'item', {{$item.id}});" title="{{$item.lock}}" data-toggle="tooltip">
-					&nbsp;<small><i class="fa fa-lock" aria-hidden="true"></i></small>
-				</span>
-			{{/if}}
-			</h4>
-
-			<div class="additional-info text-muted">
-				<div id="wall-item-ago-{{$item.id}}" class="wall-item-ago">
-					<small>
-						<a href="{{$item.plink.orig}}">
-							<span class="time" title="{{$item.localtime}}" data-toggle="tooltip">
-								<time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time>
-							</span>
-						</a>
-						{{if $item.owner_self}}
-							{{include file="sub/delivery_count.tpl" delivery=$item.delivery}}
-						{{/if}}
-						{{if $item.direction}}
-							{{include file="sub/direction.tpl" direction=$item.direction}}
-						{{/if}}
-						{{if $item.pinned}}
-							&bull; <i class="fa fa-thumb-tack" aria-hidden="true" title="{{$item.pinned}}"></i>
-							<span class="sr-only">{{$item.pinned}}</span>
-						{{/if}}
-
-					</small>
-				</div>
-
-				{{if $item.location}}
-				<div id="wall-item-location-{{$item.id}}" class="wall-item-location">
-					<small><span class="location">({{$item.location nofilter}})</span></small>
-				</div>
+			{{* contact info header*}}
+		<div role="heading" aria-level="{{$item.thread_level}}">
+			<div class="preferences">
+				{{if $item.network_icon != ""}}
+					<span class="wall-item-network"><i class="fa fa-{{$item.network_icon}}" title="{{$item.network_name}}" aria-hidden="true"></i></span>
+				{{else}}
+					<span class="wall-item-network" title="{{$item.app}}">{{$item.network_name}}</span>
+				{{/if}}
+				{{if $item.plink}}	{{*link to the original source of the item *}}
+					&nbsp;
+					<a href="{{$item.plink.href}}" class="plink u-url" aria-label="{{$item.plink.title}}" title="{{$item.plink.title}}">
+						<i class="fa fa-external-link"></i>
+					</a>
 				{{/if}}
 			</div>
-			{{* @todo $item.created have to be inserted *}}
-		</div>
+		{{if $item.thread_level==1}}
+			<div class="contact-info hidden-sm hidden-xs media-body"><!-- <= For computer -->
+				<h4 class="media-heading">
+					<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo hover-card">
+						<span class="wall-item-name {{$item.sparkle}}">{{$item.name}}</span>
+					</a>
+				{{if $item.owner_url}}
+					{{$item.via}}
+					<a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link userinfo hover-card">
+						<span class="wall-item-name {{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span>
+					</a>
+				{{/if}}
+				{{if $item.lock}}
+					<span class="navicon lock fakelink" onClick="lockview(event, 'item', {{$item.id}});" title="{{$item.lock}}" data-toggle="tooltip">
+						&nbsp;<small><i class="fa fa-lock" aria-hidden="true"></i></small>
+					</span>
+				{{/if}}
+				</h4>
 
-		{{* contact info header for smartphones *}}
-		<div role="heading " aria-level="{{$item.thread_level}}" class="contact-info-xs hidden-lg hidden-md"><!-- <= For smartphone (responsive) -->
-			<h5 class="media-heading">
-				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo hover-card"><span>{{$item.name}}</span></a>
-				<p class="text-muted">
-					<small>
-						<a class="time" href="{{$item.plink.orig}}"><span class="wall-item-ago">{{$item.ago}}</span></a>
-						{{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location nofilter}}){{/if}}
-						{{if $item.owner_self}}
-							{{include file="sub/delivery_count.tpl" delivery=$item.delivery}}
-						{{/if}}
-						{{if $item.direction}}
-							{{include file="sub/direction.tpl" direction=$item.direction}}
-						{{/if}}
-					</small>
-				</p>
-			</h5>
-		</div>
-		{{/if}} {{* End of if $item.thread_level==1 *}}
+				<div class="additional-info text-muted">
+					<div id="wall-item-ago-{{$item.id}}" class="wall-item-ago">
+						<small>
+							<a href="{{$item.plink.orig}}">
+								<span class="time" title="{{$item.localtime}}" data-toggle="tooltip">
+									<time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time>
+								</span>
+							</a>
+							{{if $item.owner_self}}
+								{{include file="sub/delivery_count.tpl" delivery=$item.delivery}}
+							{{/if}}
+							{{if $item.direction}}
+								{{include file="sub/direction.tpl" direction=$item.direction}}
+							{{/if}}
+							{{if $item.pinned}}
+								&bull; <i class="fa fa-thumb-tack" aria-hidden="true" title="{{$item.pinned}}"></i>
+								<span class="sr-only">{{$item.pinned}}</span>
+							{{/if}}
 
-		{{* contact info header for comments *}}
-		{{if $item.thread_level!=1}}
-		<div class="media-body">{{*this is the media body for comments - this div must be closed at the end of the file *}}
-		<div role="heading " aria-level="{{$item.thread_level}}" class="contact-info-comment">
-			<h5 class="media-heading">
-				<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo hover-card"><span class="fakelink">{{$item.name}}</span></a>
-				<span class="text-muted">
-					<small>
-						<a class="time" href="{{$item.plink.orig}}" title="{{$item.localtime}}" data-toggle="tooltip">{{$item.ago}}</a>
-						{{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location nofilter}}){{/if}}
-						{{if $item.owner_self}}
-							{{include file="sub/delivery_count.tpl" delivery=$item.delivery}}
-						{{/if}}
-						{{if $item.direction}}
-							{{include file="sub/direction.tpl" direction=$item.direction}}
-						{{/if}}
-					</small>
-				</span>
-			</h5>
-		</div>
-		{{/if}}
+						</small>
+					</div>
 
-		<div class="preferences">
-		{{if $item.network_icon != ""}}
-			<span class="wall-item-network"><i class="fa fa-{{$item.network_icon}}" title="{{$item.network_name}}" aria-hidden="true"></i></span>
-		{{else}}
-			<span class="wall-item-network" title="{{$item.app}}">{{$item.network_name}}</span>
-		{{/if}}
-		{{if $item.plink}}	{{*link to the original source of the item *}}
-			&nbsp;
-			<a href="{{$item.plink.href}}" class="plink u-url" aria-label="{{$item.plink.title}}" title="{{$item.plink.title}}">
-				<i class="fa fa-external-link"></i>
-			</a>
-		{{/if}}
+					{{if $item.location}}
+					<div id="wall-item-location-{{$item.id}}" class="wall-item-location">
+						<small><span class="location">({{$item.location nofilter}})</span></small>
+					</div>
+					{{/if}}
+				</div>
+				{{* @todo $item.created have to be inserted *}}
+			</div>
+
+			{{* contact info header for smartphones *}}
+			<div class="contact-info-xs hidden-lg hidden-md"><!-- <= For smartphone (responsive) -->
+				<h5 class="media-heading">
+					<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo hover-card"><span>{{$item.name}}</span></a>
+					<p class="text-muted">
+						<small>
+							<a class="time" href="{{$item.plink.orig}}"><span class="wall-item-ago">{{$item.ago}}</span></a>
+							{{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location nofilter}}){{/if}}
+							{{if $item.owner_self}}
+								{{include file="sub/delivery_count.tpl" delivery=$item.delivery}}
+							{{/if}}
+							{{if $item.direction}}
+								{{include file="sub/direction.tpl" direction=$item.direction}}
+							{{/if}}
+						</small>
+					</p>
+				</h5>
+			</div>
+		{{else}} {{* End of if $item.thread_level == 1 *}}
+			{{* contact info header for comments *}}
+			<div class="contact-info-comment">
+				<h5 class="media-heading">
+					<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo hover-card"><span class="fakelink">{{$item.name}}</span></a>
+					<span class="text-muted">
+				<small>
+					<a class="time" href="{{$item.plink.orig}}" title="{{$item.localtime}}" data-toggle="tooltip">{{$item.ago}}</a>
+					{{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location nofilter}}){{/if}}
+					{{if $item.owner_self}}
+						{{include file="sub/delivery_count.tpl" delivery=$item.delivery}}
+					{{/if}}
+					{{if $item.direction}}
+						{{include file="sub/direction.tpl" direction=$item.direction}}
+					{{/if}}
+				</small>
+			</span>
+				</h5>
+			</div>
+		{{/if}} {{* End of if $item.thread_level != 1 *}}
 		</div>
 
 		<div class="clearfix"></div>
@@ -523,13 +527,15 @@ as the value of $top_child_total (this is done at the end of this file)
 		<div class="wall-item-links"></div>
 
 		{{* Display likes, dislike and attendance stats *}}
-		{{if $item.responses}}
-			<div class="wall-item-responses">
-				{{foreach $item.responses as $verb=>$response}}
-				<div class="wall-item-{{$verb}}" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.output nofilter}}</div>
-				{{/foreach}}
-			</div>
-		{{/if}}
+	{{if $item.responses}}
+		<div class="wall-item-responses">
+			{{foreach $item.responses as $verb=>$response}}
+				{{if $verb != 'announce' || $mode == 'display'}}
+			<div class="wall-item-{{$verb}}" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.output nofilter}}</div>
+				{{/if}}
+			{{/foreach}}
+		</div>
+	{{/if}}
 
 		{{* Insert comment box of threaded children *}}
 		{{if $item.threaded && $item.comment && $item.indent==comment}}