Commit Graph

219 Commits

Author SHA1 Message Date
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
Ingo Schommer
d4b7763cab Merge pull request #1154 from silverstripe-rebelalliance/open8231
BUGFIX:fixed styling of asset upload page and dialog in the asset admin ...

Conflicts:
	css/AssetUploadField.css
	scss/AssetUploadField.scss
2013-02-15 19:52:47 +01:00
uniun
8ea805e60b Long drop area title overlaps upload icon 2013-02-11 15:13:42 +02:00
Ingo Schommer
1a43ad5ed3 Removed widths on DatetimeField children
Makes it more flexible in regards to field widths,
e.g. DMY fields vs. a single input field. Also allows
to extend with additional fields more easily, e.g.
a drop down through the "timedropdownfield" module.
2013-02-07 11:41:20 +01:00
Ingo Schommer
b350ded87c Fixed DatetimeField formatting (single row, smaller field)
Also removed the arbitrary right-floating of fields within a fieldgroup
2013-02-05 12:01:32 +01:00
Jeremy Bridson
82099f65a5 BUGFIX:fixed pagination for "upload from CMS" grid field pagination open/8085 2013-02-04 17:30:39 +13:00
Jeremy Bridson
aa81333b7e MINOR:adjusted position of "OR" on the asset upload field and removed right margin from "choose files to upload…" button on the insert media dialog - open/8231 2013-02-04 14:48:26 +13: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
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
f8758bad6a FIX: Fixed margins so that margin is displayed between preview images and their title.
Previously the margin was erroneously only shown for a drop zone.  It's possible that this bug only affects single-image uploads.
2013-01-11 09:29:09 +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
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
6028cf1b62 Fixed panel spacing regressions from 544d2eb6
Specifically, the change removed the "add page" panel padding,
because it moved padding from .cms-panel-padded into
commonly contained elements, like .ui-tabs-panel.
Apart from breaking layouts, it makes the class meaningless,
since its only padded depending on which elements it contains.

