diff options
author | Sem <sembrestels@riseup.net> | 2011-11-09 20:24:56 +0100 |
---|---|---|
committer | Sem <sembrestels@riseup.net> | 2011-11-09 20:24:56 +0100 |
commit | f2280654f8aaa33964e62c27a9cab6c96372ba57 (patch) | |
tree | f4a8ee2d358d6f8d55ec9875fcce49550d16ba2f /views/default/videolist | |
parent | b0f15fbebe3781626ba6b086d63ed364f6822209 (diff) | |
download | elgg-f2280654f8aaa33964e62c27a9cab6c96372ba57.tar.gz elgg-f2280654f8aaa33964e62c27a9cab6c96372ba57.tar.bz2 |
No regexp when parsing urls. Blip.tv support added. Style added. Fixed edit action.
Diffstat (limited to 'views/default/videolist')
-rw-r--r-- | views/default/videolist/css.php | 5 | ||||
-rw-r--r-- | views/default/videolist/watch/bliptv.php | 7 | ||||
-rw-r--r-- | views/default/videolist/watch/vimeo.php | 4 | ||||
-rw-r--r-- | views/default/videolist/watch/youtube.php | 2 |
4 files changed, 15 insertions, 3 deletions
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&color=e11531&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']; |