From 893aa7a0d0c3125fcde6d21a80c74034e6ffba38 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Wed, 7 Nov 2007 06:28:21 +0000 Subject: [PATCH] Fixes to flash popup - removed float which broke other sections git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44458 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- forms/HtmlEditorField.php | 44 +++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/forms/HtmlEditorField.php b/forms/HtmlEditorField.php index b4f13c686..f40ba7a62 100755 --- a/forms/HtmlEditorField.php +++ b/forms/HtmlEditorField.php @@ -338,33 +338,37 @@ class HtmlEditorField_Toolbar extends ViewableData { } function ImageForm() { - $form = new Form($this->controller, "{$this->name}.ImageForm", - new FieldSet( - new LiteralField('Heading', '

closeImage

'), - new TreeDropdownField("FolderID", _t('HtmlEditorField.FOLDER', "Folder"), "Folder"), - new ThumbnailStripField("Image", "FolderID", "getimages"), - new TextField("AltText", _t('HtmlEditorField.ALTTEXT', "Description"), "", 80), - new DropdownField("CSSClass", _t('HtmlEditorField.CSSCLASS', "Alignment / style"), array( - "left" => _t('HtmlEditorField.CSSCLASSLEFT', "On the left, with text wrapping around."), - "right" => _t('HtmlEditorField.CSSCLASSRIGHT', "On the right, with text wrapping around."), - "center" => _t('HtmlEditorField.CSSCLASSCENTER', "Centered, on its own."), - )), - new FieldGroup(_t('HtmlEditorField.IMAGEDIMENSIONS', "Dimensions"), - new TextField("Width", _t('HtmlEditorField.IMAGEWIDTHPX', "Width"), 5), - new TextField("Height", "x " . _t('HtmlEditorField.IMAGEHEIGHTPX', "Height"), 5) + $form = new Form( + $this->controller, + "{$this->name}.ImageForm", + new FieldSet( + new LiteralField('Heading', '

closeImage

'), + new TreeDropdownField("FolderID", _t('HtmlEditorField.FOLDER', "Folder"), "Folder"), + new ThumbnailStripField("Image", "FolderID", "getimages"), + new TextField("AltText", _t('HtmlEditorField.ALTTEXT', "Description"), "", 80), + new DropdownField("CSSClass", _t('HtmlEditorField.CSSCLASS', "Alignment / style"), array( + "left" => _t('HtmlEditorField.CSSCLASSLEFT', "On the left, with text wrapping around."), + "right" => _t('HtmlEditorField.CSSCLASSRIGHT', "On the right, with text wrapping around."), + "center" => _t('HtmlEditorField.CSSCLASSCENTER', "Centered, on its own."), + )), + new FieldGroup(_t('HtmlEditorField.IMAGEDIMENSIONS', "Dimensions"), + new TextField("Width", _t('HtmlEditorField.IMAGEWIDTHPX', "Width"), 5), + new TextField("Height", "x " . _t('HtmlEditorField.IMAGEHEIGHTPX', "Height"), 5) + ) + ), + new FieldSet( + new FormAction("insertimage", "Insert image"), + new FormAction("editimage", "Edit image") ) - ), - new FieldSet( - new FormAction("insertimage", "Insert image"), - new FormAction("editimage", "Edit image") - ) ); $form->loadDataFrom($this); return $form; } function FlashForm() { - $form = new Form($this->controller, "{$this->name}.FlashForm", + $form = new Form( + $this->controller, + "{$this->name}.FlashForm", new FieldSet( new LiteralField('Heading', '

closeFlash

'), new TreeDropdownField("FolderID", _t('HtmlEditorField.FOLDER'), "Folder"),