Commit Graph

483 Commits

Author SHA1 Message Date
Sam Minnee
2984355f43 Merged branches/2.3 into trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66395 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-22 03:33:00 +00:00
Sam Minnee
3d9532db83 Merged branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66108 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-18 01:48:37 +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
Sean Harvey
1458d5b973 BUGFIX Fixed deletion of RedirectorPage
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65769 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-13 01:43:38 +00:00
Sam Minnee
b39d3811ff Refactored tabstrip.js to use livequery for loading
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65717 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-12 22:28:07 +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
Ingo Schommer
5df97fba10 ENHANCEMENT Added CompositeField->fieldPosition()
ENHANCEMENT Supporting recursion into nested sets in FieldSet->insertAfter()/TabSet->insertAfter()/CompositeField->insertAfter()
API CHANGE Deprecated CompositeField->insertBeforeRecursive(), use CompositeField->insertBefore()
ENHANCEMENT Renamed CompositeField->beforeInsert() to CompositeField->onBeforeInsert() to avoid confusion with insertBefore()
ENHANCEMENT Added CompositeFieldTest
ENHANCEMENT Added unit tests for FieldSet->insertBefore()/insertAfter()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65581 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-11 02:35:54 +00:00
Sam Minnee
58dbe416ee Merged from branches/2.2
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65523 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-10 03:51:35 +00:00
Ingo Schommer
fdeaececb1 BUGFIX Respecting $dontEscape in FormAction
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65335 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-05 23:21:50 +00:00
Ingo Schommer
c172e823ea BUGFIX Using empty title in TreeDropdownField->Field() if the related DataObject cannot be found
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65293 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-05 15:58:46 +00:00
Sean Harvey
d145c50cc2 ENHANCEMENT Folder name can now be used for uploading files. Ticket #3026 - Thanks simon_w!
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65266 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-05 03:56:22 +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
Ingo Schommer
61a856503e BUGFIX Calling parent constructor in ComplexTableField_ItemRequest, was confusing RequestHandler
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65212 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-04 13:52:03 +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
Ingo Schommer
c539687eb2 MINOR Fixed PHP Notices in TreeMultiSelectField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65145 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-03 13:47:40 +00:00
Sean Harvey
99589e626f BUGFIX Fix potential PHP notice opening a ComplexTableField popup
MINOR Code formatting in ComplexTableField

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65127 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-11-03 02:33:08 +00:00
Sean Harvey
e9f65ed8e1 BUGFIX Fixed wrong case of class names for ImageIFrameField causing errors
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64976 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-31 02:09:04 +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
Normann Lou
132f4ae5ca CurrencyField::jsValidation() needs to register its validateCurrency function mulitiple times with different FormID for working in a popup of ComplexTableField where FormID is changed.
In general all Form Fields should imply with this rule if a page contain mulitiple forms, but this is not under our current developing cycle, since our form fields validation is changing to use jQuery.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64896 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-30 01:02:57 +00:00
Ingo Schommer
41075078fd BUGFIX Fixed title-handling in FormAction, regression from r64410
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64879 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-29 16:12:23 +00:00
Sean Harvey
c013b02dc8 MINOR Code formatting in TextareaField->Field()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64871 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-29 03:13:38 +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
Sean Harvey
673e0508b1 MINOR Added deprecated note to ConfirmedFormAction
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64786 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-27 22:50:24 +00:00
Will Rossiter
03830e1baa BUGFIX: merged patch from ajshort to fix checkbox fields in the cms
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64770 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-25 11:19:31 +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
Sean Harvey
691776a254 ENHANCEMENT Changed FormField->Field() to make use of FormField->createTag() over complicated dynamic string building
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64682 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-23 10:39:11 +00:00
Hayden Smith
c004cc9b2f BUGFIX: Fixed incorrectly reverted methods related to sizing of the popup.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64604 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-21 21:42:27 +00:00
Sean Harvey
a78b5a2efb BUGFIX Fixed extra class addition on various FormField->Field() methods
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64601 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-21 20:58:11 +00:00
Sean Harvey
bd023527e6 ENHANCEMENT Used _t() entity instead of hardcoded "not set" string in TextareaField->Field()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64558 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-20 10:58:31 +00:00
Sean Harvey
fda6ab0afb MINOR Unnecessary check of trim() twice on TextareaField->Field()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64557 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-20 10:54:04 +00:00
Sean Harvey
62a28cab64 ENHANCEMENT Clearer indication of setting disabled attribute in DropdownField->Field() since the disabled attribute shouldn't be set if the field isn't to be disabled
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64556 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-20 10:52:47 +00:00
Sean Harvey
719bc5dff4 MINOR whitespace removal
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64555 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-20 10:32:14 +00:00
Sean Harvey
a16f55b068 ENHANCEMENT Clearer indication of setting disabled attribute in CheckboxField->Field() since the disabled attribute shouldn't be set if the field isn't to be disabled
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64553 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-20 10:22:01 +00:00
Sean Harvey
2fd43fccfa ENHANCEMENT If TextField->disabled has been set to true, then add the "disabled" attribute to the input type text attribute list
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64552 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-20 10:18:25 +00:00
Sean Harvey
f5a39b5c2c ENHANCEMENT Made use of FormField->createTag() functionality for creating a textarea field in TextareaField->Field()
MINOR Documentation tweaks in TextareaField

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64551 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-20 10:05:05 +00:00
Sean Harvey
1611deb019 MINOR Convert::raw2att() isn't required because FormField->createTag() already does this
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64550 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-20 10:03:20 +00:00
Normann Lou
249c7a7d12 APICHANGE: delete GenericDataAdmin, RelatedDataEditor, DropdownField_WithAdd and their related code (js, css, etc) from cms, sapphire, "GenericDataAdmin" name space has also been deleted from lang files. They are all added in the new module "genericdataadmin"
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64528 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-20 00:20:00 +00:00
Sean Harvey
8e1f647252 MINOR Added to @deprecated note for TypeDropdown about why this class shouldn't be used
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64505 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-19 00:41:16 +00:00
Sean Harvey
7048077184 API CHANGE Removed HtmlOneLineField. This field has been deprecated for some time now, and it does not work.
API CHANGE Changed HTMLVarchar->scaffoldFormField() to use HtmlEditorField instead of HtmlOneLineField, which does not work.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64504 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-19 00:18:55 +00:00
Normann Lou
e30b5e3f22 MINOR: documenting my new method, correct a coding convention about whitespace
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64460 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-16 22:22:32 +00:00
Ingo Schommer
00eaa1b5b7 BUGFIX Removed $headingLevel reference from LabelField (was supposed to go into HeaderField)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64438 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-16 14:03:10 +00:00
Ingo Schommer
06671277a7 BUGFIX Second constructor argument $title for HeaderField should be optional for legacy reasons
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64437 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-16 13:54:21 +00:00
Ingo Schommer
cb5d772111 MINOR deprecation notes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64429 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-16 13:44:20 +00:00
Ingo Schommer
794ae40f8f API CHANGE Moved CheckboxFieldDisabled class to more common CheckboxField_Disabled notation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64428 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-16 13:44:05 +00:00
Ingo Schommer
80b5bfd4d2 API CHANGE Removed NoScriptField, please use LiteralField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64426 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-16 13:31:57 +00:00
Ingo Schommer
82e1ad8d8a API CHANGE Removed EncryptField, use PasswordField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64425 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-16 13:31:34 +00:00
Ingo Schommer
e95c5657ff API CHANGE Changed constructor parameters for LabelField and Header: First parameter is now $name, not $title. Necessary change to consistently support labelled fields which can be identified and modified within a FieldSet, and in the DOM structure. Both HeaderField and LabelField still acceppt old notation through checking the parameter signature with func_get_args().
API CHANGE Moved setAllowHTML() to DataLessField
ENHANCEMENT Using createTag() to create HeaderField and LabelField, which adds support for HTML id attributes and extra css classes through addExtraClass()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64421 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-16 13:26:25 +00:00
Ingo Schommer
ab891c67ec API CHANGE Removed LabelledLiteralField, use LiteralField
API CHANGE Removed NamedLabelField, use LabelField

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64420 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-16 13:22:36 +00:00