@@ -104,7 +104,7 @@
}
public function feed_content($post) {
- return self::image_tag_for($post, 500, 500)."<br /><br />".$post->caption;
+ return self::image_tag($post, 500, 500)."<br /><br />".$post->caption;
}
public function delete_file($post) {
@@ -114,15 +114,19 @@
public function filter_post($post) {
if ($post->feather != "photo") return;
- $post->image = $this->image_tag_for($post);
+ $post->image = $this->image_tag($post);
}
- public function image_tag_for($post, $max_width = 500, $max_height = null, $more_args = "quality=100") {
+ public function image_tag($post, $max_width = 500, $max_height = null, $more_args = "quality=100") {
$filename = $post->filename;
$config = Config::current();
- $source = !empty($post->source) ? $post->source : uploaded($filename) ;
$alt = !empty($post->alt_text) ? fix($post->alt_text, true) : $filename ;
- return '<a href="'.$source.'"><img src="'.$config->chyrp_url.'/includes/thumb.php?file=..'.$config->uploads_path.urlencode($filename).'&max_width='.$max_width.'&max_height='.$max_height.'&'.$more_args.'" alt="'.$alt.'" /></a>';
+ return '<img src="'.$config->chyrp_url.'/includes/thumb.php?file=..'.$config->uploads_path.urlencode($filename).'&max_width='.$max_width.'&max_height='.$max_height.'&'.$more_args.'" alt="'.$alt.'" />';
+ }
+
+ public function image_link($post, $max_width = 500, $max_height = null, $more_args="quality=100") {
+ $source = !empty($post->source) ? $post->source : uploaded($post->filename) ;
+ return '<a href="'.$source.'">'.$this->image_tag($post, $max_width, $max_height, $more_args).'</a>';
}
public function add_option($options, $post = null) {
@@ -147,3 +151,4 @@
return $options;
}
}
+
feathers/photo/photo.php
@@ -1,7 +1,7 @@
{% extends "content/post.twig" %}
{% block content %}
- ${ feathers['photo'].image_tag_for(post, 434) }
+ ${ feathers['photo'].image_link(post, 434) }
<div class="clear"></div>
${ post.caption | read_more }
{% endblock %}
themes/stardust/feathers/photo.twig
08bfcbbd0492940b546a39dbb67bd8ecd3185c70
Alex Suraci
i.am@toogeneric.com
http://github.com/vito/chyrp/commit/c3d2b2820162af5a9c669aa12b460c7913d82791
c3d2b2820162af5a9c669aa12b460c7913d82791
2008-11-01T22:39:02-07:00
2008-11-01T22:39:02-07:00
Split the Photo feather's image_tag_for function into image_link and
image_tag.
6d6a8f112c3724ecc9ffe8d0f4b00efeeb2b845b
Alex Suraci
i.am@toogeneric.com