oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

manual merge of changes from 6.7.8 for File,Image assets

Browse source
This commit is contained in:
Colin Kuskie 2005-10-31 04:41:38 +00:00
parent fb396863c6
commit 903ccd0777
6 changed files with 183 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/WebGUI/Asset/File.pm
View file

@ -280,6 +280,7 @@ sub www_edit {
my $tabform = $self->getEditForm;
$tabform->getTab("display")->template(
-value=>$self->getValue("templateId"),
-hoverHelp=>WebGUI::International::get('file template description','Asset_Image'),
-namespace=>"FileAsset"
);
$self->getAdminConsole->setHelp("file add/edit", "Asset_File");

13
lib/WebGUI/Asset/File/Image.pm
View file

@ -231,6 +231,7 @@ sub www_edit {
$tabform->getTab("display")->template(
-value=>$self->get("templateId"),
-namespace=>"ImageAsset",
-hoverHelp=>WebGUI::International::get('image template description','Asset_Image'),
-defaultValue=>"PBtmpl0000000000000088"
);
$self->getAdminConsole->setHelp("image add/edit","Asset_Image");
@ -254,18 +255,24 @@ sub www_resize {
my ($x, $y) = $self->getStorageLocation->getSizeInPixels($self->get("filename"));
$f->readOnly(
-label=>WebGUI::International::get('image size', 'Asset_Image'),
-value=>$x.' x '.$y
-hoverHelp=>WebGUI::International::get('image size description', 'Asset_Image'),
-value=>$x.' x '.$y,
);
$f->integer(
-label=>WebGUI::International::get('new width','Asset_Image'),
-name=>"newWidth"
-hoverHelp=>WebGUI::International::get('new width description','Asset_Image'),
-name=>"newWidth",
-value=>$x,
);
$f->integer(
-label=>WebGUI::International::get('new height','Asset_Image'),
-name=>"newHeight"
-hoverHelp=>WebGUI::International::get('new height description','Asset_Image'),
-name=>"newHeight",
-value=>$y,
);
$f->submit;
my $image = '<div align="center"><img src="'.$self->getStorageLocation->getUrl($self->get("filename")).'" border="1" alt="'.$self->get("filename").'" /></div>';
$self->getAdminConsole->setHelp("image resize","Asset_Image");
return $self->getAdminConsole->render($f->print.$image,WebGUI::International::get("resize image","Asset_Image"));
}