mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
Merge branch 'master' into integration
This commit is contained in:
commit
373d9e7b8f
@ -549,12 +549,12 @@ class HtmlEditorField_Toolbar extends RequestHandler {
|
||||
);
|
||||
|
||||
$fields = new FieldList(
|
||||
$filePreview = FormField::create('CompositeField',
|
||||
FormField::create('CompositeField',
|
||||
$filePreview = CompositeField::create(
|
||||
CompositeField::create(
|
||||
$previewField
|
||||
)->setName("FilePreviewImage")->addExtraClass('cms-file-info-preview'),
|
||||
FormField::create('CompositeField',
|
||||
FormField::create('CompositeField',
|
||||
CompositeField::create(
|
||||
CompositeField::create(
|
||||
new ReadonlyField("FileType", _t('AssetTableField.TYPE','File type') . ':', $file->FileType),
|
||||
new ReadonlyField("Size", _t('AssetTableField.SIZE','File size') . ':', $file->getSize()),
|
||||
$urlField = new ReadonlyField('ClickableURL', _t('AssetTableField.URL','URL'),
|
||||
|
Loading…
x
Reference in New Issue
Block a user