Skip to content

Commit

Permalink
Fix for #319.
Browse files Browse the repository at this point in the history
Created a new view "movieplayer.html.php", which is rendered by
Item_Model::movie_img().  Changed movie.html.php to use movie_img to render
the movie player link.
  • Loading branch information
Tim Almdal committed Jun 30, 2009
1 parent 4943103 commit 8ed6d11
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 25 deletions.
15 changes: 7 additions & 8 deletions modules/gallery/models/item.php
Expand Up @@ -492,14 +492,13 @@ public function resize_img($extra_attrs) {
* @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;
}

/**
Expand Down
15 changes: 15 additions & 0 deletions 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>
18 changes: 1 addition & 17 deletions themes/default/views/movie.html.php
Expand Up @@ -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>
Expand Down

0 comments on commit 8ed6d11

Please sign in to comment.