Commit Graph

308 Commits

Author SHA1 Message Date
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
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
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
Justin Martin
0ee7bbf75c BUG: Removed !important attribute of #Remember margin 2012-12-17 17:45: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
Naomi Guyer
00f1ba4ab0 Side-by-side preview browser compatibility fixes. 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
Mateusz Uzdowski
f4b080ee06 NEW Side by side editing functionality - first cut (os#7412)
Introduces a preview window that appears when the screen is wide enough,
removes old preview button, adds a draft-public switch, adds variety of
preview options which are not hooked up yet.

Goes along with cms commit fa3738a9f4c5181eabf18a77ca89792d31592250
2012-12-10 17:51:35 +01:00