Merge branch 'master' into integration

This commit is contained in:
Ingo Schommer 2012-04-09 21:35:30 +02:00
commit 373d9e7b8f

View File

@ -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'),