diff options
| author | Hauke Zuehl <hzuehl@phone-talk.de> | 2012-06-16 18:04:59 +0200 |
|---|---|---|
| committer | Hauke Zuehl <hzuehl@phone-talk.de> | 2012-06-16 18:04:59 +0200 |
| commit | f9a40ccbdea69fc7ffcbdc87356d535c67371210 (patch) | |
| tree | 18eca4019eb8e64badb7035ab782b729b706cd64 /view/theme/quattro | |
| parent | 1231dd72f02fdec59b78ed9a6408887c2ae0b8d4 (diff) | |
| parent | 4faf0e609fe03095069c7a4bcdfc3496e4a28627 (diff) | |
| download | volse-hubzilla-f9a40ccbdea69fc7ffcbdc87356d535c67371210.tar.gz volse-hubzilla-f9a40ccbdea69fc7ffcbdc87356d535c67371210.tar.bz2 volse-hubzilla-f9a40ccbdea69fc7ffcbdc87356d535c67371210.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/theme/quattro')
| -rw-r--r-- | view/theme/quattro/conversation.tpl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/view/theme/quattro/conversation.tpl b/view/theme/quattro/conversation.tpl index 7bb7cd2fd..7ca3daea7 100644 --- a/view/theme/quattro/conversation.tpl +++ b/view/theme/quattro/conversation.tpl @@ -1,6 +1,8 @@ {{ for $threads as $thread }} <div id="tread-wrapper-$thread.id" class="tread-wrapper"> {{ for $thread.items as $item }} + {{if $mode == display}} + {{ else }} {{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> @@ -8,7 +10,8 @@ <div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;"> {{endif}} {{if $item.comment_lastcollapsed}}</div>{{endif}} - + {{ endif }} + {{ if $item.type == tag }} {{ inc wall_item_tag.tpl }}{{ endinc }} {{ else }} @@ -19,6 +22,8 @@ </div> {{ endfor }} +<div id="conversation-end"></div> + {{ if $dropping }} <a href="#" onclick="deleteCheckedItems();return false;"> <span class="icon s22 delete text">$dropping</span> |