No regexp when parsing urls. Blip.tv support added. Style added. Fixed edit action.

5 files changed, 18 insertions, 5 deletions

diff --git a/views/default/object/videolist_item.php b/views/default/object/videolist_item.php
index bda333a2d..6ed284a43 100644
--- a/views/default/object/videolist_item.php
+++ b/views/default/object/videolist_item.php
@@ -60,11 +60,12 @@ if (elgg_in_context('widgets')) {
 
 if ($full && !elgg_in_context('gallery')) {
 	
-	$content= elgg_view("videolist/watch/{$entity->videotype}", array(
-		'video_id' => $entity->video_id,
+	$content = elgg_view("videolist/watch/{$entity->videotype}", array(
+		'entity' => $entity,
 		'width' => 600,
 		'height' => 400,
 	));
+	$content = "<div class=\"videolist-watch\">$content</div>";
 
 	$params = array(
 		'entity' => $entity,
diff --git a/views/default/videolist/css.php b/views/default/videolist/css.php
index 93069181a..6f2bf397d 100644
--- a/views/default/videolist/css.php
+++ b/views/default/videolist/css.php
@@ -10,6 +10,11 @@
  */
 ?>
 
+.videolist-watch {
+	margin-top: 40px;
+	margin-left: 20px;
+}
+
 .videolist_error{
 	color:red;
 	font-weight:bold;
diff --git a/views/default/videolist/watch/bliptv.php b/views/default/videolist/watch/bliptv.php
new file mode 100644
index 000000000..b7f72dea6
--- /dev/null
+++ b/views/default/videolist/watch/bliptv.php
@@ -0,0 +1,7 @@
+<?php
+
+$embedurl = $vars['entity']->embedurl;
+$width = $vars['width'];
+$height = $vars['height'];
+
+echo "<iframe src=\"$embedurl\" width=\"$width\" height=\"$height\" frameborder=\"0\" allowfullscreen></iframe>";
diff --git a/views/default/videolist/watch/vimeo.php b/views/default/videolist/watch/vimeo.php
index caf34c1f4..97b5e8d88 100644
--- a/views/default/videolist/watch/vimeo.php
+++ b/views/default/videolist/watch/vimeo.php
@@ -1,7 +1,7 @@
 <?php
 
-$video_id = $vars['video_id'];
+$video_id = $vars['entity']->video_id;
 $width = $vars['width'];
 $height = $vars['height'];
 
-echo "<iframe src=\"http://player.vimeo.com/video/$video_id?byline=0&amp;color=e11531&amp;autoplay=1\" width=\"$width\" height=\"$height\" frameborder=\"0\" webkitAllowFullScreen allowFullScreen></iframe>";
+echo "<iframe src=\"http://player.vimeo.com/video/$video_id?byline=0\" width=\"$width\" height=\"$height\" frameborder=\"0\" webkitAllowFullScreen allowFullScreen></iframe>";
diff --git a/views/default/videolist/watch/youtube.php b/views/default/videolist/watch/youtube.php
index 4b62aabbc..e0b2ece06 100644
--- a/views/default/videolist/watch/youtube.php
+++ b/views/default/videolist/watch/youtube.php
@@ -1,6 +1,6 @@
 <?php
 
-$video_id = $vars['video_id'];
+$video_id = $vars['entity']->video_id;
 $width = $vars['width'];
 $height = $vars['height'];