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
14,937 Commits 31 Branches 527 Tags 162 MiB
17f3afa0e9
Commit Graph

264 Commits

Author SHA1 Message Date
Ingo Schommer
ac45e5b9c0 Merge branch 'integration' 
Conflicts:
	admin/css/ie8.css
	admin/css/screen.css
	admin/scss/_style.scss
	dev/install/config-form.html
	dev/install/install.css
	dev/install/php5-required.html
 2012-04-11 16:31:12 +02:00
Andrew O'Neil
4be59a8d45 MINOR: Ensure all form fields Field() method has the same signature as FormField::Field(). Fixes E_STRICT warnings. 2012-04-11 17:33:36 +12:00
Andrew O'Neil
daab8f4cbc MINOR: Consistently use DataObjectInterface for saveInto() on FormField subclasses. Fixes E_STRICT notice 2012-04-11 17:00:57 +12:00
Ingo Schommer
373d9e7b8f Merge branch 'master' into integration 2012-04-09 21:35:30 +02:00
Ingo Schommer
c2f7bf4dcf MINOR Fixed FormField::create() usage 2012-04-09 21:35:07 +02:00
Ingo Schommer
8c5e56fe31 Merge branch 'master' into integration 
Conflicts:
	admin/css/screen.css
	dev/install/php5-required.html
 2012-04-09 21:10:08 +02:00
