diff options
| author | friendica <info@friendica.com> | 2012-06-14 17:39:17 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-06-14 17:39:17 -0700 |
| commit | 8c94fa23bfebf6d6b9930ed83a86e9cdae55d28f (patch) | |
| tree | 3be6ca812b7c1459d09901d41606776d0279de27 /view/theme | |
| parent | 2efee75557bafc32b20be1cceac047fdeea3bb71 (diff) | |
| parent | 244d7f9a8f3921d4c15812ce6f57a2c0e882e2fa (diff) | |
| download | volse-hubzilla-8c94fa23bfebf6d6b9930ed83a86e9cdae55d28f.tar.gz volse-hubzilla-8c94fa23bfebf6d6b9930ed83a86e9cdae55d28f.tar.bz2 volse-hubzilla-8c94fa23bfebf6d6b9930ed83a86e9cdae55d28f.zip | |
Merge https://github.com/friendica/friendica into pull
Diffstat (limited to 'view/theme')
| -rw-r--r-- | view/theme/quattro/conversation.tpl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/view/theme/quattro/conversation.tpl b/view/theme/quattro/conversation.tpl index a30ff187c..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 }} |