Beginnings of updating VideoList to v1.8 interface, edit, delete, favorite added. Amongst other updates Friends view and breadcrumbs added.

16 files changed, 145 insertions, 200 deletions

diff --git a/actions/add.php b/actions/add.php
index 8be09ca3a..a8a3f2905 100644
--- a/actions/add.php
+++ b/actions/add.php
@@ -186,7 +186,7 @@ else if($pageContainer == "vimeo"){
 	$videolist->videotype = "vimeo";
 }
 
-// Before we can set metadata, we need to save the blog post
+// Before we can set metadata, we need to save the video
 if (!$videolist->save()) {
 	register_error(elgg_echo("videolist:error"));
 	forward("pg/videolist/new");
diff --git a/actions/tubesearch.php b/actions/tubesearch.php
index 51bc6a990..e8836ed04 100644
--- a/actions/tubesearch.php
+++ b/actions/tubesearch.php
@@ -48,7 +48,7 @@ if (!isset($queryFeed) || empty($queryFeed)) {
 		$startOffset = $counts->startIndex;
 		$endOffset = ($startOffset-1) + $counts->itemsPerPage;
 
-		$body = '<div id="paginateSearch">';
+		$body = '<div id="pagination">';
 		$rem = floor($total/10);
 		$rem*=10;
 		if($rem<$total)
diff --git a/all.php b/all.php
index 263702f61..c1be98767 100644
--- a/all.php
+++ b/all.php
@@ -24,12 +24,14 @@ if ($page_owner === false || is_null($page_owner)) {
 $title = sprintf(elgg_echo("videolist:search"));
 
 // Get objects
-$area2 = elgg_view_title($title);
+$area1 = elgg_view('page_elements/content_header', array('context' => "everyone", 'type' => 'videolist'));
 set_input('show_viewtype', 'all');
-$area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'videolist', 'container_guids' => page_owner(), 'limit' => 10, 'full_view' => TRUE, 'view_type_toggle' => FALSE, 'pagination' => TRUE));
+$area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'videolist', 'limit' => 10, 'full_view' => TRUE, 'view_type_toggle' => FALSE, 'pagination' => TRUE));
+// include a view for plugins to extend
+$area3 .= elgg_view("videolist/sidebar", array("object_type" => 'videolist'));
 
 set_context('videolist');
-$body = elgg_view_layout('one_column_with_sidebar',$area1. $area2);
+$body = elgg_view_layout('one_column_with_sidebar', $area1.$area2, $area3);
 
 // Finally draw the page
 page_draw($title, $body);
\ No newline at end of file
diff --git a/friends.php b/friends.php
new file mode 100644
index 000000000..2a8d32569
--- /dev/null
+++ b/friends.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Elgg Video Plugin
+ * This plugin allows users to create a library of youtube/vimeo/metacafe videos
+ *
+ * @package Elgg
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Prateek Choudhary <synapticfield@gmail.com>
+ * @copyright Prateek Choudhary
+ */
+
+// Start engine
+require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	
+// get the filter menu
+$area1 = elgg_view("page_elements/content_header", array('context' => "friends", 'type' => 'videolist'));
+			
+// List videos
+set_context('search');
+$area2 .= list_user_friends_objects(page_owner(),'videolist',10,false,false);
+set_context('videolist');
+		
+// include a view for plugins to extend
+$area3 = elgg_view("videolist/sidebar", array("object_type" => 'videolist'));
+				
+// Format page
+$body = elgg_view_layout('one_column_with_sidebar', $area1.$area2, $area3);
+		
+// Draw it
+echo page_draw(elgg_echo('videolist:friends'),$body);
diff --git a/index.php b/index.php
index c1c1dc01a..04805cc18 100644
--- a/index.php
+++ b/index.php
@@ -8,9 +8,16 @@
  * @author Prateek Choudhary <synapticfield@gmail.com>
  * @copyright Prateek Choudhary
  */
+ 
+global $CONFIG;
+
 require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 
 $owner = page_owner_entity();
+if ($page_owner === false || is_null($page_owner)) {
+	$page_owner = $_SESSION['user'];
+	set_page_owner($page_owner->getGUID());
+}
 
 //get videolist GUID
 $container_guid = get_input('username');