In order to rectify some introduced inconsistencies,
much too complex were required, e.g.
.ui-tabs .cms-edit-form, .ui-tabs .cms-content-fields {...}.
2012-12-17 15:20:13 +01: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
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
fbc6e3366b Merge branch '3.0' 2012-11-05 15:11:48 +13:00
Ingo Schommer
70352fba32 Merge pull request #880 from adrexia/fileoverview
BUG: File Uploading Notifications (fixes #7883)
2012-11-02 14:08:16 -07: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
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
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
Will Rossiter
3fc928a861 Include in basic Controller view 2012-09-19 21:00:43 +12:00
Francisco arenas
a58cb37f96 Fix TreeDropdownField toggle alignment in FF
See pull request #598
2012-08-16 21:13:44 +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
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
Will Rossiter
0910a651d5 FIX: restore and update style for DevelopmentAdmin. 2012-06-29 16:52:36 +12:00
Ingo Schommer
5eab25cdbc Merge pull request #551 from adrexia/scss-tidy
MINOR: Remove unnecessarily repeated mixins
2012-06-21 12:13:40 -07:00
Naomi Guyer
d3845380d7 BUGFIX: Padding in navigation elements in IE7
Fixes the gap between navigation elements in IE7
2012-06-21 11:48:39 +12:00
Naomi Guyer
7db0e32f9c MINOR: Remove unnecessarily repeated mixins 2012-06-20 10:42:20 +12:00
Ingo Schommer
9009d43f63 MINOR Moved "insert x" dialog styling from generic UploadField.scss to CMS-specific _style.scss 2012-06-11 10:51:47 +02: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
Naomi Guyer
7523f98e04 BUGFIXES: File Uploads
* Add arrows back to edit-all toggle button
* Don't show dimensions if the item being inserted doesn't have them.
* Set pop-up windows to be a percentage of the window height for better
use of space
* Fix broken fieldholdersmall styling within files edit
* Add placeholder if no preview
*Take out minFileSize so upload will work on Android phones
2012-06-08 18:40:33 +02:00
Sean Harvey
f865891737 MINOR Fixing styling on listChildrenLink in GridField 2012-05-30 22:11:52 +12:00
Naomi Guyer
9a7980e357 ENHANCEMENT: Design fixes in insert media pop-up
* Apply design to insert media/image pop-up
2012-05-28 11:50:34 +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
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
Ingo Schommer
dfa01c8ce1 Merge pull request #446 from adrexia/sapphire
---

MINOR: SCSS refactoring
1. Refactored some gridfield styles to enable reuse (created a mixin file to hold mixins that generate specific css objects/elements).
2. Made some scss comments use // so they wouldnt appear in generated css

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

Conflicts:
	css/GridField.css
2012-05-16 12:29:13 +02:00
Naomi Guyer
7363d8bc47 BUGFIX: Fix pagination buttons
Disable ability to click on disabled pagination buttons
2012-05-16 17:39:00 +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
Naomi Guyer
5a023f985d MINOR: SCSS refactoring
1. Refactored some gridfield styles to enable reuse (created a mixin
file to hold mixins that generate specific css objects/elements).
2. Made some scss comments use // so they wouldn't appear in generated
css
2012-05-16 12:18:00 +12:00
Ingo Schommer
ce3b2fc3af Merge pull request #440 from Zauberfisch/sapphire
---

fixed missing cancel icon in UploadField cancel button
2012-05-14 15:15:51 +02:00
Zauberfisch
ad78d9a3d1 MINOR: fixed missing cancel icon 2012-05-13 21:05:30 +02:00
Andrew Short
05cde92508 FEATURE: Implemented a view action for GridField, and a record viewing GridFieldConfig. 2012-05-12 18:49:56 +10:00
Naomi Guyer
9844328a06 BUGFIX: Fix error notification on files (fixes: 7295)
Add title text to all status messages
Make room for the error message details by expanding the name area in
the file details
Fix up changes status to work with selects
2012-05-11 14:43:17 +12:00
Naomi Guyer
f2411cf13a BUGFIX: Uploads save button not visible (Trac #7294)
Fixed the calculation of height for the upload (non AssetUploads) area
so that the save button would show. Took off the min-height, as this
will cause UI issues when there are multiple files open for editing.
2012-05-10 11:41:10 +02:00
Naomi Guyer
106bd47e88 BUGFIX: #7295 Long Filenames break layout
Add text overflow and a max width to filenames.
2012-05-10 11:41:10 +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
Normann Lou
7324712e9e FEATURE: add Levelup component to GridField as GridFieldLevelup 2012-05-07 13:40:53 +12:00
Naomi Guyer
61c18c5dbc BUGFIXES: Fixes #7003 2012-04-30 12:25:35 +12:00
Naomi Guyer
66d0673b07 BUGFIX: Fixes #7003
Changed the calculation of the iframe size so it would be the correct
height. Altered the styles of the view details area to match design.
Changed the background color of the title on the file header so it
wouldn't look editable (as recommended by Felipe)
2012-04-26 11:17:16 +02:00
Naomi Guyer
2b9b07adcc BUGFIX: 7055 Filter buttons in IE9
Set gradient support to true for IE9 in order for the icons to show on
top of gradients as desired.
2012-04-23 12:29:57 +12:00
Naomi Guyer
b075dc9058 BUGFIX: Fixes #6943
Added classes to dropzone when dragging and dropping files. Added
styles to the dropzone when a file could be dropped. Added a clearfloat
mixin to the mixins file.
2012-04-18 09:56:09 +12:00
Mateusz Uzdowski
e262a29193 ENHANCEMENT: move code introspection functions to the silverstripe-codeviz module 2012-04-17 14:45:26 +12:00
Jeremy Bridson
e91c609bd2 BUGFIX:fixed broken filter header styling in users 2012-04-16 15:30:34 +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
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
Julian Seidenberg
e9dc610448 API-CHANGE: new GridFieldFooter component 2012-04-12 16:13:47 +12:00
Jeremy Bridson
84388a4119 ENHANCEMENT:SSF-124 - changed how the border radius was applied on the gridfield header. border radius is now applied to the first and last th in the first row in <thead>. 2012-04-11 13:45:37 +12:00
Jeremy Bridson
285773746d BUGFIX:SSF-124 / Trac#7105 - fixed issue with gridfield columns being too narrow. 2012-04-11 10:48:24 +12:00
Jeremy Bridson
3ea847a059 MINOR:changed white-space:nowrap so that it applies to all td in the gridfield. 2012-04-10 13:41:15 +12:00
Jeremy Bridson
b26807058f ENHANCEMENT:removed border and added blue link color to page titles. 2012-04-10 13:36:15 +12:00
Jeremy Bridson
4a3a6d5128 BUGFIX: SSF-124 - removed styles to fix color of th text. 2012-04-10 13:36:15 +12:00
Jeremy Bridson
e0b429491c ENHANCEMENT: SSF-124 - styled the pages list view. 2012-04-10 12:22:11 +12: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