Commit Graph

121 Commits

Author SHA1 Message Date
Paul Clarke
0ca090a391 Add generic React components
Includes moving some components from AssetAdmin
2016-04-06 08:35:50 +12:00
Damian Mooyman
3b0a9f4ba2 Merge remote-tracking branch 'origin/3'
# Conflicts:
#	admin/javascript/LeftAndMain.Menu.js
#	control/HTTPRequest.php
#	css/GridField.css
#	css/GridField.css.map
#	docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md
#	docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md
#	docs/en/02_Developer_Guides/06_Testing/index.md
#	docs/en/02_Developer_Guides/14_Files/01_File_Management.md
#	docs/en/02_Developer_Guides/14_Files/02_Images.md
#	filesystem/Upload.php
#	javascript/HtmlEditorField.js
#	model/Image.php
#	model/connect/MySQLDatabase.php
#	model/fieldtypes/Enum.php
#	model/versioning/Versioned.php
#	scss/GridField.scss
2016-02-25 14:51:59 +13:00
Loz Calver
8ac1b28ef8 Merge pull request #5080 from scott1702/gridfield-overflow
Fix dropdown cutoff on gridfield
2016-02-23 09:16:25 +00:00
scott1702
b2e30a50b1 Fix hidden dropdown on gridfield 2016-02-23 17:34:50 +13:00
scott1702
38b1c0a162 Replace Compass with gulp-sass 2016-02-16 18:35:57 +13:00
Damian Mooyman
e6b877df27 Merge remote-tracking branch 'origin/3'
# Conflicts:
#	control/Director.php
#	control/HTTP.php
#	core/startup/ParameterConfirmationToken.php
#	docs/en/00_Getting_Started/01_Installation/05_Common_Problems.md
#	docs/en/00_Getting_Started/04_Directory_Structure.md
#	docs/en/00_Getting_Started/05_Coding_Conventions.md
#	docs/en/01_Tutorials/01_Building_A_Basic_Site.md
#	docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
#	docs/en/01_Tutorials/03_Forms.md
#	docs/en/01_Tutorials/04_Site_Search.md
#	docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
#	docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
#	docs/en/02_Developer_Guides/13_i18n/index.md
#	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
#	docs/en/03_Upgrading/index.md
#	docs/en/changelogs/index.md
#	docs/en/howto/customize-cms-menu.md
#	docs/en/howto/navigation-menu.md
#	docs/en/index.md
#	docs/en/installation/index.md
#	docs/en/installation/windows-manual-iis-6.md
#	docs/en/misc/contributing/code.md
#	docs/en/misc/contributing/issues.md
#	docs/en/misc/module-release-process.md
#	docs/en/reference/dataobject.md
#	docs/en/reference/execution-pipeline.md
#	docs/en/reference/grid-field.md
#	docs/en/reference/modeladmin.md
#	docs/en/reference/rssfeed.md
#	docs/en/reference/templates.md
#	docs/en/topics/commandline.md
#	docs/en/topics/debugging.md
#	docs/en/topics/email.md
#	docs/en/topics/forms.md
#	docs/en/topics/index.md
#	docs/en/topics/module-development.md
#	docs/en/topics/modules.md
#	docs/en/topics/page-type-templates.md
#	docs/en/topics/page-types.md
#	docs/en/topics/search.md
#	docs/en/topics/testing/index.md
#	docs/en/topics/testing/testing-guide-troubleshooting.md
#	docs/en/topics/theme-development.md
#	docs/en/tutorials/1-building-a-basic-site.md
#	docs/en/tutorials/2-extending-a-basic-site.md
#	docs/en/tutorials/3-forms.md
#	docs/en/tutorials/4-site-search.md
#	docs/en/tutorials/5-dataobject-relationship-management.md
#	docs/en/tutorials/building-a-basic-site.md
#	docs/en/tutorials/dataobject-relationship-management.md
#	docs/en/tutorials/extending-a-basic-site.md
#	docs/en/tutorials/forms.md
#	docs/en/tutorials/index.md
#	docs/en/tutorials/site-search.md
#	main.php
#	model/SQLQuery.php
#	security/ChangePasswordForm.php
#	security/MemberLoginForm.php
#	tests/control/ControllerTest.php
#	tests/core/startup/ParameterConfirmationTokenTest.php
#	tests/model/SQLQueryTest.php
#	tests/security/SecurityTest.php
#	tests/view/SSViewerTest.php
#	view/SSTemplateParser.php
#	view/SSTemplateParser.php.inc
#	view/SSViewer.php
2016-01-20 13:16:27 +13:00
Sam Minnee
3ee8f505b7 MINORE: Remove training whitespace.
The main benefit of this is so that authors who make use of
.editorconfig don't end up with whitespace changes in their PRs.

Spaces vs. tabs has been left alone, although that could do with a
tidy-up in SS4 after the switch to PSR-1/2.

The command used was this:

for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do
	find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" -exec sed -E -i '' 's/[[:space:]]+$//' {} \+
	find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