@@ -20,22 +27,26 @@ if(isset($container_guid) && !empty($container_guid)) {
 	if ($container_guid[0] == "group") {
 		$container = get_entity($container_guid[1]);
 		set_context("groupsvideos");
-		//$page_owner = page_owner_entity();
 	}
 }
-//set page owner
-//set_page_owner($videolist_guid);
 
+elgg_push_breadcrumb(elgg_echo('videolist:find'), $CONFIG->wwwroot."mod/videolist/all.php");
+elgg_push_breadcrumb(sprintf(elgg_echo("videolist:home"),$page_owner->name));
 $title = sprintf(elgg_echo("videolist:home"), "$owner->name");
 
-// Get objects
-$area2 = elgg_view_title($title);
-$area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'videolist', 'container_guids' => page_owner(), 'limit' => 10));
+//set videolist header
+if(page_owner() == get_loggedin_userid()) {
+	$area1 .= elgg_view('page_elements/content_header', array('context' => "mine", 'type' => 'videolist'));
+} else {
+	$area1 .= elgg_view('navigation/breadcrumbs');
+	$area1 .= elgg_view('page_elements/content_header_member', array('type' => 'videolist'));
+}
 
-//$area2 .= elgg_view("staticvideo/index");
+// Get objects
+$area2 = elgg_list_entities(array('types' => 'object', 'subtypes' => 'videolist', 'container_guids' => page_owner(), 'limit' => 10));
 
 set_context('videolist');
-$body = elgg_view_layout('one_column_with_sidebar',$area1. $area2);
+$body = elgg_view_layout('one_column_with_sidebar', $area1.$area2, $area3);
 
 // Finally draw the page
 page_draw($title, $body);
\ No newline at end of file
diff --git a/languages/en.php b/languages/en.php
index 65b0d8905..238651cc0 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -10,12 +10,15 @@
  */
 $english = array(
 
-	"videolist" => "My Videos",
+	"videolist" => "Videos",
 
 	"videolist:home" => '%s \'s Videos',
 	"videolist:new" => 'Add a Video',
 	"videolist:find" => 'All Site videos',
+	"videolist:all" => 'All Site videos',
+	"videolist:add" => 'Add a Video',
 	"videolist:search" => "All Site videos",
+	'videolist:friends' => "Friends' videos",
 	"videolist:title_videourl" => 'Enter Video Url',
 	"videolist:submit" => 'Submit',
 	"videolist:videoTitle" => "Title",
@@ -50,6 +53,7 @@ $english = array(
 	"videolist:group" => "Group Videos",
 	"videolist:groupall" => "All Group Videos",
 	"videolist:none" => "This group does not have any videos yet",
+	"videolist:none:found" => "No videos were found."
 );
 
 add_translation("en",$english);
\ No newline at end of file
diff --git a/new.php b/new.php
index 583e6bc25..169a48fb5 100644
--- a/new.php
+++ b/new.php
@@ -9,7 +9,7 @@
  * @copyright Prateek Choudhary
  */
 
-
+global $CONFIG;
 // Render the video upload page
 // Load Elgg engine
 require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
@@ -36,10 +36,15 @@ if(isset($container_guid) && !empty($container_guid)){
 	}
 }
 
-$title = sprintf(elgg_echo("videolist:new"), $page_owner->name);
+$title = sprintf(elgg_echo("videolist:add"));
+
+//set up breadcrumbs
+elgg_push_breadcrumb(elgg_echo('videolist:all'), $CONFIG->wwwroot."mod/videolist/all.php");
+elgg_push_breadcrumb(elgg_echo("videolist:add"));
 
-$area2 = elgg_view_title($title);
+$area1 = elgg_view('navigation/breadcrumbs');
+$area1 .= elgg_view('page_elements/content_header', array('context' => "action", 'type' => 'videolist'));
 $area2 .= elgg_view("forms/add");
-$body = elgg_view_layout('one_column_with_sidebar', $area1 . $area2);
+$body = elgg_view_layout('one_column_with_sidebar', $area1 . $area2, $area3);
 
 page_draw($title, $body);
