mirror of
https://github.com/silverstripe/silverstripe-reports
synced 2024-10-22 11:05:53 +02:00
#1607 - Make image editor findable
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@44445 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
02c7f0e993
commit
3d7342bc4c
@ -59,6 +59,7 @@ abstract class LeftAndMain extends Controller {
|
||||
Requirements::javascript('jsparty/layout_helpers.js');
|
||||
|
||||
Requirements::javascript(MCE_ROOT . 'tiny_mce_src.js');
|
||||
Requirements::javascript('cms/javascript/ImageEditor/Activator.js');
|
||||
Requirements::javascript('jsparty/tiny_mce_improvements.js');
|
||||
|
||||
Requirements::javascript('jsparty/scriptaculous/effects.js');
|
||||
|
@ -70,8 +70,8 @@ class ThumbnailStripField extends FormField {
|
||||
|
||||
$result .=
|
||||
'<li>' .
|
||||
'<a href=" ' . $image->Filename . '">' .
|
||||
'<img class="destwidth=' . round($width) . ',destheight=' . round($height) . '" src="'. $thumbnail->URL .'" alt="' . $image->Title . '" title="' . $image->Title . '" />' .
|
||||
'<a href=" ' . $image->Filename . '?r=' . rand(1,100000) . '">' .
|
||||
'<img class="destwidth=' . round($width) . ',destheight=' . round($height) . '" src="'. $thumbnail->URL . '" alt="' . $image->Title . '" title="' . $image->Title . '" />' .
|
||||
'</a>' .
|
||||
'</li>';
|
||||
}
|
||||
@ -130,4 +130,4 @@ HTML;
|
||||
}
|
||||
}
|
||||
|
||||
?>
|
||||
?>
|
||||
|
@ -485,4 +485,10 @@ Behaviour.register({
|
||||
new Ajax.Request('admin/assets/deleteUnusedThumbnails',options);
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
function refreshAsset() {
|
||||
frames[0].location.reload(0);
|
||||
frames[1].location.reload(1);
|
||||
}
|
||||
|
||||
|
@ -30,8 +30,7 @@ ImageEditor.Main = {
|
||||
},
|
||||
|
||||
onCloseClick: function() {
|
||||
window.parent.frames[0].location.reload(1);
|
||||
window.parent.frames[1].location.reload(1);
|
||||
window.parent.imageEditorClosed();
|
||||
ImageEditor.imageTransformation.close(ImageEditor.Main.onCloseCallback.bind(this));
|
||||
},
|
||||
|
||||
|
@ -54,4 +54,4 @@ ThumbnailStripField.prototype = {
|
||||
return f;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user