From 05e08cb5d2967a12c479ab94187b1ef1bde0a094 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 28 Nov 2012 18:45:11 -0800
Subject: trace through the threaded conversation spaghetti to bring back a
 sane looking network page

---
 view/tpl/conv_item.tpl | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'view/tpl/conv_item.tpl')

diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index a5a3c4958..1c35feaad 100644
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -98,24 +98,18 @@
 	<div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.showlike</div>
 	<div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.showdislike</div>
 
-			{{ if $item.threaded }}
-			{{ if $item.comment }}
-			<div class="wall-item-comment-wrapper $item.indent" >
-				$item.comment
-			</div>
-			{{ endif }}
-			{{ endif }}
-
 <div class="wall-item-outside-wrapper-end $item.indent" ></div>
 </div>
+{{ if $item.toplevel }}
 {{ for $item.children as $item }}
 	{{ inc $item.template }}{{ endinc }}
 {{ endfor }}
+{{ endif }}
 
-{{ if $item.flatten }}
 <div class="wall-item-comment-wrapper" >
 	$item.comment
 </div>
-{{ endif }}
+
+
 </div>
 {{if $item.comment_lastcollapsed}}</div>{{endif}}
-- 
cgit v1.2.3