Merge https://github.com/friendica/friendica into pull

[friendica.git] / view / theme / vier / wall_thread.tpl

diff --git a/view/theme/vier/wall_thread.tpl b/view/theme/vier/wall_thread.tpl
index 01738b666b2968122bce1803ff127bb560301fde..becf868e7907a68463f40954b7605c1eb5883440 100644 (file)
--- 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,6 +42,13 @@
                                </ul>
                                
                        </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 class="wall-item-location">$item.location</div>    
                </div>
                <div class="wall-item-content">
@@ -57,14 +64,16 @@
                                <span class='tag'>$tag</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>
+                                {{ if $item.owner_url }}<br/>$item.to <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 }}
                        </div>
                        
                        <div class="wall-item-actions-social">
@@ -72,6 +81,7 @@
                                <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>
                                <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
+
                        {{ endif }}
                        {{ if $item.filer }}
                                 <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer">$item.filer</a>
@@ -89,8 +99,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 +117,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 }}{{ if $item.indent==comment }}
        <div class="wall-item-bottom">
                <div class="wall-item-links"></div>
                <div class="wall-item-comment-wrapper">
-                       $item.comment
+                                       $item.comment
                </div>
        </div>
        {{ endif }}{{ endif }}{{ endif }}
-
 </div>
 
 
-
 {{ for $item.children as $child }}
        {{ if $item.type == tag }}
                {{ inc wall_item_tag.tpl with $item=$child }}{{ endinc }}