diff options
| -rw-r--r-- | modules/gallery/models/item.php | 15 | ||||
| -rw-r--r-- | modules/gallery/views/movieplayer.html.php | 15 | ||||
| -rw-r--r-- | themes/default/views/movie.html.php | 18 |
3 files changed, 23 insertions, 25 deletions
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php index 430119b5..51037073 100644 --- a/modules/gallery/models/item.php +++ b/modules/gallery/models/item.php @@ -492,14 +492,13 @@ class Item_Model extends ORM_MPTT { * @return string */ public function movie_img($extra_attrs) { - $attrs = array_merge($extra_attrs, - array("id" => "player", - "style" => "display:block;width:400px;height:300px") - ); - return html::anchor($this->file_url(true), "", $attrs) . - "<script>flowplayer('player', '" . - url::abs_file("lib/flowplayer-3.0.5.swf") . - "'); </script>"; + $v = new View("movieplayer.html"); + $v->attrs = array_merge($extra_attrs, + array("style" => "display:block;width:{$this->width}px;height:{$this->height}px")); + if (empty($v->attrs["id"])) { + $v->attrs["id"] = "gMovieId-{$this->id}"; + } + return $v; } /** diff --git a/modules/gallery/views/movieplayer.html.php b/modules/gallery/views/movieplayer.html.php new file mode 100644 index 00000000..e8cabd31 --- /dev/null +++ b/modules/gallery/views/movieplayer.html.php @@ -0,0 +1,15 @@ +<?php defined("SYSPATH") or die("No direct script access.") ?> +<?= html::anchor($item->file_url(true), "", $attrs) ?> +<script> + flowplayer("<?= $attrs["id"] ?>", "<?= url::abs_file("lib/flowplayer.swf") ?>", { + plugins: { + h264streaming: { + url: "<?= url::abs_file("lib/flowplayer.h264streaming.swf") ?>" + }, + controls: { + autoHide: 'always', + hideDelay: 2000 + } + } + }) +</script> diff --git a/themes/default/views/movie.html.php b/themes/default/views/movie.html.php index 134e3571..c2fb0e30 100644 --- a/themes/default/views/movie.html.php +++ b/themes/default/views/movie.html.php @@ -12,23 +12,7 @@ <? endif ?> </ul> - <a id="gMovieId-<?= $item->id ?>" - href="<?= $item->file_url(true) ?>" - style="display: block; width: <?= $item->width ?>px; height: <?= $item->height ?>px"> - </a> - <script> - flowplayer("gMovieId-<?= $item->id ?>", "<?= url::abs_file("lib/flowplayer.swf") ?>", { - plugins: { - h264streaming: { - url: "<?= url::abs_file("lib/flowplayer.h264streaming.swf") ?>" - }, - controls: { - autoHide: 'always', - hideDelay: 2000 - } - } - }) - </script> + <?= $item->movie_img(array("class" => "gMovie", "id" => "gMovieId-{$item->id}")) ?> <div id="gInfo"> <h1><?= p::clean($item->title) ?></h1> |