From 53590d216691a572ede5e30dbc631a6cd0669c41 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 22 Nov 2011 16:00:05 -0800
Subject: rework show/hide comments

---
 include/conversation.php | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'include/conversation.php')

diff --git a/include/conversation.php b/include/conversation.php
index 9ac251e46..d8adb27c3 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -172,6 +172,7 @@ function conversation(&$a, $items, $mode, $update) {
 	$cmnt_tpl    = get_markup_template('comment_item.tpl');
 	$tpl         = get_markup_template('wall_item.tpl');
 	$wallwall    = get_markup_template('wallwall_item.tpl');
+	$hide_comments_tpl = get_markup_template('hide_comments.tpl');
 
 	$alike = array();
 	$dlike = array();
@@ -385,12 +386,20 @@ function conversation(&$a, $items, $mode, $update) {
 				$override_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false);
 				$show_comment_box = ((($page_writeable) && ($item_writeable) && ($comments_seen == $comments[$item['parent']])) ? true : false);
 
+
 				if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
 					if(! $comments_collapsed) {
-						$threads[$threadsid] .= '<div class="ccollapse-wrapper fakelink" id="ccollapse-wrapper-' . $item['parent'] 
-							. '" onclick="openClose(' . '\'ccollapse-' . $item['parent'] . '\'); $(\'#ccollapse-wrapper-' . $item['parent'] . '\').hide();" >' 
-							. sprintf( t('See all %d comments'), $comments[$item['parent']]) . '</div>'
-							. '<div class="ccollapse" id="ccollapse-' . $item['parent'] . '" style="display: none;" >';
+
+						// IMPORTANT: the closing </div> in the hide_comments template
+						// is supplied below in code. 
+
+						$threads[$threadsid] .= replace_macros($hide_comments_tpl,array(
+							'$id' => $item['parent'],
+							'$num_comments' => sprintf( tt('%d comment','%d comments',$comments[$item['parent']]),
+								$comments[$item['parent']]),
+							'$display' => 'none',
+							'$hide_text' => t('show more')
+						));
 						$comments_collapsed = true;
 					}
 				}
-- 
cgit v1.2.3