quattro: move comment box for top-level item at the end of comments list

diff --git a/view/theme/quattro/threaded_conversation.tpl b/view/theme/quattro/threaded_conversation.tpl
index 491c47302fe157c80db91e2a15db24f84b09e6c7..13c38acb2b40471374c4d8cd19a73f0717ba1dde 100644 (file)
--- a/view/theme/quattro/threaded_conversation.tpl
+++ b/view/theme/quattro/threaded_conversation.tpl
@@ -1,6 +1,8 @@
 {{ for $threads as $item }}
+
 <div id="tread-wrapper-$item.id" class="tread-wrapper {{ if $item.threaded }}threaded{{ endif }}">
        
+       
                {{ if $item.type == tag }}
                        {{ inc wall_item_tag.tpl }}{{ endinc }}
                {{ else }}

diff --git a/view/theme/quattro/wall_item_tag.tpl b/view/theme/quattro/wall_item_tag.tpl
index 205fcfebc06e350905e46dac314bd8e4c809aac8..d655306e595bf888d45e935691ef5d8a2c500933 100644 (file)
--- a/view/theme/quattro/wall_item_tag.tpl
+++ b/view/theme/quattro/wall_item_tag.tpl
@@ -19,7 +19,5 @@
 </div>
 
 {{ if $item.flatten }}
-<div class="wall-item-comment-wrapper" >
-       $item.comment
-</div>
+<div class="wall-item-comment-wrapper" >$item.comment</div>
 {{ endif }}

diff --git a/view/theme/quattro/wall_thread.tpl b/view/theme/quattro/wall_thread.tpl
index fe136b2b2fb61a56c20f2af6d928dad6d32a13dd..bd165eed7857db23765dc68818a7787ad8db8d73 100644 (file)
--- a/view/theme/quattro/wall_thread.tpl
+++ b/view/theme/quattro/wall_thread.tpl
@@ -97,14 +97,14 @@
                <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
                <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>      
        </div>
-       {{ if $item.threaded }}{{ if $item.comment }}
+       {{ if $item.threaded }}{{ if $item.comment }}{{ if $item.indent==comment }}
        <div class="wall-item-bottom">
                <div class="wall-item-links"></div>
                <div class="wall-item-comment-wrapper">
-                                       $item.comment
+                       $item.comment
                </div>
        </div>
-       {{ endif }}{{ endif }}
+       {{ endif }}{{ endif }}{{ endif }}
 
 </div>
 
@@ -124,8 +124,10 @@
 {{if $item.comment_lastcollapsed}}</div>{{endif}}
 {{ endif }}
 
+{{ if $item.indent!=comment}}
+<div class="wall-item-comment-wrapper" >$item.comment</div>
+{{ endif }}
+
 {{ if $item.flatten }}
-<div class="wall-item-comment-wrapper" >
-       $item.comment
-</div>
+<div class="wall-item-comment-wrapper" >$item.comment</div>
 {{ endif }}

diff --git a/view/theme/quattro/wallwall_thread.tpl b/view/theme/quattro/wallwall_thread.tpl
index cc2f8e36278db1c1c672b01ebe1ca637a6c66e5f..ceb74517e39e3287fbee6a2556849609337116a1 100644 (file)
--- a/view/theme/quattro/wallwall_thread.tpl
+++ b/view/theme/quattro/wallwall_thread.tpl
@@ -101,14 +101,14 @@
                <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>      
        </div>
        
-       {{ if $item.threaded }}{{ if $item.comment }}
+       {{ if $item.threaded }}{{ if $item.comment }}{{ if $item.indent==comment }}
        <div class="wall-item-bottom">
                <div class="wall-item-links"></div>
                <div class="wall-item-comment-wrapper">
                                        $item.comment
                </div>
        </div>
-       {{ endif }}{{ endif }}
+       {{ endif }}{{ endif }}{{ endif }}
 </div>
 
 
@@ -127,8 +127,10 @@
 {{if $item.comment_lastcollapsed}}</div>{{endif}}
 {{ endif }}
 
+{{ if $item.indent!=comment}}
+<div class="wall-item-comment-wrapper" >$item.comment</div>
+{{ endif }}
+
 {{ if $item.flatten }}
-<div class="wall-item-comment-wrapper" >
-       $item.comment
-</div>
+<div class="wall-item-comment-wrapper" >$item.comment</div>
 {{ endif }}