Mateusz Uzdowski
8bf3853887
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
docs/en/misc/contributing/issues.md
docs/en/reference/uploadfield.md
forms/HtmlEditorField.php
i18n/i18n.php
javascript/HtmlEditorField.js
model/DB.php
model/Image.php
model/SQLQuery.php
2014-08-14 09:08:26 +12:00
Sean Harvey
329dffd22d
BUG AssetUploadField hides "generic" file upload messages.
...
If an upload fails, the error is not shown correctly, it gets hidden
off the table because of absolute positioning. This currently worked
because it relied upon known errors not showing a "size" element next
to it.
"ui-state-warning-text" and "ui-state-success-text" don't need this
CSS, so it's probably not necessary anyway as it shows the error text
correctly without it.
2014-07-29 10:06:27 +12:00
Naomi Guyer
46a5ee7d1d
CSS: Fix upload field display for preview open
2014-07-25 16:15:49 +12:00
Simon Welsh
fe8dc50ffc
Merge branch '3.1'
...
Conflicts:
tests/view/SSViewerTest.php
2014-03-30 18:17:24 +13:00
Loz Calver
86a69f9118
NEW: Show loading indicator when attaching files to UploadField
2014-03-25 14:53:30 +00:00
Simon Welsh
8f31352039
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
2014-03-16 09:36:48 +13:00
colymba
02bceca9b4
FIX UploadField validation error and styles
...
UploadField now return the validator's error message instead of 403. Plus nicer layout for error messages.
2014-01-04 22:30:35 +02: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
Ingo Schommer
b56ca812dc
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
tests/security/MemberTest.php
2013-10-23 14:53:29 +02:00
Loz Calver
e9fdfb05b2
GridField 'Add existing' action styling improvements
2013-10-22 16:44:28 +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
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
4ff7b43c44
Merge pull request #2364 from adrexia/tree-dropdown-search
...
API: Treedropdownfield showsearch default true, provide better ui
2013-08-29 05:00:14 -07:00
Naomi Guyer
8b5f89f3b9
API: Treedropdownfield showsearch default true, provide better ui
...
Set search option true on treedropdown fields by default, to provide a
fallback solution when trees fail to render (too many children errors)
Provide better indication/more meaningful styling to search (match
chosen styles for consistency)
2013-08-29 16:21:04 +12:00
Arno Poot
2df060e1be
FIX Make sure that debug always shows up first
2013-08-24 12:14:11 +02:00
Simon Welsh
fbce9fd7cd
Merge branch '3.1'
...
Conflicts:
.travis.yml
docs/en/misc/contributing/code.md
javascript/HtmlEditorField.js
2013-07-05 10:22:58 +12:00
Ingo Schommer
755a95e3f7
FIX UploadField: IE10 single click for upload trigger
...
Fixes https://github.com/silverstripe/silverstripe-cms/issues/644 .
See d45deb15f4
2013-06-25 15:35:45 +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
94b4237372
Merge remote-tracking branch 'origin/3.1'
2013-06-19 11:17:33 +02:00
Sam Minnée
34287895ef
Merge pull request #2099 from chillu/pulls/insert-media-tweaks
...
Various "Insert Media" dialog tweaks
2013-06-18 21:32:00 -07:00
Ingo Schommer
1fd8a55012
Form.scss reformatting (no functional changes)
2013-06-15 11:24:22 +02:00
Ingo Schommer
7c3e1a43e3
Removed unused '.right form' styles (2.x CMS)
2013-06-15 11:22:16 +02:00
Ingo Schommer
e3e828d15f
Center aligning GridField pagination input text
2013-06-15 10:13:46 +02:00
Ingo Schommer
be62c731f5
Compressed layout in "Insert Media" detail screen
...
- Same font size as other CMS UI
- Smaller thumbnail height
- Less label width and padding for file info
2013-06-15 10:13:45 +02:00
Ingo Schommer
071f30ded7
Consistent dropdown styles between chosen.js and treedropdown
...
Removed trigger background. Incidentally this also makes it less
obvious that the trigger has too much padding on the right
(which I can't figure out ...)
2013-06-15 10:13:45 +02:00
Ingo Schommer
ea4f8cec07
Tighten "Insert Media" dialog layout
...
Reduce space usage to fit into typical dialog dimensions without scrolling
2013-06-15 10:13:44 +02:00
Ingo Schommer
7ce9677dcb
Moved GridField table padding to buttons
...
Avoid double padding when no bottom buttons exist
2013-06-15 10:13:43 +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
77d65ba761
Fixed UploadField width (same as textual fields)
...
Was getting too wide due to padding which isn't applied
to other fields (e.g. TextField)
2013-05-29 17:25:46 +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
831a507c90
FIX: Update references to ID values from 79c9433
2013-05-26 11:11:55 +12:00
Will Rossiter
9c1638a353
Remove references to ComplexTableField
2013-05-26 11:11:53 +12:00
Ingo Schommer
67d1327b90
Avoid collision of status flags in tree items when updating tree nodes
...
Fixes silverstripe/silverstripe-cms#445
See https://github.com/silverstripe/silverstripe-framework/pull/1996
Thanks to Jean-Fabien for getting this started
2013-05-25 11:27:50 +02:00
Julian Seidenberg
22c7bbfcd4
NEW UploadField displays a warning before overwriting files (only relevant if config.yml: Upload:replaceFile = true).
2013-05-25 19:07:06 +12:00
Will Rossiter
f300e63f9f
Merge pull request #2008 from adrexia/upload-tree
...
BUG: Fix select from files treedropdown
2013-05-24 23:38:15 -07:00
Naomi Guyer
60cad991dc
BUG: Fix select from files treedropdown
2013-05-25 18:25:38 +12:00
Naomi Guyer
8235afc3b7
BUG: Display of AssetUpload upload fields
...
* Replaced file upload icon
* Fixed padding
* Replaced width of droparea with min-width
2013-05-25 18:01:07 +12:00
Sam Minnée
5a114b84c8
Merge pull request #1811 from uniun/fix-dropzone-title
...
FIX: Longer dropzone title wraps to two lines
2013-05-24 19:08:11 -07:00
Naomi Guyer
8aa8674e78
BUG: Treedropdowns broken inside togglecomposite fields ( fixes #1945 )
...
* Removed positioning javascript from treedropdownfield
* Set parent to be relatively positioned and overflow to visible
2013-05-23 14:41:08 +12:00
Loz Calver
57e4bca55e
FIX: Minor CSS issues on DatetimeField
...
The two 'child' field divs with a `.field` class were adding additional
margin and borders
SCSS updates
2013-05-20 09:59:53 +01: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
Elvinas
d5f6aac368
FIX: Longer dropzone title wraps to two lines
...
This is regression, because I've already fixed this in pull #1176 , but
my fixes overwritten with recent changes.
2013-04-27 11:15:18 +03:00
Elvinas
084341cc04
FIX: Column with buttons in GridField is too wide
...
Tested on FF18, IE9-IE10, C26 and O12.15 on Windows8.
2013-04-27 10:48:38 +03:00
Will Rossiter
d94a6a5407
Polish add page screen. Disable styles and fix SelectionField
2013-04-08 19:54:46 +12:00
Will Rossiter
7881f60298
FIX: nested SelectionGroups should only hide first level
2013-04-07 15:13:50 +12:00
Ingo Schommer
5ad73a549a
Fixed TreeDropdownField loading indicators
2013-03-20 14:45:23 +01:00
Will Rossiter
2e36e450ca
Fix alignment of selects within GridField filters
2013-03-05 10:23:30 +13:00
Jeremy Bridson
231439ef9b
MINOR:forgot to add the fix to the insert media upload field - styles from files section were breaking it.
2013-02-19 09:36:57 +13:00
Jeremy Bridson
82dc98bbc0
ENHANCEMENT: fixed styling bug with the text in the file upload drop area and moved allowed extensions up a tad
2013-02-19 09:21:49 +13:00