5 files changed, 6 insertions, 129 deletions

diff --git a/views/default/core/river/body.php b/views/default/core/river/body.php
deleted file mode 100644
index 4129c3b15..000000000
--- a/views/default/core/river/body.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Body of river item
- *
- * @uses $vars[item]
- */
-
-$item = $vars[item];
-$subject = $item->getSubjectEntity();
-
-// river item header
-$params = array(
-	'href' => $subject->getURL(),
-	'text' => $subject->name,
-);
-$subject_link = elgg_view('output/url', $params);
-$timestamp = elgg_get_friendly_time($item->getPostedTime());
-$header = "$subject_link <span class=\"elgg-river-timestamp\">$timestamp</span>";
-
-// body
-$body = elgg_view($item->getView(), array('item' => $item));
-
-// footer
-$footer = elgg_view('core/river/footer', $vars);
-
-$params = array(
-	'header' => $header,
-	'body' => $body,
-	'footer' => $footer,
-	'show_inner' => false,
-);
-echo elgg_view('layout/objects/module', $params);
diff --git a/views/default/core/river/controls.php b/views/default/core/river/controls.php
deleted file mode 100644
index e239a2adb..000000000
--- a/views/default/core/river/controls.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Controls on an river item
- * 
- *
- * @uses $vars['item']
- */
-
-$object = $vars['item']->getObjectEntity();
-
-if (isloggedin()) {
-	// comments and non-objects cannot be commented on
-	if ($object->getType() == 'object' && $vars['item']->annotation_id == 0) {
-		$params = array(
-			'href' => '#',
-			'text' => elgg_echo('generic_comments:text'),
-			'class' => 'elgg-toggle',
-			'internalid' => "elgg-toggler-{$object->getGUID()}",
-		);
-		echo elgg_view('output/url', $params);
-		//echo elgg_view('forms/likes/link', array('entity' => $object));
-	}
-}
\ No newline at end of file
diff --git a/views/default/core/river/filter.php b/views/default/core/river/filter.php
index 08e211d44..9b7fadaa8 100644
--- a/views/default/core/river/filter.php
+++ b/views/default/core/river/filter.php
@@ -9,9 +9,11 @@
 $options = array();
 $options['type=all'] = elgg_echo('river:select', array(elgg_echo('all')));
 $registered_entities = elgg_get_config('registered_entities');
+
 if (!empty($registered_entities)) {
 	foreach ($registered_entities as $type => $subtypes) {
-		if (!is_array($subtypes)) {
+		// subtype will always be an array.
+		if (!count($subtypes)) {
 			$label = elgg_echo('river:select', array(elgg_echo("item:$type")));
 			$options["type=$type"] = $label;
 		} else {
@@ -24,25 +26,13 @@ if (!empty($registered_entities)) {
 }
 
 $params = array(
-	'internalid' => 'elgg-river-selector',
+	'id' => 'elgg-river-selector',
 	'options_values' => $options,
 );
 $selector = $vars['selector'];
 if ($selector) {
 	$params['value'] = $selector;
 }
-echo elgg_view('input/pulldown', $params);
-?>
+echo elgg_view('input/dropdown', $params);
 
-<script type="text/javascript">
-$(document).ready(function() {
-	$('#elgg-river-selector').change(function() {
-		var url = window.location.href;
-		if (window.location.search.length) {
-			url = url.substring(0, url.indexOf('?'));
-		}
-		url += '?' + $(this).val();
-		elgg.forward(url);
-	});
-});
-</script>
+elgg_load_js('elgg.ui.river');
diff --git a/views/default/core/river/footer.php b/views/default/core/river/footer.php
deleted file mode 100644
index de27f265f..000000000
--- a/views/default/core/river/footer.php
+++ /dev/null
@@ -1,46 +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 = count_annotations($object->getGUID(), '', '', 'generic_comment');
-
-$comments = get_annotations($object->getGUID(), "", "", 'generic_comment', "", "", 3, 0, "desc");
-if ($comments) {
-	$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
-$body = elgg_view('forms/comments/inline', array('entity' => $object));
-$params = array(
-	'body' => $body,
-	'action' => 'action/comments/add',
-	'internalid' => "elgg-togglee-{$object->getGUID()}",
-);
-echo elgg_view('input/form', $params);
diff --git a/views/default/core/river/image.php b/views/default/core/river/image.php
deleted file mode 100644
index afb6b4019..000000000
--- a/views/default/core/river/image.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/**
- * Elgg river image
- *
- * Displayed next to the body of each river item
- *
- * @uses $vars['item']
- */
-
-$subject = $vars['item']->getSubjectEntity();
-
-echo elgg_view("profile/icon", array('entity' => $subject, 'size' => 'small'));