mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Update SWFUpload to 7.0-beta-3 (merged from branches/2.2.0, r44795)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44896 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
c7415ad3d4
commit
8acb9a0f48
@ -341,9 +341,23 @@ class HtmlEditorField_Toolbar extends ViewableData {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function ImageForm() {
|
function ImageForm() {
|
||||||
$fields = new FieldSet(
|
$form = new Form(
|
||||||
|
$this->controller,
|
||||||
|
"{$this->name}.ImageForm",
|
||||||
|
new FieldSet(
|
||||||
new LiteralField('Heading', '<h2><img src="cms/images/closeicon.gif" alt="close" title="close" />Image</h2>'),
|
new LiteralField('Heading', '<h2><img src="cms/images/closeicon.gif" alt="close" title="close" />Image</h2>'),
|
||||||
new TreeDropdownField("FolderID", _t('HtmlEditorField.FOLDER', "Folder"), "Folder"),
|
new TreeDropdownField("FolderID", _t('HtmlEditorField.FOLDER', "Folder"), "Folder"),
|
||||||
|
new LiteralField('AddFolderOrUpload',
|
||||||
|
'<div style="clear:both;"></div><div id="AddFolderGroup" style="display:inline">
|
||||||
|
<a style="" href="#" id="AddFolder" class="link">' . _t('HtmlEditorField.CREATEFOLDER','create folder') . '</a>
|
||||||
|
<input style="display: none;margin-left: 2px;width: 94px;" id="NewFolderName" class="addFolder" type="text">
|
||||||
|
<a style="display: none;" href="#" id="FolderOk" class="link addFolder">' . _t('HtmlEditorField.OK','ok') . '</a>
|
||||||
|
<a style="display: none;" href="#" id="FolderCancel" class="link addFolder">' . _t('HtmlEditorField.FOLDERCANCEL','cancel') . '</a>
|
||||||
|
</div>|
|
||||||
|
<div id="UploadGroup" class="group" style="display: inline;margin-top:2px;">
|
||||||
|
<a href="#" id="UploadFiles" class="link">' . _t('HtmlEditorField.UPLOAD','upload') . '</a>
|
||||||
|
</div>
|
||||||
|
'),
|
||||||
new ThumbnailStripField("Image", "FolderID", "getimages"),
|
new ThumbnailStripField("Image", "FolderID", "getimages"),
|
||||||
new TextField("AltText", _t('HtmlEditorField.ALTTEXT', "Description"), "", 80),
|
new TextField("AltText", _t('HtmlEditorField.ALTTEXT', "Description"), "", 80),
|
||||||
new DropdownField("CSSClass", _t('HtmlEditorField.CSSCLASS', "Alignment / style"), array(
|
new DropdownField("CSSClass", _t('HtmlEditorField.CSSCLASS', "Alignment / style"), array(
|
||||||
@ -355,31 +369,7 @@ class HtmlEditorField_Toolbar extends ViewableData {
|
|||||||
new TextField("Width", _t('HtmlEditorField.IMAGEWIDTHPX', "Width"), 100),
|
new TextField("Width", _t('HtmlEditorField.IMAGEWIDTHPX', "Width"), 100),
|
||||||
new TextField("Height", "x " . _t('HtmlEditorField.IMAGEHEIGHTPX', "Height"), 100)
|
new TextField("Height", "x " . _t('HtmlEditorField.IMAGEHEIGHTPX', "Height"), 100)
|
||||||
)
|
)
|
||||||
);
|
),
|
||||||
|
|
||||||
// We don't want SWFUpload on linux, since it doesn't work
|
|
||||||
$browscap = new Browscap();
|
|
||||||
$hitdata = $browscap->getBrowser(null, true);
|
|
||||||
if(!($hitdata['Platform'] && stristr($hitdata['Platform'], 'linux'))) {
|
|
||||||
$fields->insertBefore(new LiteralField('AddFolderOrUpload',
|
|
||||||
'<div style="clear:both;"></div><div id="AddFolderGroup" style="display:inline">
|
|
||||||
<a style="" href="#" id="AddFolder" class="link">' . _t('HtmlEditorField.CREATEFOLDER','create folder') . '</a>
|
|
||||||
<input style="display: none;margin-left: 2px;width: 94px;" id="NewFolderName" class="addFolder" type="text">
|
|
||||||
<a style="display: none;" href="#" id="FolderOk" class="link addFolder">' . _t('HtmlEditorField.OK','ok') . '</a>
|
|
||||||
<a style="display: none;" href="#" id="FolderCancel" class="link addFolder">' . _t('HtmlEditorField.FOLDERCANCEL','cancel') . '</a>
|
|
||||||
</div>|
|
|
||||||
<div id="UploadGroup" class="group" style="display: inline;margin-top:2px;">
|
|
||||||
<a href="#" id="UploadFiles" class="link">' . _t('HtmlEditorField.UPLOAD','upload') . '</a>
|
|
||||||
</div>
|
|
||||||
'),
|
|
||||||
'Image'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
$form = new Form(
|
|
||||||
$this->controller,
|
|
||||||
"{$this->name}.ImageForm",
|
|
||||||
$fields,
|
|
||||||
new FieldSet(
|
new FieldSet(
|
||||||
new FormAction("insertimage", _t('HtmlEditorField.BUTTONINSERTIMAGE', 'Insert image')),
|
new FormAction("insertimage", _t('HtmlEditorField.BUTTONINSERTIMAGE', 'Insert image')),
|
||||||
new FormAction("editimage", _t('HtmlEditorField.BUTTONEDITIMAGE', 'Edit image'))
|
new FormAction("editimage", _t('HtmlEditorField.BUTTONEDITIMAGE', 'Edit image'))
|
||||||
|
Loading…
Reference in New Issue
Block a user