aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-11-28 18:45:11 -0800
committerfriendica <info@friendica.com>2012-11-28 18:45:11 -0800
commit05e08cb5d2967a12c479ab94187b1ef1bde0a094 (patch)
tree0b70e60b33da3985c5752d7caf0147f471408b91 /view
parent7c047bea332efaa11af0d02878d91823c4bba1ad (diff)
downloadvolse-hubzilla-05e08cb5d2967a12c479ab94187b1ef1bde0a094.tar.gz
volse-hubzilla-05e08cb5d2967a12c479ab94187b1ef1bde0a094.tar.bz2
volse-hubzilla-05e08cb5d2967a12c479ab94187b1ef1bde0a094.zip
trace through the threaded conversation spaghetti to bring back a sane looking network page
Diffstat (limited to 'view')
-rw-r--r--view/tpl/conv_item.tpl14
-rw-r--r--view/tpl/convobj.tpl4
2 files changed, 8 insertions, 10 deletions
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}}
diff --git a/view/tpl/convobj.tpl b/view/tpl/convobj.tpl
new file mode 100644
index 000000000..a35e232e2
--- /dev/null
+++ b/view/tpl/convobj.tpl
@@ -0,0 +1,4 @@
+{{ for $threads as $item }}
+{{ inc $item.template }}{{ endinc }}
+{{ endfor }}
+