tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-27 22:03:50 +02:00
Code Issues Projects Releases Wiki Activity
16,226 Commits 29 Branches 520 Tags 147 MiB
9e3df22b32
Commit Graph

276 Commits

Author SHA1 Message Date
Ingo Schommer
94b4237372 Merge remote-tracking branch 'origin/3.1' 2013-06-19 11:17:33 +02:00
Ingo Schommer
080da1eefc Removed colons from field labels in "Insert Media" detail screen 
We don't use them in other field labels either
 2013-06-15 10:13:45 +02:00
Ingo Schommer
91f6255fed Full URL on hover in UploadField detail screen 
Works around possible truncation of the URL when it gets too long
 2013-06-15 10:13:45 +02:00
Ingo Schommer
4bc2f9bc0d Localization-resilient SCSS selector (fixes #1590) 2013-06-15 10:13:45 +02:00
Ingo Schommer
10a558c882 Hide "delete" button in "Insert Media" dialog 2013-06-15 10:13:44 +02:00
Ingo Schommer
3f295adbdd .field.noborder style, use it in "Insert Media" dialog 2013-06-15 10:13:43 +02:00
Damian Mooyman
78bd73d40d BUG Temporarily disable overwrite warning on HtmlEditorField "insert media" dialogue until this feature properly supports validation error recovery. 2013-06-10 15:35:28 +12:00
Sam Minnee
d97ca43cd0 Merge branch '3.1' 
Conflicts:
	README.md
	dev/install/install.php5
	forms/ConfirmedPasswordField.php
	tests/forms/FormTest.php
 2013-05-23 19:01:58 +12:00
Ingo Schommer
a9edf47189 Merge pull request #1830 from a2nt/media_dialog_add_url_btn_fix 
FIX media dialog add url button fix
 2013-05-08 01:42:04 -07:00
a2nt
423c737502 FIX media dialog add url button fix 
Use HtmlEditorField.BUTTONADDURL for localization
 2013-05-04 03:34:02 +07:00
Ingo Schommer
8f3c0b57ba Merge remote-tracking branch 'origin/3.1' 2013-04-29 09:32:58 +02:00
Ingo Schommer
5ca9db5e5e Limit HtmlEditorField HTMLText casting note to existing fields 
This prevents it from failing for proxied values
like BlogEntryForm, where the field name doesn't exist,
and rather gets processed and saved into a different field.
 2013-04-29 09:32:05 +02:00
Nico Haase
5fbb3da661 Enhanced tests for regeneration of images and a bugfix for images that were cached in multiple steps 2013-04-24 10:27:20 +02:00
g4b0
c63d840561 BUGFIX: fixed access to asset_preview_width in getFieldsForImage 2013-03-27 17:52:40 +01:00
Ingo Schommer
3334eafcb1 API Marked statics private, use Config API instead (#8317) 
See "Static configuration properties are now immutable, you must use Config API." in the 3.1 change log for details.
 2013-03-24 17:20:53 +01:00
Andrew Short
222e554ce6 Merge pull request #1328 from a2nt/html_tabs_fix 
FIX Localized HtmlEditorField Tabs
 2013-03-24 04:20:24 -07:00
a2nt
27b0cda054 FIX Localized HtmlEditorField Tabs 
Tabs can have only lattin characters in it's name
 2013-03-24 15:19:45 +06:00
Ingo Schommer
63c8441410 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	admin/javascript/LeftAndMain.js
 2013-03-21 00:11:17 +01:00
Ingo Schommer
2787d360c1 FIX "Insert Link" and other TinyMCE loading bugs (fixes #8327) 
Caused by SS loading a URL with html entities (&)
through the Requirements API, which only works when directly
inserted into the HTML template (standard behaviour),
but garbles the URL GET parameters when loaded via the jQuery.ondemand
JavaScript/XHR logic.

It didn't fail the request, just meant that tiny_mce_gzip.php wasn't
getting all the required options from the GET parameters.
And since this newly loaded file contains the same JS globals,
it would override previously loaded (correct) state.
 2013-03-20 17:58:17 +01:00
Hamish Friedlander
168f071499 API Make HTMLValue replace-able via DI 
Extracted common code out to SS_HTMLValue and made abstract, then
put HTML 4 specific code in SS_HTML4Value. Its now possible to
replace HTMLValue with one designed for HTML 5 or XHTML

Requires a code change from new SS_HTMLValue to
Injector::inst()->create(HTMLValue)
 2013-03-14 12:49:02 +13:00
Ingo Schommer
37f4d2e21f Merge remote-tracking branch 'origin/3.0' into 3.1 2013-01-21 11:15:17 +01:00
Ingo Schommer
8717deca82 HTMLEditorField undefined $dimensionsField (fixes #7494) 
Also use fluent API for form field definition to keep field invocations
in one place and thereby reduce these kind of bugs.
 2013-01-21 11:11:21 +01:00
Ingo Schommer
559abecd56 API Copying instance props on FormField readonly/disabled transformations 
Introduced new FormField->castedCopy() method
which tries to replicate the existing form field instance
as closely as possible.

Primarily, the fix was targeted at consistently passing
through FormField->description to all of its variations.
 2012-12-14 01:58:04 +01:00
Simon Welsh
b0121b541c Add codesniffer that ensures indentation is with tabs. 2012-12-12 17:33:31 +13:00
Simon Welsh
fc5dd2994c Add codesniffer that ensures indentation is with tabs. 2012-12-12 00:12:11 +13:00
Ingo Schommer
c55c7c33f8 Merge branch '3.0' 
Conflicts:
	admin/code/CMSProfileController.php
	composer.json
	tests/model/DataObjectTest.php
 2012-11-22 23:51:28 +01:00
Sean Harvey
8b0bb8dd09 API Replace deprecated FormField::createTag() with static create_tag() 
GridField uses createTag() which is marked for deprecation, rather
than have it used as the cornerstone of generating FormField templates,
use it as a helper in case fields generate HTML tags from PHP.
 2012-11-15 14:43:21 +13:00
Sean Harvey
4d110809d9 Remove deprecated rows and columns argument support from HtmlEditorField 
Use setColumns() and setRows() instead
 2012-11-15 14:43:20 +13:00
Tim Klein
f0f5dcb966 fixed mediaform urls in modeladmin 
see http://open.silverstripe.org/ticket/8013
 2012-11-09 16:44:48 +13:00
Ingo Schommer
2d075671c3 ENHANCEMENT Tab style consolidation and design consistency 2012-11-06 22:28:19 +01:00
Sam Minnee
1f7fc1f76a FIX Remove instances of lines longer than 120c 
The entire framework repo (with the exception of system-generated files) has been amended to respect the 120c line-length limit.  This is in preparation for the enforcement of this rule with PHP_CodeSniffer.
 2012-09-30 17:18:13 +13:00
Ingo Schommer
e2f073f38a Method visibility according to coding conventions 2012-09-20 10:46:59 +02:00
Sean Harvey
6ab04a6a55 Refer to setColumns in deprecation message instead of non-existent setCols 2012-09-18 09:39:08 +12:00
unclecheese
4fde42f72e ENHANCEMENT: Add "jpeg" to list of allowed extensions 
.jpeg is the correct extension for these files, and they were being filtered out of the list.
 2012-08-17 13:17:26 -03: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
712f28bc78 Scoped deprecation messages (fixes #7645) 2012-07-13 11:37:35 +02:00
Mateusz Uzdowski
7c41ff22ab BUG Change all shortcodes into the new, comma separated, format. 
Space delimiter is often confused by browsers, and encoded as %20 which
breaks the shortcode system. Change to comma delimitation has already
been implemented, this is a followup cleanup.

Ref http://open.silverstripe.org/ticket/7337
 2012-07-12 16:44:21 +12:00
Ingo Schommer
998b8e048c Merge pull request #634 from silverstripe-rebelalliance/3.0_7603 
BUGFIX: open ticket 7603 fixing search filtering - thought I should initialise $dataListClone
 2012-07-11 06:59:39 -07:00
Jeremy Bridson
e096c297b8 BUGFIX: open ticket 7603 fixing search filtering - thought I should initialise $dataListClone 2012-07-11 09:19:50 +12:00
mightycoco
e582935582 BUGFIX insertion of images (trac #7438) 
Allow insertion of images via oEmbed dialog using a direct url
 2012-06-25 17:19:15 +02:00
Naomi Guyer
e51bf760e9 BUGFIX: Insert link styling broken, and inconsistent with Insert media (fixes #7528) 2012-06-25 15:31:39 +12:00
Naomi Guyer
5713a37a32 BUGFIX: Alignment of http label in insert media 2012-06-22 18:11:00 +12:00
Naomi Guyer
f01c1640c7 BUGFIX: Alignment of http label in insert media 2012-06-22 18:04:13 +12:00
Hamish Friedlander
65030906ad BUGFIX: Add validation to fix open.silverstripe.org ticket #7494 
When adding media via the HtmlEditorField dialog, the value of the URL field wasnt being validated. Youd get different errors depending on if the field was empty
or if it had text, but it didnt look like an absolute URL to HtmlEditorField#viewfile.

This adds some javascript validation to make the text field look like a URL field
 2012-06-21 14:19:41 +12:00
Sean Harvey
538bcdc74d BUGFIX Ensure that the DataList is being used correctly when applying filters in HtmlEditorField and Hierarchy 2012-06-15 15:49:22 +12:00
Ingo Schommer
db076c0f02 MINOR Using new setDescription() styling in HtmlEditorField 2012-06-13 13:21:41 +02:00
Naomi Guyer
e96ca5fb9a ENHANCEMENT: Change media insertion to use button and apply design 
Conflicts:

	css/UploadField.css
	scss/UploadField.scss
 2012-06-11 10:54:48 +02:00
Ingo Schommer
210e32d631 MINOR Labeling in HtmlEditorField 2012-06-08 18:40:33 +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
Sean Harvey
0235a8c0c7 BUGFIX Partially reverting 28e43bdc which broke media insertion 2012-05-28 22:27:20 +12:00
Sean Harvey
c3eabffcb9 MINOR Use shorthand {class}::get() syntax instead of DataList::create() 
in core code.
 2012-05-28 21:13:42 +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
Simon Welsh
15a5dab395 MINOR: Add a fallback thumbnail image for oEmbed inserts 2012-05-25 15:40:17 +12:00
Simon Welsh
30ecb9f531 BUGFIX: Provide a default width and height of 100px for those endpoints that don't provide one. 2012-05-24 18:16:00 +12:00
Mateusz Uzdowski
63ed0cba32 BUGFIX: return a meaningful translatable string when resource is invalid 2012-05-24 17:00:21 +12:00
Simon Welsh
bb29ff3611 FEATURE: Allow adding media to the CMS using oEmbed 2012-05-24 17:00:21 +12:00
Sean Harvey
fdebedd103 BUGFIX Ensure the form inside htmleditorfield-dialog element is redrawn when the form is lazy loaded by AJAX. 2012-05-09 17:11:59 +12:00
Normann Lou
e1372b3794 ENHANCEMENT: toggle header and action label for image dialog popups (from content TinyMCE image icon) 2012-04-20 18:04:49 +12:00
Robert Curry
842784c8aa ENHANCEMENT: Fixes #7010. Move DisplayFields, FieldCasting and FieldFormatting functions from GridField to GridFieldDataColumns. 2012-04-19 12:44:59 +12:00
Sean Harvey
5bb31c4e81 BUGFIX Stop "Insert Link" or "Insert Image" header disappearing inside the HtmlEditorField toolbar 
when clicking a link type
 2012-04-17 15:47:40 +12:00
Simon Welsh
3a6341a251 API-CHANGE sapphire folder can now be renamed. 2012-04-15 10:50:19 +12:00
Ingo Schommer
b025b95ede ENHANCEMENT Lazy-loading image and link dialogs for HtmlEditorField, to avoid unnecessary processing overhead on initial CMS load (also means they'll never get loaded if not required, e.g. in ReportAdmin) 2012-04-12 23:53:12 +02:00
Ingo Schommer
ac45e5b9c0 Merge branch 'integration' 
Conflicts:
	admin/css/ie8.css
	admin/css/screen.css
	admin/scss/_style.scss
	dev/install/config-form.html
	dev/install/install.css
	dev/install/php5-required.html
 2012-04-11 16:31:12 +02:00
Andrew O'Neil
4be59a8d45 MINOR: Ensure all form fields Field() method has the same signature as FormField::Field(). Fixes E_STRICT warnings. 2012-04-11 17:33:36 +12:00
Andrew O'Neil
daab8f4cbc MINOR: Consistently use DataObjectInterface for saveInto() on FormField subclasses. Fixes E_STRICT notice 2012-04-11 17:00:57 +12:00
Ingo Schommer
373d9e7b8f Merge branch 'master' into integration 2012-04-09 21:35:30 +02:00
Ingo Schommer
c2f7bf4dcf MINOR Fixed FormField::create() usage 2012-04-09 21:35:07 +02: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
Ingo Schommer
40d73127ae MINOR Using late static binding instead of Object::create() calls 2012-04-04 17:10:31 +02:00
Julian Seidenberg
98e197aff9 MINOR: SSF-38 renaming the PageUploadField template to HtmlEditorField_UploadField 2012-03-30 13:44:39 +13:00
Julian Seidenberg
ca83d845e1 ENHANCEMENT: SSF-38 added new template for the upload field that is used within a page image insertion dialog box. This upload field is slightly different from the one used in Files. E.g. it uses smaller fonts (h4 instead of h3) 2012-03-29 16:55:51 +13:00
Julian Seidenberg
94e21d18e1 MINOR: SSF-38 i18n of some of the form 2012-03-29 15:09:20 +13:00
Julian Seidenberg
9f9dc25338 ENHANCEMENT: SSF-38 initial rearranging of the insert image form to allow uploads as well as choosing an image from the CMS (and you can pick and choose from both) 2012-03-29 13:34:55 +13:00
Ingo Schommer
95f1800d80 BUGFIX Resolve local images correctly even with absolute URLs in HTMLEditorConfig_Toolbar, fixed display of remote images (don't try to format the thumbnail, which only works on local images) (fixes #6952) 2012-03-12 16:31:48 +01:00
Ingo Schommer
4fc3aaf939 Revert "ENHANCEMENT Using 'autoresize' TinyMCE plugin in HTMLEditorField default config, in order to save space when no content is entered into the field" - causes artificial loading delay, and doesn't detect height correctly due to floated images in paragraphs. These paragraphs can't be clearfix'ed because they'd become contenteditable (resizeable) elements in IE because of this. 
This reverts commit 69a8659a3d.
 2012-03-12 16:03:13 +01:00
Stig Lindqvist
09d6fa7bb3 API CHANGE Renamed GridFieldDefaultColumns to GridFieldDataColumns #6921 2012-03-09 14:07:40 +13:00
Stig Lindqvist
8b82dae06c API CHANGE: Renaming of gridfield components #6921 2012-03-09 12:54:02 +13:00
Ingo Schommer
e4a6dd5850 Merge branch 'integration' 
Conflicts:
	forms/gridfield/GridField.php
 2012-03-08 20:25:21 +01:00
Ingo Schommer
69a8659a3d ENHANCEMENT Using 'autoresize' TinyMCE plugin in HTMLEditorField default config, in order to save space when no content is entered into the field 2012-03-07 13:32:42 +01:00
Sam Minnee
adfdd068e2 Merge branch 'ereg-to-preg' of https://github.com/AngryPHPNerd/sapphire 
Conflicts:
	model/fieldtypes/Date.php
 2012-03-05 13:54:20 +13:00
Sean Harvey
b3d977f0e7 Merge remote-tracking branch 'upstream/master' into file_shortcodes 2012-03-03 10:24:06 +13:00
Sean Harvey
f5c4bc0802 ENHANCEMENT Ensure that broken File links receive an "ss-broken" class, just like broken SiteTree links 2012-03-01 23:24:58 +13:00
Sean Harvey
898c8f5497 ENHANCEMENT [file_link id=n] shortcode support for file links in HtmlEditorField 2012-03-01 22:20:58 +13:00
Ingo Schommer
da879da940 MINOR Styling and structural fixes for File/Image->getCMSFields() and relates usage in UploadField/HTMLEditorField. 2012-02-29 21:06:43 +01:00
AngryPHPNerd
0e2cbb0b88 Replace ereg with preg_* 2012-02-27 22:14:02 +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
5220a46fd0 ENHANCEMENT Inserting image via new dialog with ajax field retrieval and GridField file selection. Rewritten to jQuery.entwine and using the new HTML editor abstraction layer. 2012-02-14 13:53:35 +01:00
Ingo Schommer
3866f561f5 ENHANCEMENT Using GridField for file selection in "insert image" dialog 
API CHANGE Combined HTMLEditorField_Toolbar->FlashForm() and ImageForm() into new MediaForm() to handle both file types
 2012-02-14 13:30:52 +01:00
Ingo Schommer
243d4d45aa MINOR Restored row/col defaults in TextareaField and HtmlEditorField (broken in 1a10e8bc) 2012-02-10 12:15:41 +01:00
Sam Minnee
7c6050b407 Merge remote-tracking branch 'refs/remotes/chillu/formfield-constructors' 
Conflicts:
	forms/CountryDropdownField.php
 2012-01-10 16:41:02 +13:00
Ingo Schommer
5ec6aa532c ENHANCEMENT GZipped/combined file loading for TinyMCE, which reduces number of HTTP requests in the standard CMS by a third (and decreases file size due to loading pre-compressed files by default) 2012-01-06 15:34:32 +01:00
Ingo Schommer
98852677d5 ENHANCEMENT Simplified "insert link" interface and logic by reverting to TinyMCE's standard behaviour: Only allow linking on an existing selection, don't allow modifying the link content in the "insert" interface. Now that we're presenting this interface as a dialog rather than persistent sidebar its no longer necessary to have "unselected link creation+insertion". 2012-01-05 00:41:41 +01:00
Ingo Schommer
b5c739e71d ENHANCEMENT Refactored TinyMCE LinkForm from behaviour.js to jQuery.entwine. Fixed clearing of fields when popup is closed. 2012-01-05 00:41:41 +01:00
Ingo Schommer
e4d65ab01b MINOR Adding step indicators to "insert link" dialog 2012-01-03 23:01:05 +01:00
Ingo Schommer
b4b6e5a2db MINOR Cleaned up CMS dialog styling (now works with/without tabs, in iframe and inline markup), removed superfluous SCSS variable declarations 2012-01-03 18:11:21 +01:00
Ingo Schommer
0cf6421afe MINOR Button styling for "insert" dialogs 2012-01-03 09:38:42 +01:00
Ingo Schommer
1a10e8bcf5 API CHANGE Removed $rows and $cols constructor arguments on TextareaField and HtmlEditorField, use setRows() and setCols() instead 2012-01-02 17:44:23 +01:00
Ingo Schommer
e31851b182 BUGFIX Correctly mark DatetimeField, MoneyField and PhoneNumberField composites as disabled or readonly 2012-01-02 16:49:33 +01:00
Ingo Schommer
b5421d9598 ENHANCEMENT Allowing custom attributes in (most) FormField implementations, which allows for HTML5 data attributes 2012-01-02 16:48:14 +01:00
Sam Minnee
085598fac0 API CHANGE: Replaced ManyManyList::removeByFilter() with ManyManyList::removeAll(). 2011-10-29 17:36:39 +13:00