Commit Graph

46 Commits

Author SHA1 Message Date
divzpatel123@gmail.com
fbc68f433f Minor: update background colors 2016-01-22 16:32:52 +13:00
Meeeeeeow
4301ae20bf Changed the link colours 2016-01-19 15:46:29 +13:00
Damian Mooyman
48a30909f3 Merge remote-tracking branch 'origin/3.2' into 3
# Conflicts:
#	admin/javascript/LeftAndMain.BatchActions.js
#	css/UploadField.css
#	forms/HtmlEditorField.php
2015-12-22 14:07:52 +13:00
Nick Spiel
7a7f592d0f Adding a transparent background to upload preview
Adding a background to upload preview

I could not see a preview of a white image with background transparency in the preview area. Adding a backgorund to this area helps make it more visible.

Applying background image to img

Applying background image to img to avoid layout change

Applying background image to img

Applying background image to img to avoid layout change
2015-11-20 21:14:53 +11:00
Dan Hensby
64ceba133c Merge remote-tracking branch 'origin/3.2' into 3
Conflicts:
	admin/css/screen.css
2015-07-20 14:08:36 +00:00
Jonathon Menz
1af939bcb0 Tweak UploadField width for better alignment
(fixes #3382)
2015-07-16 11:09:08 -07:00
David Craig
e4447698b5 Update compass config
- Add sourcemaps for debugging
- More consistant builds across environments
2015-07-09 10:11:00 +12:00
Damian Mooyman
319b96b48b Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
	docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
	docs/en/05_Contributing/01_Code.md
	forms/TreeDropdownField.php
	model/DataObject.php
	security/Member.php
	tests/model/DataObjectTest.php
2015-03-11 11:40:06 +13:00
Loz Calver
4709b90864 FIX: UploadField description alignment 2015-03-03 09:28:36 +00:00
Nick Spiel
227ea82953 Update 'spinner' to an SilverStripe branded version
PSD: http://nickspiel.me/uploads/silverstripe-assets/spinner.psd
2015-01-14 20:29:07 +11:00
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
Ingo Schommer
6bd7da9d33 Recompiled CSS with compass 1.0
Minor syntactical changes, like alphabetical ordering of filters, uppercasing of hex colours. See http://compass-style.org/blog/2014/08/15/omg-compass-1-0/.
Shouldn't include any user-visible changes, but helps to avoid confusion with the next person trying to modify the CSS (Luke is currently struggling with that)
2014-10-16 10:33:49 +13:00
Loz Calver
5f653a00eb Add "retina" styles for high-dpi screens 2014-08-27 17:06:57 +01:00
Naomi Guyer
46a5ee7d1d CSS: Fix upload field display for preview open 2014-07-25 16:15:49 +12:00
Loz Calver
86a69f9118 NEW: Show loading indicator when attaching files to UploadField 2014-03-25 14:53:30 +00: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
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
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
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
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
Naomi Guyer
60cad991dc BUG: Fix select from files treedropdown 2013-05-25 18:25:38 +12: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
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
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
Paul Clarke
f988ae3163 ENHANCEMENT Message colours updated 2012-11-06 13:23:20 +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
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
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
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
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
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
Zauberfisch
ad78d9a3d1 MINOR: fixed missing cancel icon 2012-05-13 21:05:30 +02:00
Robert Curry
6dd94bd6f7 MINOR: Changed classes on tabset li and a tags to match new standard. 2012-05-11 11:12:44 +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
Ingo Schommer
f8201c48a3 MINOR More generic CSS styles for .cms-file-info: Apply to form.small parent, fixed related UploadField spacing issues 2012-03-01 11:58:16 +01:00
Ingo Schommer
abfa16fa70 ENHANCEMENT Using native jQuery UI buttons and icon styling for a less coupled implementation (e.g. assuming that a "constructive" button always has a specific icon, or one at all). All CMS UI buttons switched to use <button> markup, which allows for inline icons and correctly aligned multi-line button labels. 2012-02-17 15:58:32 +01:00
Ingo Schommer
42f3c542f8 MINOR Shorter SCSS $grid-* variables to promote wider usage (amended) 2012-02-14 17:31:23 +01:00
Ingo Schommer
c0d187071a ENHANCEMENT New UploadField class to replace FileIframeField, ImageField and SimpleImageField 2012-02-03 01:00:08 +01:00