diff options
| author | Sem <sembrestels@riseup.net> | 2012-04-17 23:54:30 -0700 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-04-17 23:54:30 -0700 |
| commit | a613b944015fd82f97a15392c0de0e7df104706d (patch) | |
| tree | 5022ba0160427bec07cf9fdf337ef8161e4071b9 /views | |
| parent | f1a0a4d5aa28753620552df9d5e88bd983d0aca4 (diff) | |
| parent | 4af120de2bd0fe2046795346a40102f00fbe5479 (diff) | |
| download | elgg-a613b944015fd82f97a15392c0de0e7df104706d.tar.gz elgg-a613b944015fd82f97a15392c0de0e7df104706d.tar.bz2 | |
Merge pull request #1 from mrclay/master
Partial rewrite
Diffstat (limited to 'views')
| -rw-r--r-- | views/default/icon/object/videolist_item.php | 1 | ||||
| -rw-r--r-- | views/default/object/videolist_item.php | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/views/default/icon/object/videolist_item.php b/views/default/icon/object/videolist_item.php index 38b805021..24a5b5fe8 100644 --- a/views/default/icon/object/videolist_item.php +++ b/views/default/icon/object/videolist_item.php @@ -11,6 +11,7 @@ */ $entity = $vars['entity']; +/* @var ElggObject $entity */ $sizes = array('small', 'medium', 'large', 'tiny', 'master', 'topbar'); $img_width = array('tiny' => 25, 'small' => 40, 'medium' => 100, 'large' => 200); diff --git a/views/default/object/videolist_item.php b/views/default/object/videolist_item.php index 6ed284a43..5e0db00ce 100644 --- a/views/default/object/videolist_item.php +++ b/views/default/object/videolist_item.php @@ -7,6 +7,7 @@ $full = elgg_extract('full_view', $vars, FALSE); $entity = elgg_extract('entity', $vars, FALSE); +/* @var ElggObject $entity */ if (!$entity) { return TRUE; @@ -59,11 +60,12 @@ if (elgg_in_context('widgets')) { } if ($full && !elgg_in_context('gallery')) { - + + $dimensions = videolist_get_video_dimensions($entity); $content = elgg_view("videolist/watch/{$entity->videotype}", array( 'entity' => $entity, - 'width' => 600, - 'height' => 400, + 'width' => $dimensions['width'], + 'height' => $dimensions['height'], )); $content = "<div class=\"videolist-watch\">$content</div>"; |