X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Fvier%2Fwall_thread.tpl;h=48e84d945da023ce3bf672e54bdd5c04b793f243;hb=ff5ab7e9c6b0795673938a991f4cc2d222be6bae;hp=01738b666b2968122bce1803ff127bb560301fde;hpb=9ecb9842858541db669e6ee61627e8526bf4c719;p=friendica.git

diff --git a/view/theme/vier/wall_thread.tpl b/view/theme/vier/wall_thread.tpl
index 01738b666b..48e84d945d 100644
--- a/view/theme/vier/wall_thread.tpl
+++ b/view/theme/vier/wall_thread.tpl
@@ -30,11 +30,11 @@
 <div class="wall-item-container $item.indent" id="item-$item.id">
 	<div class="wall-item-item">
 		<div class="wall-item-info">
-			<div class="contact-photo-wrapper"
+			<div class="contact-photo-wrapper mframe{{ if $item.owner_url }} wwfrom{{ endif }}"
 				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
 				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
 				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
-					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
+					<img src="$item.thumb" class="contact-photo $item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
 				</a>
 				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
 				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
@@ -42,8 +42,23 @@
 				</ul>
 				
 			</div>
-			<div class="wall-item-location">$item.location</div>	
+			{{ if $item.owner_url }}
+			<div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
+				<a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
+					<img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" />
+				</a>
+			</div>
+			{{ endif }}			
+		</div>
+		<div class="wall-item-actions-author">
+			<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><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"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> <!-- $item.vwall -->{{ endif }}
+			<span class="wall-item-ago">-
+				{{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
+				{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
+			</span>
 		</div>
+
 		<div class="wall-item-content">
 			{{ if $item.title }}<h2><a href="$item.plink.href" class="$item.sparkle">$item.title</a></h2>{{ endif }}
 			$item.body
@@ -53,21 +68,30 @@
 		<div class="wall-item-links">
 		</div>
 		<div class="wall-item-tags">
-			{{ for $item.tags as $tag }}
+			{{ for $item.hashtags as $tag }}
 				<span class='tag'>$tag</span>
 			{{ endfor }}
+  			{{ for $item.mentions as $tag }}
+				<span class='mention'>$tag</span>
+			{{ endfor }}
+               {{ for $item.folders as $cat }}
+                    <span class='folder'>$cat.name</a>{{if $cat.removeurl}} (<a href="$cat.removeurl" title="$remove">x</a>) {{endif}} </span>
+               {{ endfor }}
+                {{ for $item.categories as $cat }}
+                    <span class='category'>$cat.name</a>{{if $cat.removeurl}} (<a href="$cat.removeurl" title="$remove">x</a>) {{endif}} </span>
+                {{ endfor }}
 		</div>
-	</div>
+	</div>	
 	<div class="wall-item-bottom">
-		<div class="">
+		<div class="wall-item-links">
 			{{ if $item.plink }}<a class="icon s16 link$item.sparkle" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
 		</div>
 		<div class="wall-item-actions">
-			<div class="wall-item-actions-author">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago">$item.ago</span>
-			</div>
-			
+			<div class="wall-item-location">$item.location</div>				
 			<div class="wall-item-actions-social">
+			{{ if $item.threaded }}{{ if $item.comment }}
+				<span id="comment-$item.id" class="fakelink togglecomment" onclick="openClose('item-comments-$item.id');">$item.switchcomment</span>
+			{{ endif }}{{ endif }}
 			{{ if $item.star }}
 				<a href="#" id="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do">$item.star.do</a>
 				<a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
@@ -89,8 +113,10 @@
 			
 			<div class="wall-item-actions-tools">
 
-				{{ if $item.drop.dropping }}
+				{{ if $item.drop.pagedrop }}
 					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+				{{ endif }}
+				{{ if $item.drop.dropping }}
 					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
 				{{ endif }}
 				{{ if $item.edpost }}
@@ -105,19 +131,18 @@
 		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
 		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
 	</div>
-	{{ if $item.threaded }}{{ if $item.comment }}{{ if $item.thread_level!=1 }}
+	
+	{{ if $item.threaded }}{{ if $item.comment }}
 	<div class="wall-item-bottom">
 		<div class="wall-item-links"></div>
-		<div class="wall-item-comment-wrapper">
-			$item.comment
+		<div class="wall-item-comment-wrapper" id="item-comments-$item.id" style="display: none;">
+					$item.comment
 		</div>
 	</div>
-	{{ endif }}{{ endif }}{{ endif }}
-
+	{{ endif }}{{ endif }}
 </div>
 
 
-
 {{ for $item.children as $child }}
 	{{ if $item.type == tag }}
 		{{ inc wall_item_tag.tpl with $item=$child }}{{ endinc }}
@@ -135,10 +160,10 @@
 {{ endif }}
 
 {{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
-<div class="wall-item-comment-wrapper" >$item.comment</div>
+<div class="wall-item-comment-wrapper" id="item-comments-$item.id">$item.comment</div>
 {{ endif }}{{ endif }}{{ endif }}
 
 
 {{ if $item.flatten }}
-<div class="wall-item-comment-wrapper" >$item.comment</div>
+<div class="wall-item-comment-wrapper" id="item-comments-$item.id">$item.comment</div>
 {{ endif }}