Ingo Schommer
12f2e1e176
Merge branch 'pjax-multiple'
2012-06-05 14:01:18 +02:00
Mateusz Uzdowski
64c0d2fb0a
MINOR: add comments to FormField's RightTitle
2012-06-01 15:01:42 +12:00
Sean Harvey
5462cdaab2
MINOR Removing "." from the end of validation messages
2012-06-01 13:13:06 +12:00
Sean Harvey
7fe0858be1
API CHANGE Marked Form::unsetFieldFromTab() as deprecated. Please use
...
Fields() and the FieldList API instead.
2012-05-31 14:29:58 +12:00
Ingo Schommer
5178954311
UNFINISHED Processing multiple PJAX responses on CMS JavaScript, introducing data-pjax-fragment attribute to identify reloadable template parts
2012-05-30 15:07:13 +02:00
Ingo Schommer
21beb86f8f
MINOR Using localized name rather than model class for GridFieldAddNewButton UI (related to 74d444cf
and pull request #452 )
2012-05-29 15:22:28 +02:00
Ingo Schommer
5b03f49245
BUGFIX Respecting server-overrides on X-Pjax responses during ajax redirects. Fixes GridFieldDetailForm redirect after delete, e.g. in ModelAdmin. Partially reverts 8b4b896
. Closes pull request #488
2012-05-29 11:34:47 +02:00
Sean Harvey
d7a8fa9266
BUGFIX If RequiredFields::php() is given any fieldName that is NULL, don't attempt to validate a NULL field.
2012-05-29 14:37:26 +12:00
Sean Harvey
0235a8c0c7
BUGFIX Partially reverting 28e43bdc
which broke media insertion
2012-05-28 22:27:20 +12:00
Sean Harvey
c3eabffcb9
MINOR Use shorthand {class}::get() syntax instead of DataList::create()
...
in core code.
2012-05-28 21:13:42 +12:00
Sean Harvey
71256ea7f8
MINOR Update class docs for OptionsetField to use short DataList query
2012-05-28 21:12:59 +12:00
Sam Minnee
867b9a37d2
Merge branch 'master' of github.com:silverstripe/sapphire
2012-05-28 13:26:06 +12:00
Sam Minnee
7994b73cb7
MINOR: Added i18n to Delete action
2012-05-28 12:05:41 +12:00
Jeremy Bridson
fb78cab8e6
ENHANCEMENT:Trac#7218 - changed delete button on gridfield to cross and added tooltips for both edit and delete.
2012-05-28 12:03:38 +12:00
Sam Minnée
881c186f6d
Merge pull request #493 from halkyon/addnew_button_name
...
ENHANCEMENT Allow calling setButtonName() on a GridFieldAddNewButton to ...
2012-05-27 16:58:49 -07:00
Sean Harvey
0952df49fb
ENHANCEMENT Allow calling setButtonName() on a GridFieldAddNewButton to customise the button name
2012-05-28 11:55:43 +12:00
Naomi Guyer
28e43bdc88
ENHANCEMENT: File/Image UI fixes
...
* Replaced cancel/delete button in files area
* Consolidated Image upload styles with AssetUpload styles
* Changed name of step 2 in image upload
* Made image editing hidden by default, so multiple files can be seen,
and added ability top open and close
* Tweaked styles in on page upload field (status colour and file name
width)
2012-05-28 11:50:34 +12:00
Sean Harvey
74d444cf2f
BUGFIX Ensure "Add [modelClass]" is shown instead of using the field name of the GridField, partially reverts 16982ba17c
which broke breadcrumbs in SecurityAdmin
2012-05-28 11:43:47 +12:00
Sam Minnée
497aa9bfa9
Merge pull request #490 from simonwelsh/cms-oembed
...
BUGFIX: Provide a default width and height of 100px for those endpoints ...
2012-05-24 20:49:54 -07:00
Simon Welsh
15a5dab395
MINOR: Add a fallback thumbnail image for oEmbed inserts
2012-05-25 15:40:17 +12:00
Ingo Schommer
5b0734943f
MINOR Fixed GridFieldAddNewButton label
2012-05-24 23:39:47 +02:00
Ingo Schommer
fa445ad13f
Merge pull request #452 from adrexia/sapphire
...
---
* Added a separate component to grid field to hold buttons.
* Updated templates for changes
* Updated comments
Conflicts:
css/AssetUploadField.css
css/GridField.css
2012-05-24 23:06:46 +02:00
Simon Welsh
30ecb9f531
BUGFIX: Provide a default width and height of 100px for those endpoints that don't provide one.
2012-05-24 18:16:00 +12:00
Mateusz Uzdowski
63ed0cba32
BUGFIX: return a meaningful translatable string when resource is invalid
2012-05-24 17:00:21 +12:00
Simon Welsh
bb29ff3611
FEATURE: Allow adding media to the CMS using oEmbed
2012-05-24 17:00:21 +12:00
Sean Harvey
1ed5e3c9be
Merge pull request #485 from halkyon/deprecate_director_statics_for_controller
...
Deprecate director controller static functions
2012-05-23 15:54:57 -07:00
Sean Harvey
a84ef8d8f3
MINOR Don't use template method Actions internally in Form
2012-05-24 10:49:47 +12:00
Sean Harvey
c7e0cee637
API CHANGE Add Form->getController() and use this instead of Controller::curr() in FileIFrameField
...
API CHANGE Add Form->getName() and deprecate Form->Name(), use getName() instead.
2012-05-24 10:46:57 +12:00
Sean Harvey
60c72c40d9
API CHANGE Use of the DropdownField $emptyString argument is now
...
properly deprecated (has been marked as deprecated since 2.3). Please
use setEmptyString() on the DropdownField instance instead.
2012-05-23 22:59:40 +12:00
Sean Harvey
77c2365b87
MINOR Replacing deprecated static function calls to Director with
...
current Controller instance replacements.
2012-05-23 21:50:02 +12:00
Naomi Guyer
16982ba17c
ENHANCEMENT: Make GridFieldAddNewButton Content more specific
...
* Alter Grid Field "Add New" Button to take the name of the table (i.e.
"Add Member")
* Alter table names in security section to be singular so the button
text makes sense
2012-05-21 17:47:14 +12:00
Naomi Guyer
1747298786
ENHANCEMENT: Make GridFieldButtonRow more adaptable
...
* Add ability to choose where to put buttons (in buttonRow, toolbar
header, etc)
* Adjust styles to take these changes into account
2012-05-21 14:41:46 +12:00
Naomi Guyer
a7336e9dca
ENHANCEMENT: Move GridField buttons out of table (fixes 7213)
...
* Added a separate component to grid field to hold buttons.
* Updated templates for changes
* Updated comments
2012-05-21 14:19:59 +12:00
Sean Harvey
7dc2d61871
MINOR Removing whitespace
2012-05-18 18:05:45 +12:00
Naomi Guyer
a412aa0ce4
BUGFIX: Filter IDs
...
Change ID of action buttons in the filter panel to be unique
2012-05-18 18:01:07 +12:00
Sean Harvey
3f932d6bad
Merge pull request #464 from mateusz/os7299
...
BUGFIX: add capability of redirecting form actions.
2012-05-17 22:44:05 -07:00
Mateusz Uzdowski
8b4b896578
BUGFIX: add capability of redirecting form actions.
...
Form actions assume that they are reloading the form afterwards. But
this is not always the case - for example "delete" action will redirect
back to the panel, so we need to be able to set the X-Pjax headers
accordingly.
2012-05-18 17:36:06 +12:00
Sam Minnee
1025524d8c
API CHANGE: Added $insertBefore argument to GridFiedlConfig::addComponent()
2012-05-18 16:15:14 +12:00
Sam Minnee
c8e994d573
BUGFIX: Allow modification of a config's components after the grid field is instantiated.
2012-05-18 16:15:13 +12:00
Normann Lou
5290b81c55
ENHANCEMENT: don't show the paginating elements in the paginator when only one page, and keep 'view 1 - 5 of 5' there
2012-05-18 11:31:33 +12:00
Sean Harvey
18a92f922b
Merge pull request #454 from adrexia/7215-Fix-design-toggle-searchfields-gridfield
...
BUGFIX: GridField filter
2012-05-17 15:19:46 -07:00
Sean Harvey
e2aa635323
BUGFIX Ensure GridFieldExportButton uses "text/csv" as the MIME type
2012-05-17 14:54:29 +12:00
Naomi Guyer
f0c61c20df
BUGFIX: GridField filter
...
Make sure the new class is used consistently, and has the correct css
applied to it.
2012-05-17 11:15:53 +12:00
Naomi Guyer
6c8dbe1a56
BUGFIX: Fix where filter appears
...
Make filter only appear in GridFields that include the
GridFieldFilterHeader component
2012-05-16 16:50:11 +12:00
Naomi Guyer
458171ff92
ENHANCEMENT: Gridfield usability (fixes 7215)
...
1. Modified gridfield to use default colours
2. Added ability to show and hide the filter
3. Design changes to icons used
4. Gridfield template fixes: Took out broken mark-up from templates
(spans were being inserted inside spans), and adjusted styles. Added
extra class to template
5. Added "filter by ..." placeholder text to input fields
2012-05-16 12:18:23 +12:00
Ingo Schommer
0a6ec3d9c9
Merge pull request #443 from halkyon/sapphire
...
---
2012-05-14 15:33:48 +02:00
Ingo Schommer
45ae2465e8
Merge pull request #438 from ajshort/sapphire
...
---
These are some enhancements + tweaks I made as part of getting the advanced workflow module running in SS3:
* Added a readonly view button and action to GridField.
* Made LeftAndMain::getResponseNegotiator() public so CMS extensions can use it to generate responses.
* Fixed top tab background, made text more readable (http://i.imgur.com/yDmmY.png ).
* Allow fields in the CMS to not be change tracked using ".no-change-track".
* Made all icons 16x16 (some were different sizes, being cut off), and allow them without .ui-state-default.
* Fixed ToggleCompositeField and tweaked field styling.
2012-05-14 14:25:16 +02:00
Sean Harvey
9da92e04cf
API CHANGE Renamed setContainerFieldSet() to setContainerFieldList() to match the FieldList API.
...
API CHANGE Renamed rootFieldSet() to rootFieldList() to match the FieldList API.
2012-05-14 15:16:44 +12:00
Sean Harvey
a53cca8932
MINOR Renaming getFieldSet with getFieldList in FormScaffolder
2012-05-14 15:03:22 +12:00
Andrew Short
05cde92508
FEATURE: Implemented a view action for GridField, and a record viewing GridFieldConfig.
2012-05-12 18:49:56 +10:00
Ingo Schommer
ffbcf634bb
Merge pull request #420 from chillu/sapphire
...
---
See http://open.silverstripe.org/ticket/7261
2012-05-11 13:42:47 +02:00
Sean Harvey
39bd89879e
BUGFIX Setting MIME type for TableListField export explicitly, as HTTP::get_mime_type() requires a path to an actual file, in this case we're exporting data directly to the browser.
2012-05-11 14:26:25 +12:00
Ingo Schommer
6956b1be5c
Merge pull request #412 from adrexia/sapphire
...
---
The two bug fixes impact on the file area, but have wider reach.
BUGFIX: Colour Adjustments
Change the constructive button colour to match the colour used in the designs, and fix up calculations to produce the correct button colour.
BUGFIX: IE Colours
Replace hard coded colours in IE with variables, and refactor code so that shared IE7 and IE8 fixes are in one place.
ENHANCEMENT: UI Changes to FileUpload Area (TRAC-7219)
1. Add arrows to edit dropdowns
2. Adjust lightened fields so they dont look like input boxes, and fix rgba colours
3. Add ability to click file names to edit
4. Add feedback when edit button is hovered
5. Add feedback if a file has been opened for editing and shut again (saved changes, unsaved changes, unchanged)
6. Add ability to open and close all files to edit them all at once
7. Add overall feedback for file uploads, and fix NaN error
8. Fix up area to match design
9. Fix error messages so they fit in the provided space
10. Fix case where a single uploaded file errors
2012-05-10 10:27:11 +02:00
Sean Harvey
c1f7e0ed48
BUGFIX #7298 Fixed incorrect message in GridFieldDetailForm from en.yml language file.
2012-05-10 15:46:54 +12:00
Ingo Schommer
8c9560d288
ENHANCEMENT FieldList->setTabPathRewrites() for better backwards compatibility (see #7261 )
2012-05-09 17:18:16 +02:00
Naomi Guyer
d642eee28e
ENHANCEMENT: UI Changes to FileUpload Area (TRAC-7219)
...
1. Add arrows to edit dropdowns
2. Adjust lightened fields so they don't look like input boxes, and fix
rgba colours
3. Add ability to click file names to edit
4. Add feedback when edit button is hovered
5. Add feedback if a file has been opened for editing and shut again
(saved changes, unsaved changes, unchanged)
6. Add ability to open and close all files to edit them all at once
7. Add overall feedback for file uploads, and fix NaN error
8. Fix up area to match design
9. Fix error messages so they fit in the provided space
10. Fix case where a single uploaded file errors
2012-05-09 18:38:21 +12:00
Sean Harvey
fdebedd103
BUGFIX Ensure the form inside htmleditorfield-dialog element is redrawn when the form is lazy loaded by AJAX.
2012-05-09 17:11:59 +12:00
Stig Lindqvist
0af2d87bb3
MINOR Cleaned up the GridFieldDataColumns to be easier on the eyes and fixed the some method docblocks for the interface
2012-05-09 10:35:35 +12:00
Ingo Schommer
592d42e477
MINOR Stop using deprecated getTabIndex() in CreditCardField
2012-05-08 14:26:22 +02:00
Ingo Schommer
a2dbd69f2c
ENHANCEMENT Allow Controllers to opt-out or modify the back link behaviour in GridFieldDetailForm
2012-05-08 11:25:47 +02:00
Ingo Schommer
6d999aa6ba
ENHANCEMENT addExtraClass() support for Tab and TabSet
2012-05-08 11:25:44 +02:00
Normann Lou
7324712e9e
FEATURE: add Levelup component to GridField as GridFieldLevelup
2012-05-07 13:40:53 +12:00
Normann Lou
3b3b515571
API CHANGE Read-only fields no longer include companion hidden fields (see pull request #399 )
...
BUGFIX Remove legacy code and template which is never picked-up so that TextareaField becomes 'readonly' when it is transfered to readonly field. Change TextareaFieldTest test cases to address a 'readonly' textarea field displaying the special html characters correctly.
2012-05-03 14:24:03 +02:00
Sean Harvey
151abde17d
Merge pull request #388 from chillu/trac/7170-i18n-sprintf-injections
...
#7170 i18n sprintf injections
2012-05-02 16:18:30 -07:00
Sean Harvey
6483cdd204
Merge pull request #382 from chillu/trac/7217-group-default-on-member
...
Group default on member (#7217 )
2012-05-01 21:43:05 -07:00
Ingo Schommer
7b18d9d0da
MINOR Switching _t() calls from sprintf() to using injection parameters ( #7170 )
2012-05-01 22:17:00 +02:00
Ingo Schommer
2288d80c30
Merge pull request #387 from sminnee/sapphire
...
---
The primary goal of this branch was to fix the sort bugs in AssetAdmin, however, it started a bit of a yak shave in that the API around SQLQuery was poor. The biggest change that this pull request makes is it changes the format of SQLQuery::$select to contain aliases as array keys (and consistently puts the "implicit alias" in there to assist with various query generation logic), but it also makes a bunch of changes to avoid direct access of that property.
2012-05-01 17:57:03 +02:00
Sam Minnee
8661164c19
API CHANGE: Add SQLQuery::clearSelect(), SQLQuery::selectField() and SQLQuery::itemisedSelect() to make it easier for other subsystems to use SQLQuery without resorting to direct property access.
...
API CHANGE: Remove DataQuery::select() in place of DataQuery::selectField().
BUGFIX: Remove direct property access to SQLQuery::$select
2012-05-01 17:57:39 +12:00
Sean Harvey
390d3d3fc4
MINOR Fixed broken notice
2012-05-01 17:37:18 +12:00
Sean Harvey
0882741f54
API CHANGE Renamed setModel for DataModel instances to setDataModel for
...
semantics, and also to allow a field name called "Model"
2012-05-01 14:45:44 +12:00
Mateusz Uzdowski
ee360c1877
BUGFIX: include derived classes for attaching in the UploadField.
2012-05-01 13:37:15 +12:00
Ingo Schommer
c2339d2181
API CHANGE Removed FormResponse handling for erroneous ajax requests in Form->validate(), use javascript validation instead, or reload the whole form with new HTML including the error messages
2012-04-30 17:15:30 +02:00
Ingo Schommer
f873707e9d
ENHANCEMENT Prepopulating group on new members ( fixes #7217 )
2012-04-30 14:35:25 +02:00
Ingo Schommer
72eadef113
ENHANCEMENT GridFieldDetailForm->setItemEditFormCallback()
2012-04-30 13:46:51 +02:00
Ingo Schommer
fed2785173
ENHANCEMENT Per-instance customisation of GridFieldDetailForm_ItemRequest
2012-04-30 12:31:17 +02:00
Ingo Schommer
8489ff37db
Merge pull request #359 from silverstripe-big-o/sapphire
...
---
When open an image form loaded from TinyMCE Content, change the looks of the popup, such as popup heading (change from "Insert Image" to "Update Image"), action button label (change from "Insert" to "Update"), hiding the cancelling button on the top right corner which still needs to show when in inserting mode
Conflicts:
lang/en.yml
2012-04-27 10:15:16 +02:00
Mateusz Uzdowski
b561786825
MINOR: change the ugly user-facing CSRF message to more friendly
...
User does not necessarily knows what CSRF is, and tends to get scared by
this, thinking he has abused something. On the other hand users tend to
know what session expiry means.
2012-04-26 13:57:16 +12:00
Sean Harvey
bb20587f01
ENHANCEMENT GridFieldExportButton allows an anon function to return the
...
value of a related object. Useful for handling has_many/many_many data
in a single CSV column.
2012-04-23 20:26:41 +12:00
Mateusz Uzdowski
fbbdbbcb3b
BUGFIX: list only files the autoset relation supports in UploadField
...
Otherwise when user selects an object that does not fit the relation,
the system will throw an Exception.
2012-04-23 15:01:59 +12:00
Mateusz Uzdowski
47e3052aaa
ENHANCEMENT: allow folder selection when attaching files from the CMS
...
http://open.silverstripe.org/ticket/7046
UploadField would default to one folder only, and wouldn't allow asset
tree traversal. HtmlEditorField MediaForm has this capability, so added
it here in a similar fashion via TreeDropdownField.
2012-04-23 12:08:16 +12:00
Sean Harvey
e12a82e28f
MINOR Documentation on EmailField type attribute change
2012-04-21 11:09:34 +12:00
Normann Lou
e1372b3794
ENHANCEMENT: toggle header and action label for image dialog popups (from content TinyMCE image icon)
2012-04-20 18:04:49 +12:00
Simon Welsh
13865cb7ac
BUGFIX Don't filter out attributes that are '0'
2012-04-20 12:22:40 +12:00
Sean Harvey
80facbd81b
BUGFIX Ensure merging correctly
2012-04-19 14:26:26 +12:00
Sean Harvey
23c3fb83fb
ENHANCEMENT EmailField now uses type="email", which has the benefit of
...
allowing email validation when using the required="required" attribute.
If using an old browser, the "email" type will fallback to "text"
2012-04-19 14:06:47 +12:00
Robert Curry
842784c8aa
ENHANCEMENT: Fixes #7010 . Move DisplayFields, FieldCasting and FieldFormatting functions from GridField to GridFieldDataColumns.
2012-04-19 12:44:59 +12:00
Mateusz Uzdowski
a9e7de0cf4
BUGFIX: make UploadField aware of relations to derived classes (os7140)
...
UploadField was relying entirely on the File::get_class_for_file_extension to
select a class, so it could only create File or Image objects. This
would break the relationships based on derived objects. Also make it
respect the FileField::relationAutoSetting.
2012-04-19 12:18:36 +12:00
Mateusz Uzdowski
47d7392e88
BUGFIX: remove unnecessary write from uploading routine
2012-04-19 12:13:03 +12:00
Mateusz Uzdowski
5d7f6a0d69
MINOR: add some comments to UploadField
2012-04-19 12:13:03 +12:00
Ingo Schommer
7f62ad0f3e
Merge branch 'master' into 7094-combine-tree-edit-view
2012-04-18 14:19:55 +02:00
Robert Curry
5603fbe153
ENHANCEMENT: Fixes #7059 . Add test for allowedMaxFileNumber to UploadFieldTest.
2012-04-18 14:25:14 +12:00
Ingo Schommer
a393d3937b
ENHANCEMENT Anonymous function support in GridField->setFieldFormatting()
2012-04-17 17:11:43 +02:00
Ingo Schommer
ee70e0a5b7
MINOR Fixed returns of Form->unsetValidator()
2012-04-17 11:03:09 +02:00
Sean Harvey
5bb31c4e81
BUGFIX Stop "Insert Link" or "Insert Image" header disappearing inside the HtmlEditorField toolbar
...
when clicking a link type
2012-04-17 15:47:40 +12:00
Mateusz Uzdowski
59663f9289
BUGFIX: fix up some E_STRICT errors
2012-04-17 11:51:55 +12:00
Ingo Schommer
d44f6b3e1f
MINOR Removed deprecated usage of $priority argument in _t() calls
2012-04-15 17:17:17 +02:00
Sean Harvey
d7973ea006
MINOR Don't show warning if running tests
2012-04-15 10:50:20 +12:00
Simon Welsh
f07258f3cf
MINOR Update @package values to match renaming sapphire
2012-04-15 10:50:19 +12:00
Simon Welsh
3a6341a251
API-CHANGE sapphire folder can now be renamed.
2012-04-15 10:50:19 +12:00
Simon Welsh
f8082e4814
MINOR Add newline to end of files without one
2012-04-15 10:50:19 +12:00
Sean Harvey
7e3a698d56
BUGFIX Fixed missing $properties arg to DatalessField::SmallFieldHolder
2012-04-14 23:40:03 +12:00
Will Rossiter
7df26fd702
BUGFIX: fix missing TabSet template from previous changes and selection group using wrong holder.
2012-04-14 22:08:00 +12:00
Will Rossiter
07d2d5273a
ENHANCEMENT: populate FormField:: on the fly based on class name of field rather than requiring explict definition.
2012-04-14 17:36:19 +12:00
Will Rossiter
907568b182
ENHANCEMENT: move hard coded template HTML for composite field and field group out to separate template files.
2012-04-14 17:36:08 +12:00
Ingo Schommer
b025b95ede
ENHANCEMENT Lazy-loading image and link dialogs for HtmlEditorField, to avoid unnecessary processing overhead on initial CMS load (also means they'll never get loaded if not required, e.g. in ReportAdmin)
2012-04-12 23:53:12 +02:00
Sam Minnée
977e9f3576
Merge pull request #306 from silverstripe-big-o/report-fixes
...
API-CHANGE: new GridFieldFooter component
2012-04-11 22:30:10 -07:00
Julian Seidenberg
e9dc610448
API-CHANGE: new GridFieldFooter component
2012-04-12 16:13:47 +12:00
Sean Harvey
2b8e14fdff
API CHANGE Fixing CompositeField/SelectionGroup
...
performReadonlyTransformation and performDisabledTransformation to be
consistent and conform with parent FormField. $trans argument is no longer allowed, just uses
DisabledTransformation or ReadonlyTransformation instead.
2012-04-12 12:24:06 +12:00
Sean Harvey
852ffcf492
MINOR MemberDatetimeOptionsetField::validate() now passes in $validator argument instead of getting it from the form, which is how other FormFields work like CompositeField
2012-04-12 12:23:18 +12:00
Sean Harvey
865cde0c39
BUGFIX FormField::name_to_label() is now declared as static as it was never used as an instance method
...
API CHANGE FormField::validate() $validator argument is now required for FormField classes
2012-04-12 12:18:55 +12:00
Sean Harvey
8369cded32
MINOR Code formatting in EmailField
2012-04-12 12:17:30 +12:00
Sean Harvey
1e61b76ca8
MINOR ConfirmedPasswordField::validate() now passes in $validator
...
argument instead of getting it from the form, which is how other
FormFields work like CompositeField
2012-04-12 12:14:42 +12:00
Sean Harvey
859f7add20
MINOR TableField_Item::Fields() now conforms to parent
...
TableListField_Item::Fields() for E_STRICT compliance
2012-04-12 12:13:22 +12:00
Sean Harvey
42988ecb18
BUGFIX Argument hinting of FormField instance for TabSet::push() to
...
comply with parent CompositeField::push() for E_STRICT compliance
2012-04-12 12:11:53 +12:00
Sean Harvey
9cf1686786
MINOR Code formatting fixes for CurrencyField
2012-04-12 12:11:22 +12:00
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
Ingo Schommer
6cd91ff449
Merge pull request #299 from ajoneil/sapphire
...
---
Conflicts:
forms/NumericField.php
2012-04-11 15:36:35 +02:00
Andrew O'Neil
716ff9dcfa
MINOR: Ensure all form fields have FieldHolder() with identical signature to FormField::FieldHolder(). Fixes E_STRICT warnings.
2012-04-11 18:07:55 +12: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
Andrew O'Neil
f811103243
MINOR: Remove redundant setDisabled() methods - this method already exists in FormField. Fixes E_STRICT notice.
2012-04-11 16:17:44 +12:00
Sean Harvey
3e307e00fe
MINOR Removing old remains of NumericField.js validation which was
...
removed in 9f3344b355
2012-04-11 15:55:07 +12:00
Ingo Schommer
a64715beeb
BUGFIX Calling tinyMCE.init() in sync with entwine rules to avoid uncached loading interfereing with call order ( fixes #6877 )
2012-04-10 21:41:00 +02:00
Normann Lou
6671ae7ee9
BUGFIX SSF-124 remove $extraClass in the sortable header of GridField, simply add an 'col-$getName' as the distinguishable class for each column header, so as not to lose the css selector
2012-04-10 17:55:14 +12:00
Normann Lou
26cec90ba7
ENHANCEMENT: SSF-124 make GridFieldSortableHeader to show the extra classes for each of the header field.
2012-04-10 12:04:22 +12:00
Julian Seidenberg
93563021c6
BUGFIX: SSF-168 adding Grid field print header default of null
2012-04-10 11:15:53 +12:00
Ingo Schommer
cf304044b8
Merge branch 'master' into integration
2012-04-10 00:39:29 +02:00
Ingo Schommer
1742b4b742
BUGFIX Fixed loading/saving regressions due to new PJAX logic introduced in e01b0aa3d0
2012-04-10 00:37:14 +02: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
a44b67bae2
API CHANGE Moved RequestHandler->isAjax() to SS_HTTPRequest->isAjax()
2012-04-05 23:00:22 +02:00
Normann Lou
a946096e29
MINOR: SSF-168 code convention correction
...
MINOR: SSF-168 add _t()'s where necessory in GridField print view
2012-04-05 11:02:42 +12:00
Ingo Schommer
40d73127ae
MINOR Using late static binding instead of Object::create() calls
2012-04-04 17:10:31 +02:00
Ingo Schommer
6517f4496b
Merge pull request #273 from ajoneil/sapphire
...
---
This allows DataList::create(SiteTree) as equivalent to Object::create(DataList, SiteTree), without
having to have a create() function on DataList.
Required for E_STRICT compliance, as child classes cant override create() if they change the arguments.
DBField::create() is also renamed to DBField::create_field(), as this does not just call the constructor, which all other cases of create() do.
Conflicts:
tests/model/DateTest.php
tests/model/DatetimeTest.php
2012-04-04 16:48:16 +02:00
Felipe Skroski
7740bb326a
ENHANCEMENT SSF-168 moved print and csv export buttons to the top of the grid
2012-04-04 14:09:52 +12:00
Felipe Skroski
4ffef20b09
ENHANCEMENT: SSF-168 updated print styles to the datagrid
2012-04-04 14:09:52 +12:00
Normann Lou
721184c4b3
MINOR SSF-297 add more available information to GridField print view
2012-04-04 14:07:07 +12:00
Normann Lou
95cdfd7903
BUGFIX destroy $item in the scope of where $item is defined for GridFieldPrintButton->generatePrintData.
2012-04-04 11:29:25 +12:00
Simon Elvery
429ff64d7c
Merge branch 'master' of https://github.com/silverstripe/sapphire.git into forms
2012-04-03 15:06:23 +10:00
Simon Elvery
68db977ef1
MINOR: Provide a setter for heading level on HeaderField object.
2012-04-03 15:05:21 +10:00
Normann Lou
d71b04fa19
ENHANCEMENT make gridfield status applied with header filter and header sort before print
2012-04-03 17:04:19 +12:00
Normann Lou
ba02e500e7
FEATURE added GridFieldPrintButton compoonent
2012-04-03 16:57:48 +12:00
Normann Lou
00b904b01c
ENHANCEMENT make gridfield status applied with header filter and header sort before export
2012-04-03 16:57:48 +12: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
f0ee711f52
Merge pull request #275 from halkyon/e_strict_support
...
First round of fixes for E_STRICT compliance
2012-03-28 02:42:26 -07:00
Sean Harvey
e097f6e1a8
MINOR Fixes to method arguments in core classes for E_STRICT support.
...
API CHANGE Remove abstract static function and just use static functions
in Authenticator (PHP 5.3+ doesn't support abstract static functions)
2012-03-28 22:41:42 +13:00