@@ -5,9 +5,7 @@
"type" => "text_block",
"rows" => 4,
"label" => __("Video", "video"),
- "bookmarklet" => (isset($_GET['url']) and
- preg_match("/http:\/\/(www\.|[a-z]{2}\.)?youtube\.com\/watch\?v=([^&]+)/",
- $_GET['url'])) ?
+ "bookmarklet" => $this->isVideo() ?
"url" :
""));
$this->setField(array("attr" => "caption",
@@ -18,9 +16,7 @@
"preview" => true,
"bookmarklet" => "selection"));
- $this->bookmarkletSelected(isset($_GET['url']) and
- preg_match("/http:\/\/(www\.|[a-z]{2}\.)?youtube\.com\/watch\?v=([^&]+)/",
- $_GET['url']));
+ $this->bookmarkletSelected($this->isVideo());
$this->setFilter("caption", "markup_post_text");
}
@@ -55,8 +51,39 @@
public function embed_tag($video) {
if (preg_match("/http:\/\/(www\.|[a-z]{2}\.)?youtube\.com\/watch\?v=([^&]+)/", $video, $matches)) {
return '<object type="application/x-shockwave-flash" class="object-youtube" data="http://'.$matches[1].'youtube.com/v/'.$matches[2].'" width="468" height="391"><param name="movie" value="http://'.$matches[1].'youtube.com/v/'.$matches[2].'" /><param name="FlashVars" value="playerMode=embedded" /></object>';
+ } else if (preg_match("/http:\/\/(www\.)?vimeo.com\/([0-9]+)/", $video, $matches)) {
+ $site = get_remote($video);
+ preg_match('/<div id="vimeo_player_1397502" class="player" style="width:([0-9]+)px;height:([0-9]+)px;">/',
+ $site,
+ $scale);
+ return '<object type="application/x-shockwave-flash" class="object-vimeo" width="'.$scale[1].'" height="'.$scale[2].'" data="http://www.vimeo.com/moogaloop.swf?clip_id='.$matches[2].'&server=www.vimeo.com&show_title=1&show_byline=1&show_portrait=0&color=00adef&fullscreen=1"><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="movie" value="http://www.vimeo.com/moogaloop.swf?clip_id='.$matches[2].'&server=www.vimeo.com&show_title=1&show_byline=1&show_portrait=0&color=00adef&fullscreen=1" /></object>';
} else {
return $video;
}
}
+ public function embed_tag_for($post, $max_width = 500) {
+ preg_match('/width=("|\')([0-9]+)("|\') height=("|\')([0-9]+)("|\')/', $post->embed, $scale);
+ $match = $scale[0];
+ $width = $scale[2];
+ $height = $scale[5];
+
+ if ($width < $max_width)
+ return $post->embed;
+
+ $height = ($max_width / $width) * $height;
+
+ return str_replace($match, 'width="'.$max_width.'" height="'.$height.'"', $post->embed);
+ }
+ public function isVideo() {
+ if (!isset($_GET['url']))
+ return false;
+
+ if (preg_match("/http:\/\/(www\.|[a-z]{2}\.)?youtube\.com\/watch\?v=([^&]+)/", $_GET['url']))
+ return true;
+
+ if (preg_match("/http:\/\/(www\.)?vimeo.com\/([0-9]+)/", $_GET['url']))
+ return true;
+
+ return false;
+ }
}
feathers/video/video.php
@@ -1,7 +1,7 @@
{% extends "content/post.twig" %}
{% block content %}
- ${ feathers.photo.image_tag_for(post, 434) }
+ ${ feathers['photo'].image_tag_for(post, 434) }
<div class="clear"></div>
${ post.caption | read_more }
{% endblock %}
\ No newline at end of file
themes/stardust/feathers/photo.twig
@@ -1,7 +1,7 @@
{% extends "content/post.twig" %}
{% block content %}
- $post.embed
+ ${ feathers['video'].embed_tag_for(post, 434) }
<br />
${ post.caption | read_more }
{% endblock %}
\ No newline at end of file
themes/stardust/feathers/video.twig
b27ffecdb8416c07b44e120ccd4ae5bf12f12ea2
Alex Suraci
i.am@toogeneric.com
http://github.com/vito/chyrp/commit/5d0346555f81f526a535c3c70f8ca4553502aa3c
5d0346555f81f526a535c3c70f8ca4553502aa3c
2008-07-24T07:39:22-07:00
2008-07-24T07:39:22-07:00
Added Vimeo support to the Video feather, and now it resizes videos similar to the Photo feather.
06dbe32f94dbfbcdb05e2566cb45be788cd1279e
Alex Suraci
i.am@toogeneric.com