2016-01-07 10:15:54 +13:00
scott1702
1f64631bfc Update asset admin toolbar 2015-10-23 17:39:42 +13:00
scott1702
37e0f55124 fix gridfield overflow 2015-09-11 11:22:30 +12:00
Damian Mooyman
42e87d6830 Merge pull request #4510 from scott1702/gridfield
Make gridfield button sizes consistent with the rest of the cms
2015-08-19 12:39:37 +12:00
scott1702
c803c01e99 Make gridfield button sizes consistent with the rest of the cms 2015-08-19 10:56:40 +12:00
Jonathon Menz
aa286ef7d7 FIX Missing thumbnails and inconsistencies
Made thumbnails and columns in File list Grid Fields more consistent (fixes #4409)
2015-07-30 16:15:51 -07:00
scott1702
6ec466edbf Remove 'important' from gridfield hover 2015-04-20 15:12:48 +12:00
Sam Minnee
eb35f260c6 FIX: Corrected padding on non-sortable columns.
span.non-sortable in the GridField header relies on there being other, sortable columns in the list to get the padding
right. If there are no such columns (e.g. in a simple header), then the header is shown without padding, which is ugly.

This small change fixes that. Tested on Chrome and Firefox. 1px smaller than a sortable header on Firefox but still looks fine.
2015-03-04 22:14:00 +00:00
Loz Calver
e9fdfb05b2 GridField 'Add existing' action styling improvements 2013-10-22 16:44:28 +01: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
e3e828d15f Center aligning GridField pagination input text 2013-06-15 10:13:46 +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
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
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
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
2e36e450ca Fix alignment of selects within GridField filters 2013-03-05 10:23:30 +13:00
Jeremy Bridson
82099f65a5 BUGFIX:fixed pagination for "upload from CMS" grid field pagination open/8085 2013-02-04 17:30:39 +13:00
Paul Clarke
c0a122613e Bug fix and code clean up
Removed tempory button fixs not needed any more,
Removed unrelated commits,
fix for preview note
2012-12-13 17:44:06 +01:00
Mateusz Uzdowski
fe08236f21 API Add action tabsets as a interface idiom.
Introduces the concept of action tabsets - usage of TabSet and Tabs
in between the action buttons to allow richer set of capabilities that
can be offered to the user.

Goes along with c8d0cdec99c95dbed3b58ebcc098cc9d22c58206 that implements
a change to the CMS actions.
2012-12-13 17:43:24 +01:00
Ingo Schommer
006790bb26 Fixed IE7 GridField "add row" alignment issue
Regression from Paul's last commit
2012-12-13 10:50:08 +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
Paul Clarke
0ba51c1ebf Fix to allow buttons to align inline (fixes #8099) 2012-12-13 10:09:30 +01:00
Ingo Schommer
bdc3e91e01 Fixed wrong floating on GridField certain buttons
Regression from 9152387c92, alternative solution to
https://github.com/silverstripe/sapphire/pull/1028
2012-12-13 09:47:30 +01:00
Naomi Guyer
dbee4a1bf9 Clean up the side-by-side code. 2012-12-10 17:52:02 +01:00
Paul Clarke
544d2eb6e1 Side-by-side preview options styling.
Thanks @adrexia for contributing.
2012-12-10 17:52:01 +01:00
Ingo Schommer
fa84c2d705 Merge remote-tracking branch 'origin/3.0' 2012-12-10 17:50:43 +01:00
Ingo Schommer
9152387c92 Fixed GridField button alignment (regression from a9cbea34)
The text-indent: 9999px was relying on text-align: right to function. Because it was left-aligned, text showed below the icon graphic.
The width of the button column was constrainted to 40px,
which first of all didn't fit the two icons properly,
but also made the big assumption that we never have more than two.
The new width: auto setting means that the column might be a bit
longer than desired, but at least it doesn't cut off icons
or wrap them into multiple lines unnecessarily.

Thanks to ARNHOE for starting this patch.
2012-12-06 14:50:27 +01:00
Sean Harvey
fbc6e3366b Merge branch '3.0' 2012-11-05 15:11:48 +13:00
Naomi Guyer
95b5f6541f BUG: GridField add existing auto complete has no max height (fixes #7965)
Added a maxheight to the ui-autocompleter, as used in gridfield, and
specified what to do with overflow.
2012-11-02 13:36:51 +13:00
Naomi Guyer
1a864d739d BUG: Force gridfield to wrap on long content
Make sure gridfield cells wrap. Added word-warp, so long words will
break apart to wrap, and a max-width.

The max-width number is semi-arbitrary. In practice it does not act as
a real max-width, but as some sort of limit on the percentage.
Unfortunately, this fix has no effect at all on any version of IE.
2012-10-17 10:33:18 +13: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
Ingo Schommer
ad52b8cfd2 Merge pull request #629 from silverstripe-rebelalliance/3.0
BUG:fixed the misaligned edit and delete buttons in gridfield Trac 7527
2012-07-10 02:51:04 -07:00
Kirk Mayo
630ab878c9 BUG:fixed the misaligned edit and delete buttons in gridfield Trac 7527 2012-07-10 14:52:34 +12:00
Naomi Guyer
7db0e32f9c MINOR: Remove unnecessarily repeated mixins 2012-06-20 10:42:20 +12:00
Paul Clarke
3ada9a9327 ENHANCEMENT Basic css spacing issues
Ticket #7446 Minor css spacing fixs: padding on grid filter, filter
panel, page actions box-shadow to remove
2012-06-11 16:02:33 +12:00
Sean Harvey
f865891737 MINOR Fixing styling on listChildrenLink in GridField 2012-05-30 22:11:52 +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
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
Paul Clarke
d522b81892 ENHANCEMENT gridfield styling improvements, asset admin style improvements 2012-05-22 16:06:50 +12:00
Paul Clarke
a9cbea343e ENHANCEMENT gridfield colours simplified to use base colours, css tidy up around actions & icons 2012-05-22 16:06:50 +12:00
Paul Clarke
5edf447d2a ENHANCEMENT visual enhancements, cms tabs, main menu drop shadow adjusted, actions panel top gradient replaced 2012-05-22 16:06:49 +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
Robert Curry
38e4bfd150 BUGFIX: Force iOS Safari to send through click events on gridfield rows. (fixes #6993) 2012-05-18 14:00:23 +12:00