From b766230d132bedf68ec3c63f72538fefa54c62e2 Mon Sep 17 00:00:00 2001
From: Evan Winslow <evan@elgg.org>
Date: Mon, 13 Jun 2011 22:23:09 -0700
Subject: Renamed river footer to a more semantic "responses".  Fixed
 discussion to work inline again with this new layout.

---
 views/default/river/elements/body.php      |  4 +--
 views/default/river/elements/footer.php    | 52 ------------------------------
 views/default/river/elements/responses.php | 52 ++++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 54 deletions(-)
 delete mode 100644 views/default/river/elements/footer.php
 create mode 100644 views/default/river/elements/responses.php

(limited to 'views/default')

diff --git a/views/default/river/elements/body.php b/views/default/river/elements/body.php
index a76cae909..080c04644 100644
--- a/views/default/river/elements/body.php
+++ b/views/default/river/elements/body.php
@@ -32,7 +32,7 @@ if ($attachments !== false) {
 	$attachments = "<div class=\"elgg-river-attachments\">$attachments</div>";
 }
 
-$footer = elgg_view('river/elements/footer', $vars);
+$responses = elgg_view('river/elements/responses', $vars);
 
 $group_string = '';
 $object = $item->getObjectEntity();
@@ -50,5 +50,5 @@ $menu
 <div class="elgg-river-summary">$summary $group_string <span class="elgg-river-timestamp">$timestamp</span></div>
 $message
 $attachments
-$footer
+$responses
 RIVER;
diff --git a/views/default/river/elements/footer.php b/views/default/river/elements/footer.php
deleted file mode 100644
index f1e79f131..000000000
--- a/views/default/river/elements/footer.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * River item footer
- */
-
-$item = $vars['item'];
-$object = $item->getObjectEntity();
-
-// annotations do not have comments
-if ($item->annotation_id != 0 || !$object) {
-	return true;
-}
-
-$comment_count = $object->countComments();
-
-$options = array(
-	'guid' => $object->getGUID(),
-	'annotation_name' => 'generic_comment',
-	'limit' => 3,
-	'order_by' => 'n_table.time_created desc'
-);
-$comments = elgg_get_annotations($options);
-
-if ($comments) {
-	// why is this reversing it? because we're asking for the 3 latest
-	// comments by sorting desc and limiting by 3, but we want to display
-	// these comments with the latest at the bottom.
-	$comments = array_reverse($comments);
-
-?>
-	<span class="elgg-river-comments-tab"><?php echo elgg_echo('comments'); ?></span>
-
-<?php
-
-	echo elgg_view_annotation_list($comments, array('list_class' => 'elgg-river-comments'));
-
-	if ($comment_count > count($comments)) {
-		$num_more_comments = $comment_count - count($comments);
-		$url = $object->getURL();
-		$params = array(
-			'href' => $url,
-			'text' => elgg_echo('river:comments:more', array($num_more_comments)),
-		);
-		$link = elgg_view('output/url', $params);
-		echo "<div class=\"elgg-river-more\">$link</div>";
-	}
-}
-
-// inline comment form
-$form_vars = array('id' => "comments-add-{$object->getGUID()}", 'class' => 'hidden');
-$body_vars = array('entity' => $object, 'inline' => true);
-echo elgg_view_form('comments/add', $form_vars, $body_vars);
diff --git a/views/default/river/elements/responses.php b/views/default/river/elements/responses.php
new file mode 100644
index 000000000..f1e79f131
--- /dev/null
+++ b/views/default/river/elements/responses.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * River item footer
+ */
+
+$item = $vars['item'];
+$object = $item->getObjectEntity();
+
+// annotations do not have comments
+if ($item->annotation_id != 0 || !$object) {
+	return true;
+}
+
+$comment_count = $object->countComments();
+
+$options = array(
+	'guid' => $object->getGUID(),
+	'annotation_name' => 'generic_comment',
+	'limit' => 3,
+	'order_by' => 'n_table.time_created desc'
+);
+$comments = elgg_get_annotations($options);
+
+if ($comments) {
+	// why is this reversing it? because we're asking for the 3 latest
+	// comments by sorting desc and limiting by 3, but we want to display
+	// these comments with the latest at the bottom.
+	$comments = array_reverse($comments);
+
+?>
+	<span class="elgg-river-comments-tab"><?php echo elgg_echo('comments'); ?></span>
+
+<?php
+
+	echo elgg_view_annotation_list($comments, array('list_class' => 'elgg-river-comments'));
+
+	if ($comment_count > count($comments)) {
+		$num_more_comments = $comment_count - count($comments);
+		$url = $object->getURL();
+		$params = array(
+			'href' => $url,
+			'text' => elgg_echo('river:comments:more', array($num_more_comments)),
+		);
+		$link = elgg_view('output/url', $params);
+		echo "<div class=\"elgg-river-more\">$link</div>";
+	}
+}
+
+// inline comment form
+$form_vars = array('id' => "comments-add-{$object->getGUID()}", 'class' => 'hidden');
+$body_vars = array('entity' => $object, 'inline' => true);
+echo elgg_view_form('comments/add', $form_vars, $body_vars);
-- 
cgit v1.2.3