Merge pull request #9126 from MrPetovan/task/post-improvements

Various post display improvements

include/conversation.php

@@ -733,7 +733,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'])

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;
+    right: 0;
-    top: 10px;
+    top: 0;
-}
-.comment .preferences {
-    right: 10px;
-    top: 5px;
 }
 .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;

view/theme/frio/templates/sub/direction.tpl

@@ -9,6 +9,8 @@
 		<i class="fa fa-share-alt" aria-hidden="true" title="{{$direction.title}}"></i>
 	{{elseif $direction.direction == 4}}
 		<i class="fa fa-hashtag" aria-hidden="true" title="{{$direction.title}}"></i>
+	{{elseif $direction.direction == 5}}
+		<i class="fa fa-comment-o" aria-hidden="true" title="{{$direction.title}}"></i>
 	{{/if}}
 </span>
 {{/if}}

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,10 +126,27 @@ 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*}}
+		<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>
 		{{if $item.thread_level==1}}
-		<div role="heading " aria-level="{{$item.thread_level}}" class="contact-info hidden-sm hidden-xs media-body"><!-- <= For computer -->
+			<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>
@@ -176,7 +196,7 @@ as the value of $top_child_total (this is done at the end of this file)
 			</div>
 
 			{{* contact info header for smartphones *}}
-		<div role="heading " aria-level="{{$item.thread_level}}" class="contact-info-xs hidden-lg hidden-md"><!-- <= For smartphone (responsive) -->
+			<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">
@@ -193,12 +213,9 @@ as the value of $top_child_total (this is done at the end of this file)
 					</p>
 				</h5>
 			</div>
-		{{/if}} {{* End of if $item.thread_level==1 *}}
+		{{else}} {{* End of if $item.thread_level == 1 *}}
-
 			{{* contact info header for comments *}}
-		{{if $item.thread_level!=1}}
+			<div class="contact-info-comment">
-		<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">
@@ -215,20 +232,7 @@ as the value of $top_child_total (this is done at the end of this file)
 			</span>
 				</h5>
 			</div>
-		{{/if}}
+		{{/if}} {{* End of if $item.thread_level != 1 *}}
-
-		<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>
 
 		<div class="clearfix"></div>
@@ -526,7 +530,9 @@ as the value of $top_child_total (this is done at the end of this file)
 	{{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}}

view/theme/vier/templates/sub/direction.tpl

@@ -9,6 +9,8 @@
 		<i class="icon-share" aria-hidden="true" title="{{$direction.title}}"></i>
 	{{elseif $direction.direction == 4}}
 		<i class="icon-tag" aria-hidden="true" title="{{$direction.title}}"></i>
+	{{elseif $direction.direction == 5}}
+		<i class="icon-commenting" aria-hidden="true" title="{{$direction.title}}"></i>
 	{{/if}}
 </span>
 {{/if}}