From 0f15c117ee97757a58cd10e62376a429306516c5 Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Fri, 10 Aug 2012 04:53:39 -0400 Subject: [PATCH] quattro: move comment box for top-level item at the end of comments list --- view/theme/quattro/threaded_conversation.tpl | 2 ++ view/theme/quattro/wall_item_tag.tpl | 4 +--- view/theme/quattro/wall_thread.tpl | 16 +++++++++------- view/theme/quattro/wallwall_thread.tpl | 14 ++++++++------ 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/view/theme/quattro/threaded_conversation.tpl b/view/theme/quattro/threaded_conversation.tpl index 491c47302..13c38acb2 100644 --- a/view/theme/quattro/threaded_conversation.tpl +++ b/view/theme/quattro/threaded_conversation.tpl @@ -1,6 +1,8 @@ {{ for $threads as $item }} +
+ {{ 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 205fcfebc..d655306e5 100644 --- a/view/theme/quattro/wall_item_tag.tpl +++ b/view/theme/quattro/wall_item_tag.tpl @@ -19,7 +19,5 @@
{{ if $item.flatten }} -
- $item.comment -
+
$item.comment
{{ endif }} diff --git a/view/theme/quattro/wall_thread.tpl b/view/theme/quattro/wall_thread.tpl index fe136b2b2..bd165eed7 100644 --- a/view/theme/quattro/wall_thread.tpl +++ b/view/theme/quattro/wall_thread.tpl @@ -97,14 +97,14 @@
$item.like
$item.dislike
- {{ if $item.threaded }}{{ if $item.comment }} + {{ if $item.threaded }}{{ if $item.comment }}{{ if $item.indent==comment }}
- $item.comment + $item.comment
- {{ endif }}{{ endif }} + {{ endif }}{{ endif }}{{ endif }} @@ -124,8 +124,10 @@ {{if $item.comment_lastcollapsed}}{{endif}} {{ endif }} -{{ if $item.flatten }} -
- $item.comment -
+{{ if $item.indent!=comment}} +
$item.comment
+{{ endif }} + +{{ if $item.flatten }} +
$item.comment
{{ endif }} diff --git a/view/theme/quattro/wallwall_thread.tpl b/view/theme/quattro/wallwall_thread.tpl index cc2f8e362..ceb74517e 100644 --- a/view/theme/quattro/wallwall_thread.tpl +++ b/view/theme/quattro/wallwall_thread.tpl @@ -101,14 +101,14 @@
$item.dislike
- {{ if $item.threaded }}{{ if $item.comment }} + {{ if $item.threaded }}{{ if $item.comment }}{{ if $item.indent==comment }}
$item.comment
- {{ endif }}{{ endif }} + {{ endif }}{{ endif }}{{ endif }} @@ -127,8 +127,10 @@ {{if $item.comment_lastcollapsed}}{{endif}} {{ endif }} -{{ if $item.flatten }} -
- $item.comment -
+{{ if $item.indent!=comment}} +
$item.comment
+{{ endif }} + +{{ if $item.flatten }} +
$item.comment
{{ endif }}