\ No newline at end of file
diff --git a/start.php b/start.php
index e03720309..0ea73c92c 100644
--- a/start.php
+++ b/start.php
@@ -12,7 +12,7 @@ function videolist_init() {
 	global $CONFIG;
 
 	if (isloggedin()) {
-		add_menu(elgg_echo('videolist'), $CONFIG->wwwroot . "pg/videolist/owned/" . $_SESSION['user']->username);
+		add_menu(elgg_echo('videolist'), $CONFIG->wwwroot . "mod/videolist/all.php");
 	}
 
 	// Extend system CSS with our own styles
@@ -27,9 +27,6 @@ function videolist_init() {
 	//extend this plugin for groups
 	elgg_extend_view('groups/left_column','videolist/groupprofile_videolist');
 
-	// Add a new videolist widget
-	add_widget_type('videolist_view',elgg_echo("videolist:widget"),elgg_echo("videolist:widget:description"), 'profile');
-
 	if (is_callable('register_notification_object')) {
 		register_notification_object('object', 'videolist', elgg_echo('videolist:new'));
 	}
@@ -57,11 +54,13 @@ function videolist_page_handler($page) {
 	if (isset($page[0])) {
 		switch($page[0]) {
 			case "owned": if (isset($page[1])) set_input('username',$page[1]);
-										@include(dirname(__FILE__) . "/index.php");
-							break;
-			case "search":		  @include(dirname(__FILE__) . "/world.php");
+								@include(dirname(__FILE__) . "/index.php");
+								break;
+			case "friends":     @include(dirname(__FILE__) . "/friends.php");
 								break;
-			case "video":		  @include(dirname(__FILE__) . "/video.php");
+			case "search":		@include(dirname(__FILE__) . "/all.php");
+								break;
+			case "video":		@include(dirname(__FILE__) . "/video.php");
 								break;
 			case "new": if (isset($page[3])) set_input('add_videourl',$page[3]);
 									if (isset($page[5])) set_input('page',$page[5]);
@@ -69,14 +68,14 @@ function videolist_page_handler($page) {
 								@include(dirname(__FILE__) . "/new.php");
 								break;
 			case "watch":	set_input('video_id',$page[1]);
-										@include(dirname(__FILE__) . "/watch.php");
+								@include(dirname(__FILE__) . "/watch.php");
 								break;
 			case "browse":	if (isset($page[1])) set_input('container',$page[1]);
-										@include(dirname(__FILE__) . "/browse.php");
+								@include(dirname(__FILE__) . "/browse.php");
 								break;
 		default : if (isset($page[1])) set_input('username',$page[1]);
-							@include(dirname(__FILE__) . "/index.php");
-							break;
+								@include(dirname(__FILE__) . "/index.php");
+								break;
 		}
 	// If the URL is just 'videolist/username', or just 'videolist/', load the standard index file
 	} else {
@@ -110,10 +109,10 @@ function videolist_pagesetup() {
 		add_submenu_item(elgg_echo('videolist:find'),$CONFIG->wwwroot."pg/videolist/search/");
 		*/
 		if ((page_owner() == $_SESSION['guid'] || !page_owner()) && isloggedin()) {
-			add_submenu_item(sprintf(elgg_echo("videolist:home"),page_owner_entity()->name), $CONFIG->wwwroot . "pg/videolist/owned/" . page_owner_entity()->username);
+			//add_submenu_item(sprintf(elgg_echo("videolist:home"),page_owner_entity()->name), $CONFIG->wwwroot . "pg/videolist/owned/" . page_owner_entity()->username);
 			add_submenu_item(sprintf(elgg_echo('videolist:new'),page_owner_entity()->name), $CONFIG->wwwroot . "pg/videolist/new/". page_owner_entity()->username);
 			add_submenu_item(sprintf(elgg_echo('videolist:browsemenu'),page_owner_entity()->name), $CONFIG->wwwroot . "pg/videolist/browse/". page_owner_entity()->username);
-			add_submenu_item(sprintf(elgg_echo('videolist:find'),page_owner_entity()->name), $CONFIG->wwwroot . "pg/videolist/search/");
+			//add_submenu_item(sprintf(elgg_echo('videolist:find'),page_owner_entity()->name), $CONFIG->wwwroot . "pg/videolist/search/");
 		} else if (page_owner() && $page_owner instanceof ElggUser) {
 			add_submenu_item(sprintf(elgg_echo("videolist:home"),$page_owner->name), $CONFIG->wwwroot . "pg/videolist/owned/". $page_owner->username);
 		}
@@ -200,7 +199,7 @@ register_elgg_event_handler('annotate','all','videolist_object_notifications');
 // Register actions
 global $CONFIG;
 
-register_action("videolist/addvideo", false, $CONFIG->pluginspath . "videolist/actions/addvideo.php");
+register_action("videolist/add", false, $CONFIG->pluginspath . "videolist/actions/add.php");
 register_action("videolist/tubesearch", false, $CONFIG->pluginspath . "videolist/actions/tubesearch.php");
 //register_action("videolist/addcomment", false, $CONFIG->pluginspath . "videolist/actions/comments/add.php");
 register_action("videolist/remove", false, $CONFIG->pluginspath . "videolist/actions/delete.php");
\ No newline at end of file
diff --git a/views/default/forms/add.php b/views/default/forms/add.php
index 2da5353b7..3933af251 100644
--- a/views/default/forms/add.php
+++ b/views/default/forms/add.php
@@ -116,8 +116,7 @@ if(isset($confirm_action) && ($confirm_action == 'add_video')) {
 			$_SESSION['videolisttags'] = $tags;
 			$_SESSION['Pagecontainer'] = $Pagecontainer;
 			$_SESSION['container_guid'] = $container_guid;
-			//echo $_SESSION['candidate_profile_video'];
-			$url = "action/videolist/addvideo?__elgg_ts={$timestamp}&__elgg_token={$token}";
+			$url = "action/videolist/add?__elgg_ts={$timestamp}&__elgg_token={$token}";
 			forward($url);
 		}
 		else
@@ -128,9 +127,7 @@ if(isset($confirm_action) && ($confirm_action == 'add_video')) {
 	}
 }
 
-$body = '<div class="videolist-content">';
-
-$body .= '<form action="'.$_SERVER['php_self'].'" method="post">';
+$body = '<form action="'.$_SERVER['php_self'].'" method="post" class="margin_top">';
 $body .= elgg_view('input/hidden',array('internalname'=>'video_action', 'value'=>'add_video'));
 $body .= elgg_view('input/hidden',array('internalname'=>'guid', 'value'=>$vars['guid']));
 
@@ -151,6 +148,5 @@ $body .= elgg_view('input/access',array('internalname'=>'access_id', 'value' =>
 $body .= '</label></p>';
 $body .= elgg_view('input/submit', array('internalname'=>'submit','value'=>elgg_echo('videolist:submit')));
 $body .= '</form>';
-$body .= '</div>';
 
-print $body."<br /><br />";
+print $body;
diff --git a/views/default/forms/browsetube.php b/views/default/forms/browsetube.php
index 0a54f0d10..52c8145a0 100644
--- a/views/default/forms/browsetube.php
+++ b/views/default/forms/browsetube.php
@@ -243,7 +243,7 @@ function InsertVideoUrl(param, param2){
 	var elggToken = "<?php echo generate_action_token(time()); ?>";
 	$.ajax({
 		type: "GET",
-		url: "<?php echo $vars['url']; ?>"+"action/videolist/addvideo",
+		url: "<?php echo $vars['url']; ?>"+"action/videolist/add",
 		data: "bustcache="+new Date().getTime()+"&__elgg_ts="+elggTS+"&__elgg_token="+elggToken+"&video_action="+actionAction+"&title_videourl="+param+"&videolisttags="+param2+"&access_id="+access_id,
 		success: function(html){
 			$("#loadingSearch").html("");
diff --git a/views/default/object/videolist.php b/views/default/object/videolist.php
index b3c070495..4563f04b4 100644
--- a/views/default/object/videolist.php
+++ b/views/default/object/videolist.php
@@ -23,59 +23,34 @@ if(!empty($video_file)) {
 	$mime = "image/html";
 	$thumbnail = $videothumbnail;
 	$watch_URL = $vars['url']."pg/videolist/watch/".$video_guid;
-	if (get_input('search_viewtype') == "gallery") {
-		$videodiv .= "<div class=\"filerepo_gallery_item\">";
-		$videodiv .= "<div id='videobox'>";
-		$videodiv .= $title."<br />";
-		$videodiv .= "<a href='".$watch_URL."'>";
-		$videodiv .= "<img src='".$thumbnail."' width='120' class='tubesearch'/>";
-		$videodiv .= "</a>";
-
-		$videodiv .= "</div>";
-		//$videodiv .= "<div id='videoDescbox'>";
-		//$videodiv .= "<span class='title'>".elgg_echo('videolist:videoTitle')." : </span>".$title."<br />";
-		//$videodiv .= "</div>";
-
-		$numcomments = elgg_count_comments($video_file);
-		$videodiv .= "<div id='videoActionbox'>";
-
-		if ($numcomments) {
-			$videodiv .= "<a href=\"{$watch_URL}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")</a> <br />";
-		}
-
-		if($video_file->canEdit()) {
-			$videodiv .=  elgg_view("output/confirmlink", array(
-															'href' => $vars['url'] . "action/videolist/remove?video_id=" . $video_guid,
-															'text' => elgg_echo('delete'),
-															'confirm' => elgg_echo('deleteconfirm'),
-														));
-		}
-
-		$videodiv .= "</div></div>";
-		$videodiv .= "<div class=\"clearfloat\"></div>";
-		print $videodiv;
-	} else if(get_input('show_viewtype') == "all") {
-		$info .= '<p><a href="' .$watch_URL. '">'.$title.'</a></p>';
-		$info .= "<p class=\"owner_timestamp\"><a href=\"{$vars['url']}pg/profile/{$owner->username}\">{$owner->name}</a> {$friendlytime}";
+	
+	$object_acl = get_readable_access_level($video_file->access_id);
+	// metadata block, - access level, edit, delete, + options view extender
+	$info = "<div class='entity_metadata'><span class='access_level'>" . $object_acl . "</span>";
+
+	// view for plugins to extend	
+	$info .= elgg_view('videolist/options', array('entity' => $video_file));
+					
+	// include edit and delete options
+	if ($owner->canEdit()) {
+		$info .= "<span class='entity_edit'><a href=\"{$vars['url']}mod/videolist/edit.php?file_guid={$video_guid}\">" . elgg_echo('edit') . "</a></span>";
+		$info .= "<span class='delete_button'>" . elgg_view('output/confirmlink',array('href' => $vars['url'] . "action/videolist/delete?file=" . $video_guid, 'text' => elgg_echo("delete"),'confirm' => elgg_echo("videolist:delete:confirm"),)). "</span>";  
+	}
+	$info .= "</div>";
+	
+	if(get_input('show_viewtype') == "all") {
+		$info .= '<p class="entity_title"><a href="' .$watch_URL. '">'.$title.'</a></p>';
+		$info .= "<p class='entity_subtext'><a href=\"{$vars['url']}pg/profile/{$owner->username}\">{$owner->name}</a> {$friendlytime}";
 		$info .= "</p>";
-		$icon = "<a href=\"{$watch_URL}\">" . elgg_view("videolist/icon", array("mimetype" => $mime, 'thumbnail' => $thumbnail, 'video_guid' => $video_guid, 'size' => 'small')) . "</a>";
-
-		echo elgg_view_listing($icon, $info);
+		$icon = "<a class='video_icon' href=\"{$watch_URL}\">" . elgg_view("videolist/icon", array("mimetype" => $mime, 'thumbnail' => $thumbnail, 'video_guid' => $video_guid, 'size' => 'small')) . "</a>";
+		echo "<div class='video_entity'>".elgg_view_listing($icon, $info)."</div>";
 	} else {
-		/*
-		$videodiv .= "<a href='".$vars['url']."pg/videolist/watch/".$video_guid."'>";
-		$videodiv .= "<img src='http://img.youtube.com/vi/".$video_id."/default.jpg' width='50' alt='unable to fetch image'/>";
-		$videodiv .= "</a> &nbsp;&nbsp;<a href='".$vars['url']."pg/videolist/watch/".$video_guid."'><span class='title'>Title : </span>".$title;
-		$videodiv .= "</a><br />";
-		*/
-		//video list-entity view
-		$info = '<p><a href="' .$watch_URL. '">'.$title.'</a></p>';
-		$info .= "<p class=\"owner_timestamp\"><a href=\"{$vars['url']}pg/profile/{$owner->username}\">{$owner->name}</a> {$friendlytime}";
+		$info .= '<p class="entity_title"><a href="' .$watch_URL. '">'.$title.'</a></p>';
+		$info .= "<p class='entity_subtext'><a href=\"{$vars['url']}pg/profile/{$owner->username}\">{$owner->name}</a> {$friendlytime}";
 		$info .= "</p>";
-		$icon = "<a href=\"{$watch_URL}\">" . elgg_view("videolist/icon", array("mimetype" => $mime, 'thumbnail' => $thumbnail, 'video_guid' => $video_guid, 'size' => 'small')) . "</a>";
-
-		echo elgg_view_listing($icon, $info);
+		$icon = "<a class='video_icon' href=\"{$watch_URL}\">" . elgg_view("videolist/icon", array("mimetype" => $mime, 'thumbnail' => $thumbnail, 'video_guid' => $video_guid, 'size' => 'small')) . "</a>";
+		echo "<div class='video_entity'>".elgg_view_listing($icon, $info)."</div>";
 	}
 } else {
-	echo "No videos were found.";
+	echo "<p class='margin_top'>".elgg_echo('videolist:none:found')."</p>";
 }
\ No newline at end of file
diff --git a/views/default/staticvideo/index.php b/views/default/staticvideo/index.php
index 256eb5b92..d8619917e 100644
--- a/views/default/staticvideo/index.php
+++ b/views/default/staticvideo/index.php
@@ -37,22 +37,16 @@ if(!empty($owner_videos)) {
 
 		$videodiv .= "<div id='videoActionbox'>";
 		$videodiv .=  elgg_view("output/confirmlink", array(
-																	'href' => $vars['url'] . "action/videolist/remove?video_id=" . $video_guid,
-																	'text' => elgg_echo('delete'),
-																	'confirm' => elgg_echo('deleteconfirm'),
-																));
-		/*
-		$videodiv .= "<a href='".$vars['url']."pg/videolist/remove/".$video_id."'>";
-		$videodiv .= "delete";
-		$videodiv .= "</a>";
-		*/
+								'href' => $vars['url'] . "action/videolist/remove?video_id=" . $video_guid,
+								'text' => elgg_echo('delete'),
+								'confirm' => elgg_echo('deleteconfirm'),
+							));
 		$videodiv .= "</div>";
-		$videodiv .= "<div class=\"clearfloat\"></div>";
 	}
 
 	print $videodiv;
 } else {
-	echo "No videos were found.";
+	echo "<p class='margin_top'>".elgg_echo('videolist:none:found')."</p>";
 }
 ?>
 </div>
diff --git a/views/default/videolist/css.php b/views/default/videolist/css.php
index e2b9250b3..0b181458e 100644
--- a/views/default/videolist/css.php
+++ b/views/default/videolist/css.php
@@ -13,8 +13,31 @@
 .videolist_error{
 	color:red;
 	font-weight:bold;
-	font-size:11px;
 }
+
+/* video listing */
+.video_entity .entity_listing:first-child {
+	border-top:0;
+}
+.entity_listing_icon .video_icon {
+	width:150px;
+	height:95px;
+	display:table-cell;
+	text-align:center;
+	vertical-align: middle;
+	background-color: black;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+}
+.video_entity .entity_listing_info {
+	width:560px;
+	margin-left:15px;
+}
+
+
+
+
+/* /////////////////////////////////////////// @todo clean up / update rules below */
 #video-list-main{
 	padding:10px;
 }
@@ -22,9 +45,6 @@
 	width:100%;
 	margin-bottom:10px;
 }
-.search_gallery_item{
-	border:0px solid #CCCCCC;
-}
 #videobox{
 	width:98%;
 	text-align:center;
@@ -39,69 +59,6 @@
 	margin:0px 5px 0px 8px;
 	float:left;
 }
-#videothumbnail-box{
-	float:left;
-	width:35%;
-	background: #333333;
-	text-align:center;
-	padding:3px 1px 3px 0px;
-}
-#videotitle-box{
-	width:60%;
-	float:left;
-	font-size:12px;
-	font-weight:bold;
-	text-align:left;
-	padding-left:5px;
-	color:#474B9F;
-}
-.title{
-	font-weight:bold;
-}
-#profile_video_widget_container{
-	margin:0px 10px 10px 10px;
-	padding:8px;
-	-moz-border-radius-topleft:8px;
-	-moz-border-radius-topright:8px;
-	-moz-border-radius-bottomleft:8px;
-	-moz-border-radius-bottomright:8px;
-	border:0px solid #C3C3C3;
-	background: #FFFFFF;
-	max-height:250px;
-	overflow-y:auto;
-}
-#profile_video_image_container{
-	float:left;
-	width:95%;
-	margin:6px 2px 0px 6px;
-	border-bottom:1px solid #CCC;
-	padding-bottom:3px;
-}
-
-#widget_container_header{
-	color:#474B9F;
-	margin:0px 0px 5px 0px;
-	font-weight:bold;
-	font-size:13px;
-}
-#loadingSearch{
-	width:100%;
-}
-#SearchContainer{
-	width:100%;
-}
-#responseSearch{
-	padding:15px;
-}
-#paginateSearch{
-	-moz-border-radius-topleft:5px;
-	-moz-border-radius-topright:5px;
-	padding:2px 5px 2px 0px;
-	text-align:right;
-	background:#FFF;
-	border:0px solid #CCC;
-	color:#666;
-}
 th{
 	text-align:center;
 	font-weight:bold;
@@ -141,17 +98,6 @@ th{
 	background:#FFFFFF;
 	z-index:300000;
 }
-.videolist-content{
-	-moz-border-radius-topleft:5px;
-	-moz-border-radius-topright:5px;
-	-moz-border-radius-bottomleft:5px;
-	-moz-border-radius-bottomright:5px;
-	border:1px solid #C3C3C3;
-	width:675px;
-	margin:10px 0px 10px 10px;
-	padding:10px;
-	background:#FFFFFF;
-}
 .tubesearch{
 	-moz-border-radius-topleft:5px;
 	-moz-border-radius-topright:5px;
@@ -159,20 +105,6 @@ th{
 	-moz-border-radius-bottomright:5px;
 	border:1px solid #666666;
 }
-#comment_area_video_title{
-	padding:10px;
-	-moz-border-radius-topleft:5px;
-	-moz-border-radius-topright:5px;
-	-moz-border-radius-bottomleft:5px;
-	-moz-border-radius-bottomright:5px;
-	border:1px solid #CCCCCC;
-	border:1px solid #CCCCCC;
-	background:#FFFFFF;
-}
-.vid-comment-widget{
-	font-size:11px;
-	font-weight:normal;
-}
 .searchvideorow{
 	padding:10px;
 	-moz-border-radius-topleft:5px;
diff --git a/views/default/videolist/groupprofile_videolist.php b/views/default/videolist/groupprofile_videolist.php
index d89b8e566..2151a8f87 100644
--- a/views/default/videolist/groupprofile_videolist.php
+++ b/views/default/videolist/groupprofile_videolist.php
@@ -56,5 +56,4 @@ if ($videos) {
 }
 
 ?>
-<div class="clearfloat" /></div>
 </div>
diff --git a/views/default/videolist/videoprofile.php b/views/default/videolist/videoprofile.php
deleted file mode 100644
index e69de29bb..000000000
--- a/views/default/videolist/videoprofile.php
+++ /dev/null
diff --git a/watch.php b/watch.php
index 20c39f527..6694fca88 100644
--- a/watch.php
+++ b/watch.php
@@ -31,13 +31,11 @@ if ($videos = get_entity($video_id)) {
 									'entity_owner' => $page_owner,
 									'full' => true
 									));
-	//$area2 .= elgg_view("videolist/comments", array('entity' => $videos));
-	$body = elgg_view_layout("one_column_with_sidebar", $area1  . $area2);
+	$body = elgg_view_layout("one_column_with_sidebar", $area1.$area2, $area3);
 } else {
-		// Display the 'post not found' page instead
-		$body = elgg_view("videolist/notfound");
+		// video not found
+		$body = "<p class='margin_top'>".elgg_echo('videolist:none:found')."</p>";
 		$title = elgg_echo("video:none");
-
 }
 
 // Finally draw the page