tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into integration

Browse Source
This commit is contained in:
Ingo Schommer 2012-04-09 21:35:30 +02:00
commit 373d9e7b8f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
forms/HtmlEditorField.php
View File

@ -549,12 +549,12 @@ class HtmlEditorField_Toolbar extends RequestHandler {
); );
$fields = new FieldList( $fields = new FieldList(
$filePreview = FormField::create('CompositeField', $filePreview = CompositeField::create(
FormField::create('CompositeField', CompositeField::create(
$previewField $previewField
)->setName("FilePreviewImage")->addExtraClass('cms-file-info-preview'), )->setName("FilePreviewImage")->addExtraClass('cms-file-info-preview'),
FormField::create('CompositeField', CompositeField::create(
FormField::create('CompositeField', CompositeField::create(
new ReadonlyField("FileType", _t('AssetTableField.TYPE','File type') . ':', $file->FileType), new ReadonlyField("FileType", _t('AssetTableField.TYPE','File type') . ':', $file->FileType),
new ReadonlyField("Size", _t('AssetTableField.SIZE','File size') . ':', $file->getSize()), new ReadonlyField("Size", _t('AssetTableField.SIZE','File size') . ':', $file->getSize()),
$urlField = new ReadonlyField('ClickableURL', _t('AssetTableField.URL','URL'), $urlField = new ReadonlyField('ClickableURL', _t('AssetTableField.URL','URL'),