Merge remote-tracking branch 'upstream/master'

[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 84f164b8e0c54e53f40d8fff888d267dd2c8496c..366493a686c277eacf2a9b903f5f70c0f18a692e 100644 (file)
--- a/view/theme/vier/wall_thread.tpl
+++ b/view/theme/vier/wall_thread.tpl
@@ -54,7 +54,7 @@
                        <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.plink }}<a 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>
@@ -98,7 +98,7 @@
                                {{ endif }}
                        {{ endif }}
                        {{ if $item.vote.share }}
-                               <a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false"><i class="icon-share icon-large"></i></a>
+                               <a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false"><i class="icon-retweet icon-large"></i></a>
                        {{ endif }}
                        {{ if $item.star }}
                                <a href="#" id="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do"><i class="icon-star icon-large"></i></a>
@@ -111,7 +111,7 @@
                                 <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"><i class="icon-folder-close icon-large"></i></a>
                        {{ endif }}
                        </div>
-                       <div class="wall-item-location">$item.location</div>                            
+                       <div class="wall-item-location">$item.location $item.postopts</div>                             
                        <div class="wall-item-actions-tools">
 
                                {{ if $item.drop.pagedrop }}
@@ -128,14 +128,16 @@
                </div>
        </div>
        <div class="wall-item-bottom">
-               <div class="wall-item-links"></div>
+               <div class="wall-item-links">
+               </div>
                <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 }}
        <div class="wall-item-bottom">
-               <div class="wall-item-links"></div>
+               <div class="wall-item-links">
+               </div>
                <div class="wall-item-comment-wrapper" id="item-comments-$item.id" style="display: none;">
                                        $item.comment
                </div>