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/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/conversation.tpl')
| -rwxr-xr-x[-rw-r--r--] | view/tpl/conversation.tpl | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/view/tpl/conversation.tpl b/view/tpl/conversation.tpl index 70cd389c9..97d64327a 100644..100755 --- a/view/tpl/conversation.tpl +++ b/view/tpl/conversation.tpl @@ -1,28 +1,20 @@ <div id="threads-begin"></div> -{{ for $threads as $thread }} -<div id="thread-wrapper-$thread.id" class="thread-wrapper"> - {{ for $thread.items as $item }} +{{foreach $threads as $thread}} +<div id="thread-wrapper-{{$thread.id}}" class="thread-wrapper"> + {{foreach $thread.items as $item}} {{if $item.comment_firstcollapsed}} <div class="hide-comments-outer"> - <span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span> + <span id="hide-comments-total-{{$thread.id}}" class="hide-comments-total">{{$thread.num_comments}}</span> <span id="hide-comments-{{$thread.id}}" class="hide-comments fakelink" onclick="showHideComments({{$thread.id}});">{{$thread.hide_text}}</span> </div> - <div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;"> - {{endif}} - {{if $item.comment_lastcollapsed}}</div>{{endif}} + <div id="collapsed-comments-{{$thread.id}}" class="collapsed-comments" style="display: none;"> + {{/if}} + {{if $item.comment_lastcollapsed}}</div>{{/if}} - {{ inc $item.template }}{{ endinc }} + {{include file="{{$item.template}}"}} - {{ endfor }} + {{/foreach}} </div> -{{ endfor }} +{{/foreach}} <div id="threads-end"></div> <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 }} |