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
This commit is contained in:
Sean Harvey 2007-11-07 06:28:21 +00:00
parent bfbf80c843
commit 893aa7a0d0

View File

@ -338,33 +338,37 @@ class HtmlEditorField_Toolbar extends ViewableData {
} }
function ImageForm() { function ImageForm() {
$form = new Form($this->controller, "{$this->name}.ImageForm", $form = new Form(
new FieldSet( $this->controller,
new LiteralField('Heading', '<h2><img src="cms/images/closeicon.gif" alt="close" title="close" />Image</h2>'), "{$this->name}.ImageForm",
new TreeDropdownField("FolderID", _t('HtmlEditorField.FOLDER', "Folder"), "Folder"), new FieldSet(
new ThumbnailStripField("Image", "FolderID", "getimages"), new LiteralField('Heading', '<h2><img src="cms/images/closeicon.gif" alt="close" title="close" />Image</h2>'),
new TextField("AltText", _t('HtmlEditorField.ALTTEXT', "Description"), "", 80), new TreeDropdownField("FolderID", _t('HtmlEditorField.FOLDER', "Folder"), "Folder"),
new DropdownField("CSSClass", _t('HtmlEditorField.CSSCLASS', "Alignment / style"), array( new ThumbnailStripField("Image", "FolderID", "getimages"),
"left" => _t('HtmlEditorField.CSSCLASSLEFT', "On the left, with text wrapping around."), new TextField("AltText", _t('HtmlEditorField.ALTTEXT', "Description"), "", 80),
"right" => _t('HtmlEditorField.CSSCLASSRIGHT', "On the right, with text wrapping around."), new DropdownField("CSSClass", _t('HtmlEditorField.CSSCLASS', "Alignment / style"), array(
"center" => _t('HtmlEditorField.CSSCLASSCENTER', "Centered, on its own."), "left" => _t('HtmlEditorField.CSSCLASSLEFT', "On the left, with text wrapping around."),
)), "right" => _t('HtmlEditorField.CSSCLASSRIGHT', "On the right, with text wrapping around."),
new FieldGroup(_t('HtmlEditorField.IMAGEDIMENSIONS', "Dimensions"), "center" => _t('HtmlEditorField.CSSCLASSCENTER', "Centered, on its own."),
new TextField("Width", _t('HtmlEditorField.IMAGEWIDTHPX', "Width"), 5), )),
new TextField("Height", "x " . _t('HtmlEditorField.IMAGEHEIGHTPX', "Height"), 5) 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); $form->loadDataFrom($this);
return $form; return $form;
} }
function FlashForm() { function FlashForm() {
$form = new Form($this->controller, "{$this->name}.FlashForm", $form = new Form(
$this->controller,
"{$this->name}.FlashForm",
new FieldSet( new FieldSet(
new LiteralField('Heading', '<h2><img src="cms/images/closeicon.gif" alt="close" title="close" />Flash</h2>'), new LiteralField('Heading', '<h2><img src="cms/images/closeicon.gif" alt="close" title="close" />Flash</h2>'),
new TreeDropdownField("FolderID", _t('HtmlEditorField.FOLDER'), "Folder"), new TreeDropdownField("FolderID", _t('HtmlEditorField.FOLDER'), "Folder"),