Merge remote branch 'upstream/master'

[friendica.git] / view / theme / diabook / wallwall_item.tpl

diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl
index 603a908c5a5e948cab98754adfca82837dda2187..c5b6b36b54f82cc8d57ffb44cea8161500d93952 100644 (file)
--- a/view/theme/diabook/wallwall_item.tpl
+++ b/view/theme/diabook/wallwall_item.tpl
@@ -1,6 +1,5 @@
 {{ if $item.indent }}{{ else }}
 <div class="wall-item-decor">
-       {{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }} 
        <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
 </div>
 {{ endif }}
@@ -52,7 +51,7 @@
 
                </div>
                <div class="wall-item-actions">
-                       <div class="wall-item-location">$item.location&nbsp;</div>
+
                        <div class="wall-item-actions-social">
                        
                        
@@ -88,7 +87,7 @@
                                        <a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
                                {{ endif }}
                        </div>
-                       
+                       <div class="wall-item-location">$item.location&nbsp;</div>
                </div>
        </div>
        <div class="wall-item-bottom">