Damian Mooyman
0b1f297873
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
README.md
admin/code/LeftAndMain.php
admin/css/screen.css
admin/scss/screen.scss
api/RestfulService.php
conf/ConfigureFromEnv.php
control/injector/ServiceConfigurationLocator.php
control/injector/SilverStripeServiceConfigurationLocator.php
core/ClassInfo.php
core/Object.php
css/AssetUploadField.css
css/ComplexTableField_popup.css
dev/CSSContentParser.php
dev/DevelopmentAdmin.php
docs/en/changelogs/index.md
docs/en/misc/contributing/code.md
docs/en/reference/execution-pipeline.md
filesystem/GD.php
filesystem/ImagickBackend.php
filesystem/Upload.php
forms/Form.php
forms/FormField.php
forms/HtmlEditorConfig.php
forms/gridfield/GridFieldDetailForm.php
forms/gridfield/GridFieldSortableHeader.php
lang/en.yml
model/Aggregate.php
model/DataList.php
model/DataObject.php
model/DataQuery.php
model/Image.php
model/MySQLDatabase.php
model/SQLQuery.php
model/fieldtypes/HTMLText.php
model/fieldtypes/Text.php
scss/AssetUploadField.scss
search/filters/SearchFilter.php
security/Authenticator.php
security/LoginForm.php
security/Member.php
security/MemberAuthenticator.php
security/MemberLoginForm.php
security/Security.php
tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
tests/control/HTTPTest.php
tests/control/RequestHandlingTest.php
tests/filesystem/UploadTest.php
tests/forms/FormTest.php
tests/forms/NumericFieldTest.php
tests/model/DataListTest.php
tests/model/DataObjectTest.php
tests/model/TextTest.php
tests/security/MemberAuthenticatorTest.php
tests/security/SecurityDefaultAdminTest.php
tests/view/SSViewerCacheBlockTest.php
tests/view/SSViewerTest.php
2014-11-18 12:45:54 +13:00
Jeremy Shipman
d7eb2757fe
NEW: Make the record count in GridFieldFooter optional
2014-11-14 09:56:39 +13:00
Naomi Guyer
ec0c259c17
BUG: Reinstate tab and form focus states (fixes CMS #732 and #817 )
...
* Added methods to track and restore field focus
* Added a trigger event when tabstate reset
Update LeftAndMain.EditForm.js
2014-10-26 14:21:47 +13:00
Damian Mooyman
2c24d51c0b
Revert #3358
2014-08-04 12:13:19 +12:00
Sean Harvey
8c56e54a47
Fixed usage of .XML with .ATT for attributes in CheckboxSetField
2014-08-04 10:18:34 +12:00
Sean Harvey
b2dac644a0
BUG Fixed escaping of name/value in options of form fields
...
DropdownField was currently escaping options, but CheckboxSetField and
OptionsetField were not. This fixes them to be consistent.
2014-08-04 09:55:35 +12:00
Sean Harvey
9048eab4a2
Merge branch '3.1'
2014-02-12 11:06:54 +13:00
Damian Mooyman
1c7af2fd04
BUG Fix missing description element on FieldGroup_holder.ss
2014-02-10 10:38:00 +13:00
Ingo Schommer
0d7e9a9692
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
_config/routes.yml
docs/en/topics/datamodel.md
forms/DropdownField.php
2014-02-04 08:19:04 +13:00
Will Rossiter
079b29bfff
FIX Add missing extraClass to FieldGroup_holder
...
FieldGroup_holder doesn't use FieldGroup
2014-01-28 20:00:20 +13:00
Simon Welsh
39d42e4ea3
Merge branch '3.1'
2014-01-09 08:22:47 +13:00
Will Rossiter
770e23f8e1
Merge pull request #2270 from ARNHOE/3.1-updatedfieldgroup
...
BUG Updated fieldgroup class and example code
2013-12-20 19:14:21 -08:00
Will Rossiter
5728fc3a9a
Merge pull request #2484 from nedmas/fix-creditcardfield-to-use-attributeshtml
...
FIX: Change CreditCardField to use AttributesHTML
2013-12-20 16:50:15 -08:00
Ingo Schommer
f29d51f433
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
docs/en/reference/dataobject.md
lang/es.yml
2013-12-19 20:23:09 +01:00
Loz Calver
06d7bb77c0
FIX: Defer loading of UploadField EditForm iframes ( fixes #2711 )
...
Also addresses issue #1439 .
I don’t like the binding iframe.on('load') events in the onclick handler, but apparently Entwine doesn't support binding on iframes.
AssetAdmin and HtmlEditorField support added
2013-12-19 09:11:31 +00:00
Andrew Short
bedf292612
Merge branch '3.1'
...
Conflicts:
docs/en/reference/execution-pipeline.md
lang/nl.yml
2013-11-11 18:18:25 +11:00
Nathan J. Brauer
fee54c75f0
API: Change DropdownField::getSource() to not return the emptyString value.
2013-10-18 11:16:27 +13:00
Will Rossiter
1c983bc16d
API: LookupField::Field now returns an HTMLText instance.
...
Moved LookupField into a template, removed getSource() as the DropdownField getSource() has been simplified to just a getter
2013-10-18 10:28:17 +13:00
Ingo Schommer
e1b7df38ef
HTML attr encoding for UploadField config
...
Also fixed UploadField operation with canUpload=false,
which broke the JS because no config could be found,
since the <input> field wasn't present. We can't put the data-config
attribute on the field holder, since fields can be rendered
without their field holder through FormField->SmalLFieldHolder().
Fixes https://github.com/silverstripe/silverstripe-cms/issues/874
2013-10-17 10:55:11 +02:00
Ingo Schommer
60fc7e5346
Merge remote-tracking branch 'origin/3.1'
2013-10-06 19:07:39 +02:00
Tom Densham
37e032df86
API: Change CreditCardField to use AttributeHTML
2013-10-03 15:26:31 +01:00
Tom Densham
d79d50770c
FIX: Make CreditCardField use template
2013-10-03 10:51:39 +01:00
Ingo Schommer
455e550d9a
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
docs/en/topics/testing/create-silverstripe-test.md
forms/Form.php
i18n/i18n.php
model/Image.php
2013-09-27 19:22:14 +02:00
Will Rossiter
0a795952b9
Merge pull request #2377 from phptek/issue/2375
...
UploadField showed 2 descriptions in CMS
2013-09-01 22:57:29 -07:00
Russell Michell
a1b04cb371
BUGFIX: Issue #2375
...
- UploadField showed 2 descriptions in CMS with one call to setDescription().
- Removed UploadField-specific template ref to $Description, in favour of using the "default" in FormField_holder.ss
2013-09-02 12:31:33 +12:00
Ingo Schommer
20b49e215c
Merge pull request #2136 from nedmas/fix-remove-export-button-padding
...
FIX: GridField button styling
2013-08-30 00:24:21 -07:00
Ingo Schommer
7ae75c1a89
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
forms/HtmlEditorField.php
2013-08-16 13:37:44 +02:00
Ingo Schommer
eb17cf3eb9
Merge pull request #2275 from ARNHOE/3.1-updatefieldgroupstyle
...
BUG Fieldgroup styling
2013-08-15 12:14:05 -07:00
Ingo Schommer
6352201738
No <label for> on OptionsetField/CheckboxSetField holder
...
It produces invalid HTML since the "for" attribute doesn't
map to any HTML input field. Each individual checkbox or radio button
input element has its own <label for>
2013-08-13 18:05:11 +02:00
Ingo Schommer
2a35f2f928
Merge remote-tracking branch 'origin/3.1'
2013-08-07 17:34:11 +02:00
Ingo Schommer
afe06661ef
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
admin/templates/Includes/LeftAndMain_Menu.ss
admin/templates/Includes/ModelAdmin_ImportSpec.ss
admin/templates/Includes/ModelAdmin_Tools.ss
admin/templates/LeftAndMain.ss
admin/templates/ModelSidebar.ss
i18n/i18n.php
templates/ComplexTableField.ss
templates/ComplexTableField_popup.ss
templates/FileIFrameField_iframe.ss
templates/Includes/GridFieldItemEditView.ss
templates/Includes/TableListField_PageControls.ss
templates/RelationComplexTableField.ss
templates/TableField.ss
templates/TableListField.ss
2013-08-07 17:14:47 +02:00
Ingo Schommer
00ffe72944
Translations: Switch to Transifex format
...
- Based on new (last) translation download from getlocalization.com
- Removed untranslated strings. Getlocalization started including those at some point
which is highly annoying, unnecessary and breaks the new transfix system,
since it'll mark all of the english strings as actual translations
- Avoid dots in entities. It confuses the Transifex YML parser
- Removed some locales unknown to Transifex which didn't have any translations anyway
- Removed "lolcat" locale, uses custom notation (en@lolcal)
which SilverStripe's i18n system can't handle
(needs mapping from SS naming to Zend naming)
- Renamed "Te Reo/Maori" locale from "mi_NZ" to "mi" (Transifex/CLDR notation)
- Namespaced all entities used in templates (deprecated usage)
- Converted dots to underscores where template filenames are used for namespaces,
since Transifex YML parsing handles them as separate YML keys otherwise
- Removed whitespace in entity names, SilverStripe i18n can't handle it
- Only allow selection of locales registered through i18n::$all_locales to avoid
issues with unknown locales in Zend's CLDR database
2013-08-07 00:25:16 +02:00
Arno Poot
81843c7fb8
Fieldgroup Warped $title in a if
2013-08-05 18:12:35 +02:00
Arno Poot
fefb7af0f5
BUG Fieldgroup styling
2013-07-28 15:52:39 +02:00
Arno Poot
b68cd6610c
Updated fieldgroup class and example code
2013-07-26 16:01:24 +02:00
Hamish Friedlander
0a79ac3592
Merge branch 'origin/3.1'
...
Conflicts:
templates/forms/CheckboxSetField.ss
templates/forms/FormField_holder.ss
templates/forms/OptionsetField.ss
2013-07-19 16:25:38 +12:00
ARNHOE
2427d57fa5
Updated loop/if/with to be more consistent
2013-07-14 20:43:52 +12:00
Mateusz Uzdowski
b24a0a567e
BUG Remove extraneous </div> breaking IE8 image embedding (os#8218)
...
Editor was not able to add images to TinyMCE - both newly uploaded and
old ones from the local assets.
2013-07-09 21:49:23 +02:00
Tom Densham
3596892001
FIX: GridField button styling
...
Remove all top/bottom margins from buttons and apply to GridFieldButtonRow component. Ensure that all buttons are added to a suitable GridFieldButtonRow in ModelAdmin, SecurityAdmin and Group.
2013-06-21 14:22:00 +01:00
Ingo Schommer
0c4ec4708b
API Using $HolderID for form field container templates
...
Replaces duplicate $ID usage.
See https://github.com/silverstripe/silverstripe-framework/pull/1873
2013-05-31 19:46:11 +02:00
Ingo Schommer
5a1d476e8d
Merge branch 'idvalidattr' of git://github.com/wilr/sapphire into wilr-idvalidattr
2013-05-31 19:27:19 +02:00
Ingo Schommer
88536998b9
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
2013-05-31 18:08:59 +02:00
Damian Mooyman
7f057ce343
API UploadField functions on new records
...
Fixed regression from 1e5d40474d
(UploadField::canPreviewFolder).
Merged in pull request #2009 - (6018bdd631
).
Merged pull request #1259 (34bfc862ee
).
2013-05-27 15:22:59 +12:00
Will Rossiter
ca87b8b794
API: Form Field ID attribute should follow HTML specification
...
Fixes: http://open.silverstripe.org/ticket/4431 .
Changes Form and Form Field classes to make use of Convert::raw2htmlid() which follows http://www.w3.org/TR/REC-html40/types.html#type-cdata .
Introduces a FormTemplateHelper class to assist in these sort of updates in the future.
2013-05-26 11:11:55 +12:00
jean
6018bdd631
NEW 'Choose another file' button on upload field AAS-917
2013-05-25 18:38:02 +12:00
Sam Minnee
d97ca43cd0
Merge branch '3.1'
...
Conflicts:
README.md
dev/install/install.php5
forms/ConfirmedPasswordField.php
tests/forms/FormTest.php
2013-05-23 19:01:58 +12:00
Ingo Schommer
842dc98681
Added "saves into..." label to UploadField template
...
CMS users shouldn't need to guess where their files will end up.
2013-05-14 10:39:05 +02:00
Ingo Schommer
a1216b5e32
Merge pull request #1250 from wilr/gridfield-action-fixes
...
FIX: Do not blindly pass input values to GridField_FormAction URL's
2013-05-08 04:20:40 -07:00
Will Morgan
17e31fc609
Merge pull request #1 from silverstripe/master
...
Syncing back because I suck at Git
2013-05-08 03:45:51 -07:00
uniun
c48eca1615
The MAX_FILE_SIZE field must precede the file input field.
...
More here: http://php.net/manual/en/features.file-upload.post-method.php
2013-05-02 11:15:55 +03:00
Will Morgan
72a7f0e672
AJAX friendly responses for Security class
...
Final work around issue #1802 - creating templates for complex layout
operations and removing HTML from this controller.
2013-04-26 12:29:35 +01:00
Nicolaas
08bf2aa91e
removing potentially invalid html in email
...
The generic email template encapsulates the "body" content in a paragraph mark. This is undesirable as it can lead to invalid HTML. Rather than using a paragraph, it is better to have a div encapsulating the content.
The underlying reason for this is that $Body is usually HTML and this can included block elements (div, p, etc...) that are not allowed within paragraphs (p).
It is important that the HTML is valid, because it will reduce the likelihood for it being marked as spam, because it is less likely to show up strange formatting and for use of tools like emogrifier.
2013-04-16 10:38:08 +02:00
Will Rossiter
dda6fa6600
Add no results warning to GridField print view.
2013-03-05 10:25:19 +13:00
Hamish Friedlander
7efae6b95f
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-02-18 14:31:57 +13:00
Ingo Schommer
f8bbc0a726
BUGFIX Escape HTML in DropdownField and ListboxField
...
Fixes reflected XSS in Group titles when using
in group selections (e.g. in "New Member" form).
2013-02-17 23:27:15 +01:00
Jeremy Bridson
0fade6c9d3
BUGFIX:fixed styling of asset upload page and dialog in the asset admin and media insert via WYSIWYG editor open/8231.
2013-02-04 14:15:27 +13:00
Ingo Schommer
634c91c6ff
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
email/Mailer.php
2013-01-30 12:46:24 +01:00
Mateusz Uzdowski
3111ad12fa
BUG Remove extraneous </div> breaking IE8 image embedding (os#8218)
...
Editor was not able to add images to TinyMCE - both newly uploaded and
old ones from the local assets.
2013-01-30 16:22:05 +13:00
Jean-Fabien
55f3ec1371
FIX: Added error message fields to default search form
2013-01-29 18:03:47 +01:00
Nicolaas
9ac3cde00b
Fix typo in templates/Controller.ss
2013-01-23 23:55:34 +01:00
Ingo Schommer
f3c0669fec
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
_config/uploadfield.yml
css/UploadField.css
forms/UploadField.php
scss/UploadField.scss
templates/UploadField.ss
tests/forms/uploadfield/UploadFieldTest.php
2013-01-11 10:02:39 +01:00
Sam Minnee
cc7318fde4
NEW: Added canAttachExisting config option for UploadField.
...
This is the companion setting to canUpload, letting you control whether existing files from the asset store can be referenced. It's particularly useful when using UploadField on the front-end.
2013-01-11 09:29:02 +01:00
Sam Minnee
2fdd9a3b13
FIX: Allow images attached to UploadFields to be unlinked without File::canEdit() or File::canDelete() permission.
...
Although editing meta-data or deleting permanently would require File editing/deleting permissions, merely linking to a record does not. This change is important for allowing front-end use of UploadField; or, more importantly, use of UploadFile by people without CMS rights.
2013-01-11 09:07:42 +01:00
Ingo Schommer
4da1af9c3f
Show label-less input#file field in UploadField with canUpload=false
...
The field carries the configuration, and some non-upload functionality
like "attach files" still relies on the fileupload jQuery plugin
being initialized.
Conflicts:
templates/UploadField.ss
2013-01-11 09:07:42 +01:00
Ingo Schommer
2dfd42795e
NEW Restrict upload abilities in UploadField
...
Conflicts:
css/UploadField.css
templates/UploadField.ss
2013-01-11 09:07:42 +01:00
Ingo Schommer
7306d02411
Show label-less input#file field in UploadField with canUpload=false
...
The field carries the configuration, and some non-upload functionality
like "attach files" still relies on the fileupload jQuery plugin
being initialized.
2013-01-11 00:33:31 +01:00
Ingo Schommer
9310b8d86d
NEW Restrict upload abilities in UploadField
2013-01-10 00:15:34 +01:00
Kirk Mayo
561e629c16
NEW Show the allowed extensions as a toggle tip as per trac 7993
...
NEW Added a behat test for showing extension trac 7993
2012-12-19 17:00:39 +01:00
Ingo Schommer
d2c1d53a89
Fixed UploadField->setDescription() handlgin
2012-12-14 02:04:47 +01:00
Ingo Schommer
1ca3883a76
NEW Tooltip and inline help text support for CMS form fields
2012-12-14 01:58:04 +01:00
Ingo Schommer
6f9d01f621
API FormField->setDescription() visible in default template
...
Renders into <span class="description"> instead of "title" attribute
2012-12-14 01:58:04 +01:00
Ingo Schommer
255b4c44d3
UploadField->setDescription() support, removed extraneous "title" attrs
...
The "title" attrs interfere with the new default tooltip logic in LeftAndMain.FieldHelp.js
2012-12-14 01:57:27 +01:00
Ingo Schommer
7dd224d2a4
Made GridField font size settings less cryptic
...
Instead of applying it to generic alignment classes like
"left" and "right", make it clear that those are targeted
at all contents of the button row.
2012-12-13 10:34:13 +01:00
Ingo Schommer
d5dcecf984
Disable change tracking for preview state switch
2012-12-10 17:52:02 +01:00
Mateusz Uzdowski
8f5acd70b3
API Move state to enwtine properties, provide API for preview.
...
Also the preview state is now kept between panel loads. We also use a
redraw function to update appearance based on the state.
2012-12-10 17:52:01 +01:00
Naomi Guyer
9312c70696
Side-by-side preview options fixes.
...
Add extra preview-mode selector to the CMS actions so we can show
something when the preview is closed (and with it all options are not
visible).
Thanks @mateusz, @clarkepaul and @robert-h-curry for contributing.
2012-12-10 17:52:01 +01:00
Ingo Schommer
c55c7c33f8
Merge branch '3.0'
...
Conflicts:
admin/code/CMSProfileController.php
composer.json
tests/model/DataObjectTest.php
2012-11-22 23:51:28 +01:00
Sean Harvey
4330ecf083
Removing redundant templates (moved to legacytablefields module)
2012-11-16 11:53:31 +13:00
Sean Harvey
77337ae58c
Removing deprecated TableListField and subclasses
...
These have been moved to a module called "legacytablefields"
located at https://github.com/silverstripe-labs/legacytablefields
2012-11-16 11:04:28 +13:00
Sean Harvey
594faf71b2
Removing deprecated FileIFrameField, use UploadField instead
2012-11-15 14:43:14 +13:00
Sean Harvey
6ff5e8f39d
Adding ability to translate "Edit" text in GridFieldEditButton
2012-11-07 11:34:51 +13:00
Sean Harvey
fbc6e3366b
Merge branch '3.0'
2012-11-05 15:11:48 +13:00
Naomi Guyer
2dabaebad8
BUG: File Uploading Notifications ( fixes #7883 )
...
Put "File upload complete" and "back to folder" together. Turned 'File
upload' into a message, and updated the message styles.
Moved allowed file types into the area where users are uploading files.
This is a temporary fix until js tooltips are implemented, at which
point, these details will be shown when clicking a question mark beside
"Choose files".
Added small animation effect to files when opening iframe to edit. Now
slides down, rather than just appearing open
Linked to silverstripe/silverstripe-cms#223
2012-11-02 12:46:16 +13:00
Ingo Schommer
bcbf4636fc
BUG Remove .ss-tabset class from CMS tabs to prevent rogue ajax load ( #7980 )
...
The existence of .ss-tabset triggers JS which applies $.tabs(),
and in turn interprets the first available link as the tab navigation.
jQuery UI subsequently tries to ajax-load this link, which is not
desired. Instead, $.tabs() should *only* be applied to a container
DOM element with .cms-tabset applied.
2012-11-01 00:25:13 +01:00
Damian Mooyman
f265595c1e
NEW: GridFieldPageCount control for displaying the current page count/total in the gridview header. Designed to complement a functional pager in the grid footer.
...
NEW: GridFieldPageCount widget to default config settings
FIX: @extend .col_buttons in GridField.scss which was raising a warning
2012-10-03 14:54:37 +13:00
Will Rossiter
3fc928a861
Include in basic Controller view
2012-09-19 21:00:43 +12:00
Peter Indiola
581da54d54
Updated default controller and template link to documentation
2012-09-15 13:09:51 +08:00
Damian Mooyman
06676175ed
FIXED: Issue where messages attached to checkbox fields would not be displayed.
2012-09-03 18:21:11 +12:00
Ingo Schommer
2e21574988
NEW FieldGroup_DefaultFieldHolder template
...
As a replacement for the FieldGroup->subfieldParam
setting available in 2.4. Usage through FieldGroup->setTemplate().
2012-08-27 15:41:56 +02:00
Ingo Schommer
8dccb7f7d7
i18n for GridField pagination footer (see #7798 )
2012-08-26 23:58:31 +02:00
Ingo Schommer
3b592122fd
i18n for "select an anchor" string (see #7798 )
2012-08-26 23:58:31 +02:00
mightycoco
5f94d23000
ENHANCEMENT: Ntfcatn. image embedding(trac #7438 )
...
Adding an additional warning / notification message, when author embedds an external image.
2012-08-16 21:03:37 +02:00
Ingo Schommer
ce2d31b060
BUG Consistently self-closing form field tags ( #7557 )
...
This is reverting templates back to pre-3.0 conventions,
which were dominated by XHTML templates.
HTML5 allows both self-closing and unclosed tags,
so opting for self-closing to achieve maximum compatibility.
2012-08-10 10:27:33 +02:00
Ingo Schommer
023721aaca
GridFieldPaginator localization
2012-08-10 00:30:49 +02:00
Ingo Schommer
d0a9811087
BUG Fully qualified namespace for _t() in templates
...
Was inferred by the containing file previously,
which is deprecated behaviour, because it obscures
the fact that renaming an template file or copying
template code will change the context of the translations.
While it would be nice to use shorter and more readable namespaces,
this change would remove all existing translations.
Since there is no (easy) migration of entities to a new namespace,
having verbose template code is the lesser of two evils.
2012-08-06 13:44:21 +02:00
Will Rossiter
9cfbe9b84f
MINOR: update core controller template with more help information.
...
Updated controller and director documentation to reflect the new YAML configuration for route path definition.
2012-06-30 15:19:36 +12:00
Will Rossiter
e57dd604aa
MINOR: remove dependency on RootURLController and show a default Controller template as a failback.
2012-06-20 16:17:26 +02:00
Ingo Schommer
eff93bdd5b
ENHANCEMENT Disable UploadField when handling unsaved relations ( fixes #7187 )
2012-06-15 17:44:34 +02:00
Ingo Schommer
6c1f7997a4
ENHANCEMENT HTML titles in TreeDropdownField
...
HTML in tree nodes is already used to render page icons via SiteTree->TreeTitle.
In order to select the initial value correctly via HTML5 data attributes,
we need to encode any HTML values.
2012-06-13 16:04:14 +02:00
Andrew Short
9e4b526213
MINOR: Include the title attribute on tree and readonly fields.
2012-06-13 13:19:16 +02:00