start deprecating image_slink, and move image_ilink and image_tlink from view to image
git-svn-id: file:///home/shish/svn/shimmie2/trunk@307 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
parent
6187d9a89f
commit
4fea47dbbe
3 changed files with 6 additions and 13 deletions
|
@ -39,6 +39,12 @@ class ImageIO extends Extension {
|
||||||
}
|
}
|
||||||
|
|
||||||
if(is_a($event, 'SetupBuildingEvent')) {
|
if(is_a($event, 'SetupBuildingEvent')) {
|
||||||
|
$sb = new SetupBlock("Image Options");
|
||||||
|
$sb->position = 30;
|
||||||
|
$sb->add_text_option("image_ilink", "Image link ");
|
||||||
|
$sb->add_text_option("image_tlink", "<br>Thumbnail link ");
|
||||||
|
$event->panel->add_block($sb);
|
||||||
|
|
||||||
$thumbers = array();
|
$thumbers = array();
|
||||||
$thumbers['Built-in GD'] = "gd";
|
$thumbers['Built-in GD'] = "gd";
|
||||||
$thumbers['ImageMagick'] = "convert";
|
$thumbers['ImageMagick'] = "convert";
|
||||||
|
|
|
@ -23,15 +23,6 @@ class ViewImage extends Extension {
|
||||||
if(is_a($event, 'DisplayingImageEvent')) {
|
if(is_a($event, 'DisplayingImageEvent')) {
|
||||||
$this->theme->display_page($event->page, $event->get_image());
|
$this->theme->display_page($event->page, $event->get_image());
|
||||||
}
|
}
|
||||||
|
|
||||||
if(is_a($event, 'SetupBuildingEvent')) {
|
|
||||||
$sb = new SetupBlock("View Options");
|
|
||||||
$sb->position = 30;
|
|
||||||
$sb->add_text_option("image_ilink", "Long link ");
|
|
||||||
$sb->add_text_option("image_slink", "<br>Short link ");
|
|
||||||
$sb->add_text_option("image_tlink", "<br>Thumbnail link ");
|
|
||||||
$event->panel->add_block($sb);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
add_event_listener(new ViewImage());
|
add_event_listener(new ViewImage());
|
||||||
|
|
|
@ -75,10 +75,6 @@ class ViewTheme extends Themelet {
|
||||||
$i_owner_id = int_escape($owner->id);
|
$i_owner_id = int_escape($owner->id);
|
||||||
|
|
||||||
$html = "";
|
$html = "";
|
||||||
if(strlen($image->get_short_link()) > 0) {
|
|
||||||
$slink = $image->get_short_link();
|
|
||||||
$html .= "<p>Link: <input size='50' type='text' value='$slink'>";
|
|
||||||
}
|
|
||||||
$html .= "<p>Uploaded by <a href='".make_link("user/$h_owner")."'>$h_owner</a>";
|
$html .= "<p>Uploaded by <a href='".make_link("user/$h_owner")."'>$h_owner</a>";
|
||||||
if($user->is_admin()) {
|
if($user->is_admin()) {
|
||||||
$html .= " ($h_ip)";
|
$html .= " ($h_ip)";
|
||||||
|
|
Reference in a new issue