Merge remote branch 'upstream/master'

[friendica.git] / view / theme / dispy / wall_item.tpl

diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl
old mode 100644 (file)
new mode 100755 (executable)
index 0850d73..9c3703f
--- a/view/theme/dispy/wall_item.tpl
+++ b/view/theme/dispy/wall_item.tpl
@@ -17,7 +17,10 @@
                        <div class="wall-item-photo-end"></div>
                        <div class="wall-item-location" id="wall-item-location-$id">{{ if $location }}<span class="icon globe"></span>$location {{ endif }}</div>                               
                </div>
-               <div class="wall-item-lock-wrapper">$lock</div>
+               <div class="wall-item-lock-wrapper">
+                       {{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
+                       {{ else }}<div class="wall-item-lock"></div>{{ endif }}
+               </div>
                <div class="wall-item-tools" id="wall-item-tools-$id">
                        {{ if $star }}
                                <a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
@@ -26,7 +29,7 @@
                        <div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
                                <a href="#" class="icon like" title="$vote.like.0" onclick="dolike($id,'like'); return false"></a>
                                <a href="#" class="icon dislike" title="$vote.dislike.0" onclick="dolike($id,'dislike'); return false"></a>
-                               {{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title=""$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
+                               {{ if $vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$vote.share.0" onclick="jotShare($id); return false"></a>{{ endif }}
                                <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
                        </div>
                        {{ endif }}
@@ -47,7 +50,13 @@
                <div class="wall-item-content" id="wall-item-content-$id" >
                        <div class="wall-item-title" id="wall-item-title-$id">$title</div>
                        <div class="wall-item-title-end"></div>
-                       <div class="wall-item-body" id="wall-item-body-$id" >$body</div>
+                       <div class="wall-item-body" id="wall-item-body-$id" >$body
+                                       <div class="body-tag">
+                                               {{ for $tags as $tag }}
+                                                       <span class='tag'>$tag</span>
+                                               {{ endfor }}
+                                       </div>
+                       </div>
                </div>
                <div class="wall-item-author">
                                <a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>