3 files changed, 8 insertions, 17 deletions
diff --git a/pages/videolist/all.php b/pages/videolist/all.php
index db0b0ee9d..6fe68f3eb 100644
--- a/pages/videolist/all.php
+++ b/pages/videolist/all.php
@@ -20,22 +20,7 @@ $content = elgg_list_entities(array(
 	'full_view' => FALSE
 ));
 
-// get the latest comments on all videos
-$comments = elgg_get_annotations(array(
-	'type' => 'object',
-	'subype' => 'videolist',
-	'annotation_names' => array('generic_comment'),
-	'limit' => 4,
-	'order_by' => 'time_created desc',
-));
-$sidebar = elgg_view('annotation/latest_comments', array('comments' => $comments));
-
-// tag-cloud display
-$sidebar .= elgg_view_tagcloud(array(
-	'type' => 'object',
-	'subtype' => 'videolist',
-	'limit' => 50,
-));
+$sidebar = elgg_view('videolist/sidebar');
 
 elgg_set_context('videolist');
 $body = elgg_view_layout('content', array(
diff --git a/pages/videolist/friends.php b/pages/videolist/friends.php
index c505464cb..8bbb34698 100644
--- a/pages/videolist/friends.php
+++ b/pages/videolist/friends.php
@@ -21,7 +21,7 @@ if (!$content) {
 	$content = elgg_echo("videolist:none");
 }
 
-//$sidebar = elgg_view('videolist/sidebar', array());
+$sidebar = elgg_view('videolist/sidebar', array());
 
 $body = elgg_view_layout('content', array(
 	'filter_context' => 'friends',
diff --git a/pages/videolist/watch.php b/pages/videolist/watch.php
index fc9bd1a68..3a740f396 100644
--- a/pages/videolist/watch.php
+++ b/pages/videolist/watch.php
@@ -27,10 +27,16 @@ elgg_push_breadcrumb($title);
 $content = elgg_view_entity($videolist_item, array('full_view' => true));
 $content .= elgg_view_comments($videolist_item);
 
+$sidebar = elgg_view('videolist/sidebar', array(
+	'show_comments' => false,
+	'show_videolist' => true,
+));
+
 $body = elgg_view_layout('content', array(
 	'content' => $content,
 	'title' => $title,
 	'filter' => '',
+	'sidebar' => $sidebar,
 ));
 
 echo elgg_view_page($title, $body);