diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2014-06-24 19:34:36 +0200 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2014-06-24 19:34:36 +0200 |
| commit | b8dc9e855af2d30f33d0f90dc13d8cad0a7b3e70 (patch) | |
| tree | 718df6305bcb82c8dcb4b287a7132422e748cdfb /view/tpl/threaded_conversation.tpl | |
| parent | c2d520f1be115fb3cb5da2a35eb10146cecee8aa (diff) | |
| parent | a92fb0b04c3e6474ec48faf8e4cc65c382e89d66 (diff) | |
| download | volse-hubzilla-b8dc9e855af2d30f33d0f90dc13d8cad0a7b3e70.tar.gz volse-hubzilla-b8dc9e855af2d30f33d0f90dc13d8cad0a7b3e70.tar.bz2 volse-hubzilla-b8dc9e855af2d30f33d0f90dc13d8cad0a7b3e70.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view/tpl/threaded_conversation.tpl')
| -rwxr-xr-x[-rw-r--r--] | view/tpl/threaded_conversation.tpl | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/view/tpl/threaded_conversation.tpl b/view/tpl/threaded_conversation.tpl index f60839e49..ea5c3c281 100644..100755 --- a/view/tpl/threaded_conversation.tpl +++ b/view/tpl/threaded_conversation.tpl @@ -1,13 +1,8 @@ -{{ for $threads as $item }} -{{ inc $item.template }}{{ endinc }} -{{ endfor }} +{{if $photo_item}} +{{$photo_item}} +{{/if}} +{{foreach $threads as $thread_item}} +{{include file="{{$thread_item.template}}" item=$thread_item}} +{{/foreach}} <div id="conversation-end"></div> - -{{ if $dropping }} -<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();"> - <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div> - <div id="item-delete-selected-desc" >$dropping</div> -</div> -<div id="item-delete-selected-end"></div> -{{ endif }} |