Ingo Schommer
40d73127ae MINOR Using late static binding instead of Object::create() calls 2012-04-04 17:10:31 +02:00
Julian Seidenberg
98e197aff9 MINOR: SSF-38 renaming the PageUploadField template to HtmlEditorField_UploadField 2012-03-30 13:44:39 +13:00
Julian Seidenberg
ca83d845e1 ENHANCEMENT: SSF-38 added new template for the upload field that is used within a page image insertion dialog box. This upload field is slightly different from the one used in Files. E.g. it uses smaller fonts (h4 instead of h3) 2012-03-29 16:55:51 +13:00
Julian Seidenberg
94e21d18e1 MINOR: SSF-38 i18n of some of the form 2012-03-29 15:09:20 +13:00
Julian Seidenberg
9f9dc25338 ENHANCEMENT: SSF-38 initial rearranging of the insert image form to allow uploads as well as choosing an image from the CMS (and you can pick and choose from both) 2012-03-29 13:34:55 +13:00
Ingo Schommer
95f1800d80 BUGFIX Resolve local images correctly even with absolute URLs in HTMLEditorConfig_Toolbar, fixed display of remote images (don't try to format the thumbnail, which only works on local images) (fixes #6952) 2012-03-12 16:31:48 +01:00
Ingo Schommer
4fc3aaf939 Revert "ENHANCEMENT Using 'autoresize' TinyMCE plugin in HTMLEditorField default config, in order to save space when no content is entered into the field" - causes artificial loading delay, and doesn't detect height correctly due to floated images in paragraphs. These paragraphs can't be clearfix'ed because they'd become contenteditable (resizeable) elements in IE because of this. 
This reverts commit 69a8659a3d.
 2012-03-12 16:03:13 +01:00
Stig Lindqvist
09d6fa7bb3 API CHANGE Renamed GridFieldDefaultColumns to GridFieldDataColumns #6921 2012-03-09 14:07:40 +13:00
Stig Lindqvist
8b82dae06c API CHANGE: Renaming of gridfield components #6921 2012-03-09 12:54:02 +13:00
Ingo Schommer
e4a6dd5850 Merge branch 'integration' 
Conflicts:
	forms/gridfield/GridField.php
 2012-03-08 20:25:21 +01:00
Ingo Schommer
69a8659a3d ENHANCEMENT Using 'autoresize' TinyMCE plugin in HTMLEditorField default config, in order to save space when no content is entered into the field 2012-03-07 13:32:42 +01:00
Sam Minnee
adfdd068e2 Merge branch 'ereg-to-preg' of https://github.com/AngryPHPNerd/sapphire 
Conflicts:
	model/fieldtypes/Date.php
 2012-03-05 13:54:20 +13:00
Sean Harvey
b3d977f0e7 Merge remote-tracking branch 'upstream/master' into file_shortcodes 2012-03-03 10:24:06 +13:00
Sean Harvey
f5c4bc0802 ENHANCEMENT Ensure that broken File links receive an "ss-broken" class, just like broken SiteTree links 2012-03-01 23:24:58 +13:00
Sean Harvey
898c8f5497 ENHANCEMENT [file_link id=n] shortcode support for file links in HtmlEditorField 2012-03-01 22:20:58 +13:00
Ingo Schommer
da879da940 MINOR Styling and structural fixes for File/Image->getCMSFields() and relates usage in UploadField/HTMLEditorField. 2012-02-29 21:06:43 +01:00
AngryPHPNerd
0e2cbb0b88 Replace ereg with preg_* 2012-02-27 22:14:02 +01:00
Ingo Schommer
abfa16fa70 ENHANCEMENT Using native jQuery UI buttons and icon styling for a less coupled implementation (e.g. assuming that a "constructive" button always has a specific icon, or one at all). All CMS UI buttons switched to use <button> markup, which allows for inline icons and correctly aligned multi-line button labels. 2012-02-17 15:58:32 +01:00
Ingo Schommer
5220a46fd0 ENHANCEMENT Inserting image via new dialog with ajax field retrieval and GridField file selection. Rewritten to jQuery.entwine and using the new HTML editor abstraction layer. 2012-02-14 13:53:35 +01:00
Ingo Schommer
3866f561f5 ENHANCEMENT Using GridField for file selection in "insert image" dialog 
API CHANGE Combined HTMLEditorField_Toolbar->FlashForm() and ImageForm() into new MediaForm() to handle both file types
 2012-02-14 13:30:52 +01:00
Ingo Schommer
243d4d45aa MINOR Restored row/col defaults in TextareaField and HtmlEditorField (broken in 1a10e8bc) 2012-02-10 12:15:41 +01:00
Sam Minnee
7c6050b407 Merge remote-tracking branch 'refs/remotes/chillu/formfield-constructors' 
Conflicts:
	forms/CountryDropdownField.php
 2012-01-10 16:41:02 +13:00
Ingo Schommer
5ec6aa532c ENHANCEMENT GZipped/combined file loading for TinyMCE, which reduces number of HTTP requests in the standard CMS by a third (and decreases file size due to loading pre-compressed files by default) 2012-01-06 15:34:32 +01:00
Ingo Schommer
98852677d5 ENHANCEMENT Simplified "insert link" interface and logic by reverting to TinyMCE's standard behaviour: Only allow linking on an existing selection, don't allow modifying the link content in the "insert" interface. Now that we're presenting this interface as a dialog rather than persistent sidebar its no longer necessary to have "unselected link creation+insertion". 2012-01-05 00:41:41 +01:00
Ingo Schommer
b5c739e71d ENHANCEMENT Refactored TinyMCE LinkForm from behaviour.js to jQuery.entwine. Fixed clearing of fields when popup is closed. 2012-01-05 00:41:41 +01:00
Ingo Schommer
e4d65ab01b MINOR Adding step indicators to "insert link" dialog 2012-01-03 23:01:05 +01:00
Ingo Schommer
b4b6e5a2db MINOR Cleaned up CMS dialog styling (now works with/without tabs, in iframe and inline markup), removed superfluous SCSS variable declarations 2012-01-03 18:11:21 +01:00
Ingo Schommer
0cf6421afe MINOR Button styling for "insert" dialogs 2012-01-03 09:38:42 +01:00
Ingo Schommer
1a10e8bcf5 API CHANGE Removed $rows and $cols constructor arguments on TextareaField and HtmlEditorField, use setRows() and setCols() instead 2012-01-02 17:44:23 +01:00
Ingo Schommer
e31851b182 BUGFIX Correctly mark DatetimeField, MoneyField and PhoneNumberField composites as disabled or readonly 2012-01-02 16:49:33 +01:00
Ingo Schommer
b5421d9598 ENHANCEMENT Allowing custom attributes in (most) FormField implementations, which allows for HTML5 data attributes 2012-01-02 16:48:14 +01:00
Sam Minnee
085598fac0 API CHANGE: Replaced ManyManyList::removeByFilter() with ManyManyList::removeAll(). 2011-10-29 17:36:39 +13:00
Will Rossiter
1732a17114 Merged new-orm into datagrid 2011-09-26 16:47:54 +13:00
Ingo Schommer
ce8e72cf0e MINOR Removing executable flag from all files (thanks miiihi) 2011-09-18 22:04:02 +02:00
ajshort
1f6f7f0862 API CHANGE: Deprecated CompositeField->FieldSet() in favour of CompositeField->FieldList(). 
MINOR: Replaced usage of FieldSet with FieldList.
MINOR: Renamed FieldSetTest to FieldListTest.
 2011-05-11 17:51:54 +10:00
Sam Minnee
de1494e3a8 ENHANCEMENT: Implemented DataList as the successor of DataObjectSet. DataList doesn't execute the query until it's actually needed, allowing for a more flexible ORM. 
API CHANGE: augmentSQL is now passed a DataQuery object from which query parameters can be extracted.
API CHANGE: DataObjectDecorators that manipulate the query can now define augmentDataQueryCreation().
API CHANGE: The container class argument for DataObject::get() is deprecated.
API CHANGE: DataObject::buildSQL() and DataObject::extendedSQL() are deprecated; just use DataObject::get() now.
API CHANGE: DataObject::instance_get() and DataObject::instance_get_one() are deprecated, and can no longer be overloaded.
API CHANGE: DataObject::buildDataObjectSet() is deprecated.
API CHANGE: Cant't call manual manipulation methods on DataList such as insertFirst()
 2011-05-01 15:25:45 +12:00
Ingo Schommer
ff29f3e4e8 ENHANCEMENT Changed HtmlEditorField link/image/flash forms to use model jQuery.dialog instead of side panel - less side effects when switching focus between editor and side panels, and fits better in new design drafts 2011-04-24 11:46:43 +12:00
Ingo Schommer
67cc18f5bf MINOR Optional dependency on ThumbnailStripField in HtmlEditorField, preparing the split of this field into a "basic" and "cms" version 2011-03-29 18:07:58 +13:00
Ingo Schommer
41e51abd9a MINOR Made HtmlEditorField dependency to SiteTree optional (to be moved into separate aspect, or down to DBField/model layer) 2011-03-29 18:07:58 +13:00
Sam Minnee
1e0c4ae8d1 Merge branch '2.4' 
Conflicts:
	cache/Cache.php
	cli/CliController.php
	core/Convert.php
	core/Core.php
	core/ManifestBuilder.php
	core/Object.php
	core/SSViewer.php
	core/control/ContentController.php
	core/control/ContentNegotiator.php
	core/control/FormResponse.php
	core/control/RequestHandler.php
	core/control/SilverStripeNavigatorItem.php
	core/i18n.php
	core/i18nTextCollector.php
	core/model/DataObjectSet.php
	core/model/Hierarchy.php
	core/model/Image.php
	core/model/MySQLDatabase.php
	core/model/SiteConfig.php
	core/model/SiteTree.php
	core/model/Translatable.php
	core/model/VirtualPage.php
	dev/Debug.php
	dev/SapphireTest.php
	dev/TestRunner.php
	dev/YamlFixture.php
	dev/install/MySQLDatabaseConfigurationHelper.php
	docs/en/installation/from-source.md
	docs/en/topics/themes.md
	docs/en/tutorials/4-site-search.md
	email/Mailer.php
	filesystem/File.php
	filesystem/Folder.php
	forms/ComplexTableField.php
	forms/CurrencyField.php
	forms/DateField.php
	forms/FieldSet.php
	forms/FileField.php
	forms/FileIFrameField.php
	forms/HtmlEditorConfig.php
	forms/HtmlEditorField.php
	forms/SelectionGroup.php
	forms/SimpleImageField.php
	forms/TabSet.php
	forms/TableField.php
	forms/TableListField.php
	forms/TreeDropdownField.php
	forms/TreeMultiselectField.php
	integration/Geoip.php
	javascript/SelectionGroup.js
	javascript/TreeSelectorField.js
	javascript/UpdateURL.js
	javascript/core/jquery.ondemand.js
	javascript/tiny_mce_improvements.js
	javascript/tree/tree.js
	lang/en_US.php
	search/ContentControllerSearchExtension.php
	security/Group.php
	security/Member.php
	security/PermissionCheckboxSetField.php
	security/PermissionRole.php
	security/Security.php
	static-main.php
	templates/RelationComplexTableField.ss
	templates/TableListField.ss
	tests/ConvertTest.php
	tests/DataObjectSetTest.php
	tests/DataObjectTest.php
	tests/DataObjectTest.yml
	tests/RequestHandlingTest.php
	tests/SSViewerTest.php
	tests/SiteTreePermissionsTest.php
	tests/SiteTreeTest.php
	tests/TransactionTest.php
	tests/api/RestfulServiceTest.php
	tests/control/DirectorTest.php
	tests/control/ModelAsControllerTest.php
	tests/fieldtypes/WidgetAreaEditorTest.php
	tests/forms/CurrencyFieldTest.php
	tests/forms/FormTest.php
	tests/model/DatabaseTest.php
	tests/model/ImageTest.php
	tests/search/ContentControllerSearchExtensionTest.php
	tests/security/MemberAuthenticatorTest.php
	thirdparty/.gitignore
	thirdparty/behaviour/behaviour.js
	thirdparty/firebug-lite/firebug.js
	thirdparty/firebug-lite/firebugx.js
	thirdparty/jquery-form/jquery.form.js
	thirdparty/jquery-livequery/jquery.livequery.js
	thirdparty/jquery-livequery/test/jquery.js
	thirdparty/jquery-livequery/test/test.html
	thirdparty/jquery-livequery/test/test2.html
	thirdparty/jquery-metadata/META.json
	thirdparty/jquery-metadata/README
	thirdparty/jquery-metadata/jquery.metadata.js
	thirdparty/jquery-metadata/test/index.html
	thirdparty/jquery-metadata/test/jquery.js
	thirdparty/jquery-metadata/test/test.js
	thirdparty/jquery-metadata/test/testrunner.js
	thirdparty/jquery-metadata/test/testsuite.css
	thirdparty/jquery-ui-themes/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_75_dadada_1x400.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-icons_222222_256x240.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-icons_2e83ff_256x240.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-icons_454545_256x240.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-icons_888888_256x240.png
	thirdparty/jquery-ui-themes/smoothness/images/ui-icons_cd0a0a_256x240.png
	thirdparty/jquery-ui/i18n/jquery-ui-i18n.js
	thirdparty/jquery-ui/i18n/ui.datepicker-ar.js
	thirdparty/jquery-ui/i18n/ui.datepicker-bg.js
	thirdparty/jquery-ui/i18n/ui.datepicker-ca.js
	thirdparty/jquery-ui/i18n/ui.datepicker-cs.js
	thirdparty/jquery-ui/i18n/ui.datepicker-da.js
	thirdparty/jquery-ui/i18n/ui.datepicker-de.js
	thirdparty/jquery-ui/i18n/ui.datepicker-el.js
	thirdparty/jquery-ui/i18n/ui.datepicker-eo.js
	thirdparty/jquery-ui/i18n/ui.datepicker-es.js
	thirdparty/jquery-ui/i18n/ui.datepicker-fa.js
	thirdparty/jquery-ui/i18n/ui.datepicker-fi.js
	thirdparty/jquery-ui/i18n/ui.datepicker-fr.js
	thirdparty/jquery-ui/i18n/ui.datepicker-he.js
	thirdparty/jquery-ui/i18n/ui.datepicker-hr.js
	thirdparty/jquery-ui/i18n/ui.datepicker-hu.js
	thirdparty/jquery-ui/i18n/ui.datepicker-hy.js
	thirdparty/jquery-ui/i18n/ui.datepicker-id.js
	thirdparty/jquery-ui/i18n/ui.datepicker-is.js
	thirdparty/jquery-ui/i18n/ui.datepicker-it.js
	thirdparty/jquery-ui/i18n/ui.datepicker-ja.js
	thirdparty/jquery-ui/i18n/ui.datepicker-ko.js
	thirdparty/jquery-ui/i18n/ui.datepicker-lt.js
	thirdparty/jquery-ui/i18n/ui.datepicker-lv.js
	thirdparty/jquery-ui/i18n/ui.datepicker-ms.js
	thirdparty/jquery-ui/i18n/ui.datepicker-nl.js
	thirdparty/jquery-ui/i18n/ui.datepicker-no.js
	thirdparty/jquery-ui/i18n/ui.datepicker-pl.js
	thirdparty/jquery-ui/i18n/ui.datepicker-pt-BR.js
	thirdparty/jquery-ui/i18n/ui.datepicker-ro.js
	thirdparty/jquery-ui/i18n/ui.datepicker-ru.js
	thirdparty/jquery-ui/i18n/ui.datepicker-sk.js
	thirdparty/jquery-ui/i18n/ui.datepicker-sl.js
	thirdparty/jquery-ui/i18n/ui.datepicker-sq.js
	thirdparty/jquery-ui/i18n/ui.datepicker-sr-SR.js
	thirdparty/jquery-ui/i18n/ui.datepicker-sr.js
	thirdparty/jquery-ui/i18n/ui.datepicker-sv.js
	thirdparty/jquery-ui/i18n/ui.datepicker-th.js
	thirdparty/jquery-ui/i18n/ui.datepicker-tr.js
	thirdparty/jquery-ui/i18n/ui.datepicker-uk.js
	thirdparty/jquery-ui/i18n/ui.datepicker-zh-CN.js
	thirdparty/jquery-ui/i18n/ui.datepicker-zh-TW.js
	thirdparty/jquery/jquery.js
	thirdparty/jsmin/.piston.yml
	thirdparty/jsmin/jsmin.php
	thirdparty/prototype/prototype.js
	thirdparty/scriptaculous/dragdrop.js
	thirdparty/simplepie/.piston.yml
	thirdparty/spyc/.piston.yml
	thirdparty/spyc/README
	thirdparty/spyc/php4/spyc.php4
	thirdparty/spyc/php4/test.php4
	thirdparty/spyc/spyc.php
	thirdparty/spyc/spyc.yaml
	thirdparty/tinymce-advcode/dialog.html
	thirdparty/tinymce-advcode/editor_plugin_src.js
	thirdparty/tinymce-advcode/js/dialog.js
	thirdparty/tinymce/langs/en.js
	thirdparty/tinymce/plugins/advhr/langs/en_dlg.js
	thirdparty/tinymce/plugins/advhr/rule.htm
	thirdparty/tinymce/plugins/advimage/image.htm
	thirdparty/tinymce/plugins/advimage/langs/en_dlg.js
	thirdparty/tinymce/plugins/advlink/langs/en_dlg.js
	thirdparty/tinymce/plugins/advlink/link.htm
	thirdparty/tinymce/plugins/emotions/emotions.htm
	thirdparty/tinymce/plugins/emotions/langs/en_dlg.js
	thirdparty/tinymce/plugins/example/dialog.htm
	thirdparty/tinymce/plugins/fullpage/fullpage.htm
	thirdparty/tinymce/plugins/fullpage/langs/en_dlg.js
	thirdparty/tinymce/plugins/fullscreen/fullscreen.htm
	thirdparty/tinymce/plugins/inlinepopups/template.htm
	thirdparty/tinymce/plugins/media/langs/en_dlg.js
	thirdparty/tinymce/plugins/media/media.htm
	thirdparty/tinymce/plugins/paste/js/pasteword.js
	thirdparty/tinymce/plugins/paste/langs/en_dlg.js
	thirdparty/tinymce/plugins/paste/pastetext.htm
	thirdparty/tinymce/plugins/paste/pasteword.htm
	thirdparty/tinymce/plugins/searchreplace/langs/en_dlg.js
	thirdparty/tinymce/plugins/searchreplace/searchreplace.htm
	thirdparty/tinymce/plugins/spellchecker/editor_plugin.js
	thirdparty/tinymce/plugins/spellchecker/editor_plugin_src.js
	thirdparty/tinymce/plugins/style/langs/en_dlg.js
	thirdparty/tinymce/plugins/style/props.htm
	thirdparty/tinymce/plugins/table/cell.htm
	thirdparty/tinymce/plugins/table/langs/en_dlg.js
	thirdparty/tinymce/plugins/table/merge_cells.htm
	thirdparty/tinymce/plugins/table/row.htm
	thirdparty/tinymce/plugins/table/table.htm
	thirdparty/tinymce/plugins/template/langs/en_dlg.js
	thirdparty/tinymce/plugins/template/template.htm
	thirdparty/tinymce/plugins/xhtmlxtras/abbr.htm
	thirdparty/tinymce/plugins/xhtmlxtras/acronym.htm
	thirdparty/tinymce/plugins/xhtmlxtras/attributes.htm
	thirdparty/tinymce/plugins/xhtmlxtras/cite.htm
	thirdparty/tinymce/plugins/xhtmlxtras/del.htm
	thirdparty/tinymce/plugins/xhtmlxtras/ins.htm
	thirdparty/tinymce/plugins/xhtmlxtras/langs/en_dlg.js
	thirdparty/tinymce/themes/advanced/about.htm
	thirdparty/tinymce/themes/advanced/anchor.htm
	thirdparty/tinymce/themes/advanced/charmap.htm
	thirdparty/tinymce/themes/advanced/color_picker.htm
	thirdparty/tinymce/themes/advanced/image.htm
	thirdparty/tinymce/themes/advanced/langs/en.js
	thirdparty/tinymce/themes/advanced/langs/en_dlg.js
	thirdparty/tinymce/themes/advanced/link.htm
	thirdparty/tinymce/themes/advanced/source_editor.htm
	thirdparty/tinymce/themes/simple/langs/en.js
	thirdparty/tinymce/tiny_mce.js
	thirdparty/tinymce/tiny_mce_src.js
	widgets/Widget.php
 2011-02-14 18:47:53 +13:00
Ingo Schommer
43f72ee121 BUGFIX Removing "typography" class from HTMLEditorField container (should just apply to the contained <iframe>) (fixes #5949) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@110809 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:19:49 +13:00
Ingo Schommer
4138b3e74b BUGFIX Added Locale hidden field to HTMLEditorField->LinkForm() in order to show correct context in "page on the site" dropdown (fixes #5743) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@107390 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:19:35 +13:00
Sam Minnee
f3a666b89f BUGFIX: Fixed issues with broekn link tracking 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@101138 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:19:02 +13:00
Ingo Schommer
fcfd1f7d5b BUGFIX HTMLEditorField->saveInto() can now find images with urlencoded information for resample (e.g. spaces in filenames) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100985 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:18:58 +13:00
Ingo Schommer
9e7611e891 ENHANCEMENT Added 'updateImageForm', 'updateFlashForm', 'updateLinkForm' hooks to HtmlEditorField (the imageform hook was necessary to make the 'pixlr' module work) (see #3938) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100753 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:18:52 +13:00
Will Rossiter
b853c1ce47 ENHANCEMENT: Select the uploaded image after uploading by default. #4962 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97765 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:18:16 +13:00
Mateusz Uzdowski
f31c9998d3 BUGFIX: add custom search function, so the search catches also the Titles (search uses DataObject::get, which bypasses the getMenuTitle function) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97755 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:18:16 +13:00
Will Rossiter
80c69abdb8 APICHANGE: removed SWFUpload. Refactored Content Editors uploader to use standard uploader. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97489 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:18:13 +13:00
Sam Minnee
b10f8a908d BUGFIX: Fixed notice-level errors when checking permissions of pages that don't exist anywhere (from r93166) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96755 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:18:06 +13:00
Geoff Munn
3d92026def BUGFIX: Resized images which return null or false are now ignored 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96754 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:18:06 +13:00
Mark Stephens
e22c843122 ENHANCEMENT: Change to TreeDropdownField, giving it filtering behaviour as described in ticket http://open.silverstripe.org/ticket/3007 . Its disabled by default for legacy compatibility, but enabled for HtmlEditorField so that link editor is filterable for local links, via an extra boolean parameter on TreeDowndownField. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@96668 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:18:01 +13:00
Sean Harvey
9c55927a17 API CHANGE Removed ComponentSet::removeByFilter() since it's not flexible enough and fixed calls to this from HtmlEditorField::saveInto() to use custom code instead 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93660 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:53 +13:00
Ingo Schommer
03c5caea72 MINOR Updated paths from jsparty to sapphire/thirdparty, cms/thirdparty and sapphire/javascript 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93611 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:52 +13:00
Will Rossiter
137a67845c FEATURE: added ability to upload images from site content pane. Merged via r9130, r91347, r91350, r91480 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91496 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:36 +13:00
Ingo Schommer
8bb3797f04 MINOR BUGFIX Disabling security token in HtmlEditorField?->FlashForm?(), its not passed in by the ajax request (merged from r91392) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91394 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2011-02-02 14:17:35 +13:00
Ingo Schommer
eeed9ce189 BUGFIX Don't call LinkTracking/ImageTracking relationships in HTMLEditorField->saveInto() unless we have internal links/files to save. This helps to improve CMS saving times on records with many HTMLEditorField instances 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114139 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-11-24 06:23:51 +00:00
Sam Minnee
61bb2fe4a4 BUGFIX Removing "typography" class from HTMLEditorField container (should just apply to the contained <iframe>) (fixes #5949) (from r110809) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112847 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-19 01:33:28 +00:00
Ingo Schommer
6351b16ab9 BUGFIX Added Locale hidden field to HTMLEditorField->LinkForm() in order to show correct context in "page on the site" dropdown (fixes #5743) (from r107390) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112573 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 03:25:51 +00:00
Sam Minnee
e09cc66e94 BUGFIX: Fixed issues with broekn link tracking (from r101138) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111960 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-12 21:42:25 +00:00
Sam Minnee
5f0fcc58ec BUGFIX HTMLEditorField->saveInto() can now find images with urlencoded information for resample (e.g. spaces in filenames) (from r100985) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111557 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:29:00 +00:00
Ingo Schommer
c81a788ba7 ENHANCEMENT Added 'updateImageForm', 'updateFlashForm', 'updateLinkForm' hooks to HtmlEditorField (the imageform hook was necessary to make the 'pixlr' module work) (see #3938) (from r100753) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105642 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:56:02 +00:00
Ingo Schommer
73ba193ad6 ENHANCEMENT: Select the uploaded image after uploading by default. #4962 (from r97765) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102531 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-12 23:36:50 +00:00
Ingo Schommer
d294c0f755 BUGFIX: add custom search function, so the search catches also the Titles (search uses DataObject::get, which bypasses the getMenuTitle function) (from r97755) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102530 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-12 23:34:08 +00:00
Ingo Schommer
7654557068 APICHANGE: removed SWFUpload. Refactored Content Editors uploader to use standard uploader. (from r97489) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102505 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-12 21:54:41 +00:00
Ingo Schommer
1192b9ef2c BUGFIX: Resized images which return null or false are now ignored (from r96754) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102383 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-12 02:45:35 +00:00
Mark Stephens
69818fad17 ENHANCEMENT: Change to TreeDropdownField, giving it filtering behaviour as described in ticket http://open.silverstripe.org/ticket/3007 . Its disabled by default for legacy compatibility, but enabled for HtmlEditorField so that link editor is filterable for local links, via an extra boolean parameter on TreeDowndownField. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93932 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-29 23:29:31 +00:00
Will Rossiter
05832a1dee API CHANGE: removed deprecated removeByFilter() function 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93670 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-26 22:18:59 +00:00
Ingo Schommer
fba5841d9d MINOR Updated SWFUpload library to 2.5.0 alpha (see r91302) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92573 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 02:33:59 +00:00
Ingo Schommer
76d2886a70 MINOR Moved tiny_mce_imrpovements.js from jsparty/ to sapphire/javascript 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92547 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 02:32:16 +00:00
Ingo Schommer
beb4efef09 ENHANCEMENT Disabling form validation for right-panel forms in CMS in HtmlEditorField. None of the fields have validation attached to them at the moment, so the generic validation output is unnecessary bloat. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92528 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 02:31:11 +00:00
Ingo Schommer
a11db29672 MINOR Changed paths to moved thirdparty dependencies (mostly from /jsparty to /sapphire/thirdparty, /cms/javascript and /sapphire/javascript) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92502 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 02:29:59 +00:00
Ingo Schommer
70deaa44e4 ENHANCEMENT Changed markup of right panel forms in HtmlEditorField, titlebars and close buttons are now created through JavaScript. Also wrapped all fields in a container to make them easy to scroll in the panel 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92482 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 02:22:44 +00:00
Will Rossiter
0b3cb11262 BUGFIX: disabled swfupload in IE versions. MINOR: merged js order changes from r91542 and r91541 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@91551 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-13 03:04:38 +00:00
Ingo Schommer
2daf84910c BUGFIX Disabling security token in HtmlEditorField->FlashForm(), its not passed in by the ajax request 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@91392 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-12 02:53:49 +00:00
Will Rossiter
1a4cfc6c20 BUGFIX: updated paths to swfupload. MINOR: cleaned up structure around image upload section in the site content box 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@91347 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-11 22:47:11 +00:00
Sam Minnee
4ab8055c29 #63 - Stable against restructures (from r84861) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89155 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-15 21:46:13 +00:00
Andrew Short
5adfc28a43 BUGFIX: Reset broken file & link flags in HtmlEditorField->saveInto() before determining if a record contains broken links. 
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88989 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-15 00:02:04 +00:00
Andrew Short
26ece45bb0 BUGFIX: Stopped HtmlEditorField->saveInto() from dying when encountering a link that cannot be made relative. 
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88774 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-13 01:45:01 +00:00
Andrew Short
9b4d9993a4 FEATURE: Added SS_HTMLValue to provide a simple wrapper around DOMDocument to allow the manipulation of HTML snippets. 
FEATURE: Re-instated broken link highlighting by manually checking all shortcodes in HtmlEditorField->Field(), and adding a class to broken ones.

From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88510 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-11 00:07:27 +00:00
Andrew Short
1859ba502b FEATURE: Updated HtmlEditorField to use DOMDocument to more reliably parse image tracking and shortcode link tracking data. 
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88492 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-11 00:07:13 +00:00
Andrew Short
73b0ea643f ENHANCEMENT #3279: Updated the link inserter to insert a shortcode rather than a plain HTML link. 
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88491 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-11 00:07:12 +00:00
Andrew Short
fd7b322ed4 MINOR: Removed un-used HtmlEditorField button generation code that has been replaced with HtmlEditorConfig. 
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88470 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-11 00:06:55 +00:00
Sam Minnee
66b25f1e62 BUGFIX: Fixed CSRF warning in image form after selecting a folder. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@80237 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-06-28 01:17:20 +00:00
Sean Harvey
c5ef811b94 MINOR Add folder/upload links weren't being hidden properly in IE - this is for a feature that is disabled 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79369 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-06-16 22:46:06 +00:00
Sean Harvey
0a89009b73 MINOR Removed $rows variable from HtmlEditorField - this gets inherited from TextareaField 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79213 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-06-15 05:17:48 +00:00
Sean Harvey
9c1ef3cd15 ENHANCEMENT Added caption field to HtmlEditorField for settting caption text (optional) on an image 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79206 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-06-15 05:02:00 +00:00
Sean Harvey
362931b6f2 BUGFIX Renamed thumb strip field "Image" to "FolderImages" to avoid ID collisions 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79167 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-06-15 03:18:32 +00:00
Sam Minnee
8cf4986397 BUGFIX #3916 bribaudo: Don't throw an error on HTMLEditorField save if a link is empty. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@78563 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-06-08 00:34:58 +00:00
Sean Harvey
2fc1771f93 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77032 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-18 00:19:47 +00:00
Sean Harvey
b1018f5864 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@76846 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-14 05:26:47 +00:00
Sean Harvey
0a5f4de51c Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@76661 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-12 05:12:47 +00:00
Sean Harvey
fdeacb4d07 Reverted r69557 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75825 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-01 03:18:05 +00:00
Sean Harvey
35c8666c4a Merged in r75816 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75819 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-01 03:06:20 +00:00
Sean Harvey
8471d1fc87 MINOR Updated titles for alt and title attribute value fields 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75697 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-04-30 01:29:29 +00:00
Sean Harvey
30481b5199 ENHANCEMENT Added a new "TitleText" field to ImageForm allowing a user to select which title attribute should appear on their images inserted into the content 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75690 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-04-30 00:15:41 +00:00
Sean Harvey
13b358a8dd Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75582 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-04-29 00:07:39 +00:00
Andrew O'Neil
635e2c3df6 Merged from 2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@72453 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-04 03:44:11 +00:00
Andrew O'Neil
60f75c5ca4 Merged changes from 2.3 branch 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@71172 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-02-01 23:49:53 +00:00
Ingo Schommer
b7d394008e MINOR Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@69957 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-01-10 11:35:50 +00:00
Ingo Schommer
0747fc6d52 MINOR merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@69856 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-01-07 23:00:54 +00:00
Ingo Schommer
085346f0e0 MINOR Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@69704 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-01-05 06:19:48 +00:00
Saophalkun Ponlu
a32a79e816 MINOR: fixed some alignments 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@69685 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-01-05 03:06:57 +00:00
Saophalkun Ponlu
11d0491abf IMPROVEMENT: image alignment options. ticket #1877 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@69557 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-12-19 13:36:59 +00:00
Sam Minnee
96c5be8252 Updating queries to be more DB agnostic 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66507 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-24 09:31:14 +00:00
Sam Minnee
93438e0be2 API CHANGE: Adding double quotes to all table and field references (a work in progress) 
API CHANGE: DataObject::get()'s GROUP BY clause is only generated for MySQL as it needs to be improved for other databases to accept it.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66427 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-23 23:28:16 +00:00
Will Rossiter
8052c5dce4 Merged pre-2.3-oct08 into trunk 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66080 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-17 22:59:17 +00:00
Sean Harvey
a25320a99c ENHANCEMENT Added possibility of search for images and flash before inserting into the content editor in CMS 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65820 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-13 04:55:23 +00:00
Sam Minnee
73a075a491 FEATURE #594: Added javascript-on-demand support 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65688 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-12 04:31:33 +00:00
Sam Minnee
020a92eda8 BUGFIX #2992: Fixed T_PAAMAYIM_NEKUDOTAYIM error in RequestHandler 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65250 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-05 01:59:27 +00:00
Sean Harvey
dc8876223e MINOR Code formatting on HtmlEditorField functions 
MINOR phpDoc of HtmlEditorField

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65205 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-04 04:12:54 +00:00
Sam Minnee
cd699e3d89 API CHANGE #2857 - Renamed RequestHandlingData to RequestHandler 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64953 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-30 22:03:21 +00:00
Sam Minnee
f5e636ac43 Changed default # of rows on HTMLEditorField from 15 to 30 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64863 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-29 02:39:09 +00:00
Sean Harvey
68326a5eac BUGFIX Avoid ajax evaluator errors by checking if $resizedImage actually exists before calling relativePath() on it 
MINOR Code formatting cleanup



git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64850 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-28 23:20:14 +00:00
Sam Minnee
f7a3e95851 Added LinkText field to link inserter 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64759 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-24 05:12:22 +00:00
Sam Minnee
f8c1f84a0d #2397 - Fixed HTMLEditorField style dropdown 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63548 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-02 22:15:37 +00:00
Ingo Schommer
fabf01d076 ENHANCEMENT Introduced constants for system paths like /sapphire in preparation for a more flexible directory reorganisation. Instead of hardcoding your path, please use the following constants: BASE_PATH, BASE_URL, SAPPHIRE_DIR, SAPPHIRE_PATH, CMS_DIR, CMS_PATH, THIRDPARTY_DIR, THIRDPARTY_PATH, ASSETS_DIR, ASSETS_PATH, THEMES_DIR, THEMES_PATH 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63175 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-09-28 13:12:20 +00:00
Sean Harvey
2b49d18350 BUGFIX HtmlEditorField_Toolbar->LinkForm() for editing a link inside an HtmlEditorField instance was showing page titles using the "Title" 
field, changed to "MenuTitle" to be consistent with the main CMS site tree and to avoid confusion 



git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@61155 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-20 04:57:55 +00:00
Sam Minnee
0bd9bc4ff8 Merged changes from 2.2.2-assets - everything except the asset refactoring 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60468 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-12 02:51:33 +00:00
Ingo Schommer
4735f91ab8 (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60352 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-11 03:39:14 +00:00
Ingo Schommer
935ee6d1bc (merged from branches/roa. use "svn log -c <changeset> -g <module-svn-path>" for detailed commit message) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60266 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-10 23:35:11 +00:00
Sam Minnee
7a9dd25b9c BUGFIX: Fixed HTML toolbar separator image reference; updated it to use MCE_ROOT 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@57766 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-07-10 23:29:20 +00:00
Ingo Schommer
60860cc1b9 MINOR Unified @package PHPdoc (added where missing, removed duplicates) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56212 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-06-15 13:33:53 +00:00
Sam Minnee
b8262b6d48 Merged revisions 50783 via svnmerge from 
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50783 | sminnee | 2008-03-10 16:02:12 +1300 (Mon, 10 Mar 2008) | 1 line
  
  Added 'anchor' option to link inserter
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50883 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 03:29:30 +00:00
Sam Minnee
6c5ee3ceb9 Merged revisions 50214 via svnmerge from 
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50214 | sminnee | 2008-02-26 16:12:22 +1300 (Tue, 26 Feb 2008) | 2 lines
  
  A bit of a hack to fix double-escaped URLs in the CMS.
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50865 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-03-11 01:30:36 +00:00
Ingo Schommer
fc3a2cc298 documentation 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49025 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-02-04 01:31:37 +00:00
Ingo Schommer
a1451739a4 Merged revisions 48168 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r48168 | ischommer | 2008-01-17 17:20:45 +1300 (Thu, 17 Jan 2008) | 1 line
  
  renamed escapeFlagForField() to escapeTypeForField(), updated documentation
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48163 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-17 04:23:31 +00:00
Ingo Schommer
0b5ab1fc7b Merged revisions 48164 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r48164 | ischommer | 2008-01-17 17:05:49 +1300 (Thu, 17 Jan 2008) | 2 lines
  
  Deprecated use of DBField 'Text' for saving HTML-Content (added check in HTMLEditorField->saveInto())
  Added ViewableData->escapeFlagForField() to determine if the record-field needs escaping (currently only 'xml' supported)
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48162 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-17 04:22:13 +00:00
Sam Minnee
fea4042c3c rbarreiros: #1918 Translate newsletter and other strings 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47832 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-10 03:28:13 +00:00
Sam Minnee
9510bad3e0 Allow insertion of <img> tags that refer to external domains 
Add alt= to any images that don't have alt tags

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47820 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-10 02:42:23 +00:00
Sam Minnee
41a11b277e Improved API documentation 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47799 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-10 00:34:18 +00:00
Sam Minnee
b1d2e3906b API Documentation updates 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47766 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-09 04:18:36 +00:00
Sam Minnee
d27937f448 Updated API documentation package tags 
Fixed some whitespace

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47725 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-08 06:37:50 +00:00
Andrew O'Neil
95180448d0 Merged revisions 47155 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.1asfonz

........
  r47155 | sminnee | 2007-12-17 11:20:21 +1300 (Mon, 17 Dec 2007) | 1 line
  
  Added paste plain text and paste from word buttons to the HtmlEditorField in the CMS
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47694 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-08 00:53:54 +00:00
Andrew O'Neil
4dda814a11 Remove right on it's own, css hack only works in firefox (merged from branches/2.2.0@45907, r45475) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46104 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-02 21:32:30 +00:00
Andrew O'Neil
8903fb8eaf Add on its own alignment for images (merged from branches/2.2.0@45907, r45472) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46103 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-12-02 21:32:12 +00:00
Andrew O'Neil
ce30a13130 #1755 - Can't upload any files using the 'Upload' tab on a folder in Files and Images section (merged from branches/2.2.0, r44824) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44900 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-15 22:31:57 +00:00
Andrew O'Neil
29c16511fe SWFUpload works on linux if you have beta flash plugin (merged from branches/2.2.0, r44813) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44898 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-15 22:31:22 +00:00
Andrew O'Neil
9802f16afc Revert r44795 (merged from branches/2.2.0, r44812) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44897 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-15 22:30:25 +00:00
Andrew O'Neil
8acb9a0f48 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
 2007-11-15 22:30:08 +00:00
Andrew O'Neil
ed69b15fd6 #1484 - Cannot upload files 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44601 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-11 23:01:17 +00:00
Andrew O'Neil
34aa13ccbf #1606 - Check add folder & upload-functionality in tinymce 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44594 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-11 22:30:01 +00:00
Andrew O'Neil
87010bc87c Clean up insert flash pane 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44496 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-08 02:08:50 +00:00
Will Rossiter
5d74baf7c8 more fixs to that menu 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44485 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-07 22:59:28 +00:00
Andrew O'Neil
90aa22e993 #1628 - Resizing images seems to break images, and doesn't display on front end 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44473 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-11-07 21:39:57 +00:00