diff options
author | Michael <icarus@dabo.de> | 2012-02-19 20:09:42 +0100 |
---|---|---|
committer | Michael <icarus@dabo.de> | 2012-02-19 20:09:42 +0100 |
commit | cafd4003522a472d2709569ea5eb5f80b817af23 (patch) | |
tree | bbd512126515afc929de06dce79ba847b9681092 /view/search_item.tpl | |
parent | 73e0e4d78341cb96ef9665a0ee4fb7e7ee2a701f (diff) | |
parent | a9ed5915cebcf51347acaad51d0c252e57bceaff (diff) | |
download | volse-hubzilla-cafd4003522a472d2709569ea5eb5f80b817af23.tar.gz volse-hubzilla-cafd4003522a472d2709569ea5eb5f80b817af23.tar.bz2 volse-hubzilla-cafd4003522a472d2709569ea5eb5f80b817af23.zip |
Merge remote branch 'upstream/master'
Conflicts:
view/theme/vier/style.css
Diffstat (limited to 'view/search_item.tpl')
-rwxr-xr-x | view/search_item.tpl | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/view/search_item.tpl b/view/search_item.tpl index c4f3ccac7..de8bd2396 100755 --- a/view/search_item.tpl +++ b/view/search_item.tpl @@ -78,6 +78,14 @@ <div class="wall-item-bottom"> <div class="wall-item-links"></div> <div class="wall-item-like" id="wall-item-like-$id">$like</div> - <div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div> + <div class="wall-item-dislike" id="wall-item-dislike-$id">$dislike</div> + {{ if $conv }} + <div class="wall-item-conv" id="wall-item-conv-$id" > + <a href='$conv.href' id='context-$id' title='$conv.title'>$conv.title</a> + {{ endif }} + </div> </div> + + </div> + |