tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
9,194 Commits 31 Branches 527 Tags 162 MiB
6b611c6825
Commit Graph

505 Commits

Author SHA1 Message Date
Naomi Guyer
68f9cde226 BUGFIX: 7219-feedback-changes-file-upload 
Altered files from ENHANCEMENT: UI Changes to FileUpload Area
(TRAC-7219 that were missed in the prior push
 2012-05-10 11:41:09 +02:00
Ingo Schommer
8e1aae35de Merge pull request #428 from silverstripe-scienceninjas/datefield-calendar 
BUGFIX: DateField with calender do not format the date correctly after it's picked from the calendar.
 2012-05-10 02:17:52 -07:00
Ingo Schommer
6956b1be5c Merge pull request #412 from adrexia/sapphire 
---

The two bug fixes impact on the file area, but have wider reach.

BUGFIX: Colour Adjustments
Change the constructive button colour to match the colour used in the designs, and fix up calculations to produce the correct button colour.

BUGFIX: IE Colours
Replace hard coded colours in IE with variables, and refactor code so that shared IE7 and IE8 fixes are in one place.

ENHANCEMENT: UI Changes to FileUpload Area (TRAC-7219)
1. Add arrows to edit dropdowns
2. Adjust lightened fields so they dont 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-10 10:27:11 +02:00
Stig Lindqvist
a5355a7f39 BUGFIX: DateField with calender do not format the date correctly after it's picked from the calendar. 2012-05-10 17:33:57 +12:00
Ingo Schommer
f546ab2a70 Merge pull request #417 from halkyon/sapphire 
---

Ensure the lazy loaded form inside htmleditorfield-dialog is redrawn when lazy loaded. This fixes the initial state for the insert link dialog form.

Also ensure the link form uses "internal" as the default, so the initial state doesnt show all fields, just those associated with the first radio option "internal".

This also fixes http://open.silverstripe.org/ticket/7273.
 2012-05-09 11:26:01 +02:00
Ingo Schommer
82db28811d BUGFIX Show progress indicator when uploads are added to AssetUploadField, to ensure that failed uploads (e.g. exceeding max filesize) can actually show their error message to the user 2012-05-09 11:19:06 +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
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
cd13c0e178 BUGFIX: updating the value of a tree dropdown field, its title is not updated accordingly if using TreeTitle as the drropdown item title 2012-05-07 15:43:25 +12:00
Naomi Guyer
61c18c5dbc BUGFIXES: Fixes #7003 2012-04-30 12:25:35 +12:00
Ingo Schommer
8489ff37db Merge pull request #359 from silverstripe-big-o/sapphire 
---

When open an image form loaded from TinyMCE Content, change the looks of the popup, such as popup heading (change from "Insert Image" to "Update Image"), action button label (change from "Insert" to "Update"), hiding the cancelling button on the top right corner which still needs to show when in inserting mode

Conflicts:
	lang/en.yml
 2012-04-27 10:15:16 +02: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
Mateusz Uzdowski
47e3052aaa ENHANCEMENT: allow folder selection when attaching files from the CMS 
http://open.silverstripe.org/ticket/7046
UploadField would default to one folder only, and wouldn't allow asset
tree traversal. HtmlEditorField MediaForm has this capability, so added
it here in a similar fashion via TreeDropdownField.
 2012-04-23 12:08:16 +12:00
Normann Lou
ca38b25014 BUGFIX: add CloseButton back, only hidde it when editing an image that loaded from content area. 
ENHANEMENT: remove call of toogleLooks() from redraw(), only call toggleLooks() when needed.
MINOR: code minimazing / code convention.
 2012-04-20 18:04:50 +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
Ingo Schommer
14895a2056 BUGFIX Only call TinyMCE.init() once per window load (actual editor creation happens through new tinymce.Editor() 2012-04-18 17:38:24 +02:00
Ingo Schommer
f26951c63d MINOR Don't try to remove editor containers before they exist 2012-04-18 16:54:20 +02:00
Ingo Schommer
7f62ad0f3e Merge branch 'master' into 7094-combine-tree-edit-view 2012-04-18 14:19:55 +02:00
Naomi Guyer
180a305dd1 MINOR: Whitespace cleanup ticket 6943 
Make sure tabs are used consistently.
 2012-04-18 10:51:53 +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
Ingo Schommer
84b0a7d96c MINOR Renamed .ss-tabset to .cms-tabset in cms templates to distinguish entwine selectors and add extra functionality (cookies, re-selecting tab, panel loading) 2012-04-17 17:40:37 +02: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
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
Ingo Schommer
5ea080a585 Merge pull request #296 from halkyon/old_js_validation_remnants 
MINOR Removing old client side validation remains - NumericField.js
 2012-04-11 06:15:25 -07:00
Stig Lindqvist
5750eb02b1 Merge pull request #295 from halkyon/redirectorpage_changes 
MINOR Removed RedirectorPage.js (has been moved to cms module)
 2012-04-11 04:10:23 -07:00
Sean Harvey
4d97e8867b MINOR Removed useless Security_login.js file which doesn't have any 
content and isn't used anywhere.
 2012-04-11 16:03:57 +12:00
Sean Harvey
3e307e00fe MINOR Removing old remains of NumericField.js validation which was 
removed in 9f3344b355
 2012-04-11 15:55:07 +12:00
Sean Harvey
da9dfca132 MINOR Removed RedirectorPage.js (has been moved to cms module where 
RedirectorPage.php resides)
 2012-04-11 15:33:38 +12:00
Ingo Schommer
a64715beeb BUGFIX Calling tinyMCE.init() in sync with entwine rules to avoid uncached loading interfereing with call order (fixes #6877) 2012-04-10 21:41:00 +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
Sam Minnee
e01b0aa3d0 ENHANCEMENT PjaxResponseNegotiator for more structured partial ajax refreshes, applied in CMS and GridField. Also fixes issues with history.pushState() and pseudo-redirects on form submissions (e.g. from page/add to page/edit/show/<new-record-id>) 2012-04-05 23:00:22 +02:00
Julian Seidenberg
14c3fd75a1 ENHANCEMENT: SSF-168 refactoring print button so that it opens print view in a new window. This is useful for debugging and also useful for when someone wants to use the print view not for printing, but for viewing a clean version of a gridfield without the surrounding CMS, using the view for copying and pasting into another app, for example. 2012-04-05 18:15:44 +12:00
Sean Harvey
6f89fe0703 BUGFIX Show/hide correct fields when inserting a link in HtmlEditorField 2012-04-05 16:50:49 +12:00
Julian Seidenberg
64d0cbab9a BUGFIX: SSF-38 hiding the insert image controls when editing an already inserted image. 2012-04-05 12:10:35 +12:00
Julian Seidenberg
7f8a682ad7 BUGFIX: SSF-38 fixing the "Choose files from your computer" upload field 2012-04-04 13:46:24 +12:00
Normann Lou
ba02e500e7 FEATURE added GridFieldPrintButton compoonent 2012-04-03 16:57:48 +12:00
Sean Harvey
89267419d4 BUGFIX When inserting an image in HtmlEditorField, don't append "px" as 
the width and height attributes only accept a number without a unit
 2012-04-02 14:10:20 +12:00
Julian Seidenberg
2110906715 BUGFIX: SSF-38 making the entwine selector for the upload field more specific, so it doesn't apply to every upload field in the CMS. Also, handling the case of uploading multiple files at once 2012-03-30 13:45:53 +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
Normann Lou
9a301e3990 BUGFIX: Empty error message on renaming a page and confirming url is changed accordingly 2012-03-27 17:07:24 +02:00
Will Rossiter
39d3761eb9 BUGFIX: #6934 allow whole TreeDropdownField to be clicked 2012-03-24 11:57:29 +13:00
Ingo Schommer
ed08b8c00b MINOR Don't auto-expand nodes on TreeDropdownField, as it makes a gazillion ajax requests on sufficiently large trees (and gets nodes in chunks of 30) (fixes #6879) 2012-03-14 23:04:43 +01:00
Ingo Schommer
b246522c24 MINOR Various fixes to get TableListField and ComplexTableField baseline operational (although usage of GridField is encouraged) 2012-03-12 17:26:40 +01:00
Ingo Schommer
1f01e1135d API CHANGE Removing ScaffoldingComplexTableField, using GridField instead to edit relationships through FormScaffolder and DataObject->scaffoldFormFields() 2012-03-09 15:16:01 +01:00
Sean Harvey
49267dbbc4 ENHANCEMENT Shortcodes now support commas as delimiter for attributes (thanks aoneil for help with the regex!) (trac #6868) 
BUGFIX HtmlEditorField not inserting shortcodes correctly (trac #6868)
 2012-03-09 14:25:42 +13:00
Sean Harvey
9f3344b355 API CHANGE Removed built-in behaviour.js client-side form validation. 
This is no longer supported. Please use custom client-side validation instead. (see 3.0.0 changelog
for more information)
 2012-03-09 12:19:57 +13:00
Ingo Schommer
e4a6dd5850 Merge branch 'integration' 
Conflicts:
	forms/gridfield/GridField.php
 2012-03-08 20:25:21 +01:00
Andrew O'Neil
4ad7e8ef8d FEATURE: Input box for going to a page in gridfield 2012-03-08 14:11:25 +13:00
Ingo Schommer
8afb8672f7 MINOR Using two_state checkboxes in TreeDropdownField.js (to allow individual node selection without enforcing children selection) 2012-03-08 01:49:35 +01:00
Ingo Schommer
0b4228231c MINOR Integrating GridFieldSearch.js in GridField.js (and using entwine for it) 2012-03-06 21:38:34 +01:00
Ingo Schommer
bd1f652fe9 ENHANCEMENT Improved focus handling in GridField 2012-03-06 15:50:07 +01:00
Ingo Schommer
dc83ace928 BUGFIX Fixed CSV exporting on GridFieldExporter (was calling action via ajax, which doesn't allow HTTP download responses) 2012-03-06 15:50:07 +01:00
Ingo Schommer
a5b7a22a05 MINOR Fixed GridField delete action, was executing row click event after delete, causing a panel load with a non-existent (now deleted) record 2012-03-06 01:23:34 +01:00
Normann Lou
2552baeecd ENHANCEMENT SSF-53 : add a 'filtered' class to filter button and reset button if its input field has filtering value 2012-03-06 12:33:53 +13:00
Normann Lou
8284fcc75b MINOR SSF-53 : add hover-alike class to "Reset" button for easy css styling while keydown on filter input field 2012-03-06 10:44:20 +13:00
Ingo Schommer
8da89c6f7c MINOR Generic .cms-help-toggle implementation to replace MemberDatetimeOptionsetField.js (which also didn't work when loaded via Ajax, and needed a rewrite to jQuery.entwine anyway) 2012-03-05 17:41:50 +01:00
Ingo Schommer
851099d82d MINOR Fixed default state of PermissionCheckboxSetField 2012-03-05 17:41:50 +01:00
Normann Lou
7dd7e60f5a MINOR SSF-53 : add / remove hover-alike class to "Filter" button for easy css styling while keydown on filter input field 2012-03-05 17:28:42 +13:00
Sean Harvey
b3d977f0e7 Merge remote-tracking branch 'upstream/master' into file_shortcodes 2012-03-03 10:24:06 +13:00
Ingo Schommer
b242bfb3da BUGFIX Include GET parameters of current URL in GridField on ajax reloads to retain view state 2012-03-02 20:46:22 +01:00
Ingo Schommer
4345eaa61b MINOR Sending 'ID' parameter from containing form alongside UploadField uploads, in order to set the correct context in in the controller (in the case of CMSFileAddController, that's the parent folder) 2012-03-02 15:21:12 +01:00
Ingo Schommer
db1854b5fb MINOR Disable UploadField init on readonly or disabled fields 2012-03-02 11:06:40 +01:00
Normann Lou
b58b281d8a BUGFIX SSF-53 : remove the disabled status of 'add button' in according with its sitting environment, ie. does it initialed by jQuery UI. If not, simply remove its 'disabled' attribute 2012-03-02 17:45:39 +13:00
Ingo Schommer
d02a68089f MINOR Catching GridField filter submission to enable usage through enter key in addition to clicking on the filter button (SSF-53) 2012-03-01 17:57:06 +01:00
Ingo Schommer
0b0e24b0ec MINOR Fixed UploadField edit forms falsely expanding by default 2012-03-01 11:58:40 +01:00
Sean Harvey
898c8f5497 ENHANCEMENT [file_link id=n] shortcode support for file links in HtmlEditorField 2012-03-01 22:20:58 +13:00
Normann Lou
e086875565 BUGFIX SSF-53 make adding existing member works by enabling the add button correctly 2012-03-01 15:18:04 +13:00
Ingo Schommer
a415034d0a MINOR Changed GridField.js edit click behaviour from event-based to an (subclassable) method class, which means it works outside of the CMS by default. Making the whole row active in case an edit link is present 2012-03-01 00:20:25 +01:00
Andrew O'Neil
7f7d6b3bea MINOR: Remove commented code 2012-03-01 11:08:05 +13:00
Andrew O'Neil
a50fc5180a MINOR: SSF-106 Dont hide filter buttons when search isnt selected 2012-03-01 10:59:29 +13:00
Ingo Schommer
34d3f29a95 BUGFIX Fixed TabSet.js initialisation with cookies, default to first tab rather than allowing tab deselects through an index of -1 2012-02-28 18:09:33 +01:00
Ingo Schommer
bcc73de85e Merge branch '106-add-edit-records-rc' 
Conflicts:
	admin/code/LeftAndMain.php
	admin/css/screen.css
	admin/scss/_style.scss
	admin/templates/Includes/LeftAndMain_EditForm.ss
	css/GridField.css
	filesystem/Folder.php
	forms/gridfield/GridField.php
	forms/gridfield/GridFieldDefaultColumns.php
	forms/gridfield/GridFieldPopupForms.php
 2012-02-27 23:58:10 +01:00
Ingo Schommer
8fcb40cdf0 Merge remote-tracking branch 'silverstripe-scienceninjas/pull/SSF-12' 2012-02-23 23:38:29 +01:00
Ingo Schommer
9465df6fb4 MINOR Less specific button selectors in CMS JavaScript to cover <button> tags as well 2012-02-23 23:29:58 +01:00
Ingo Schommer
ddf4791708 MINOR Simplified edit form toggle in UploadField.js, prevent new <button> element trigger from submitting the form 2012-02-23 23:29:58 +01:00
Ingo Schommer
8b6ef6599e MINOR Updating usage of jQuery.data() to confirm with API changes in 1.6 (camelcased names) 2012-02-23 23:29:58 +01:00
Ingo Schommer
0bc6bffa9b BUGFIX Changed CSS class structure of GridField to avoid duplication of ".ss-gridfield" selector in different contexts, and make selectors less verbose (no more "fieldset.ss-gridfield"). Added "field" class to GridField container to ensure it displays correctly alongside other form fields (mainly around margins and paddings) 2012-02-23 23:29:58 +01:00
Ingo Schommer
abedf2a4a9 ENHANCEMENT Confirming deletion of records in GridField via JavaScript alert 2012-02-23 23:29:55 +01:00
Andrew O'Neil
7a755da101 FEATURE Trigger event when new or edit link is clicked 2012-02-23 14:54:03 +13:00
Ingo Schommer
8790ba3c4f BUGFIX Retain editor focus when insert images, update attributes on existing image to avoid IE bugs through TinyMCE 2012-02-22 17:53:37 +01:00
Ingo Schommer
5f635d8315 BUGFIX Don't reload TreeDropdownField title via ajax if no value is set (which causes infinite loops) 2012-02-22 17:27:02 +01:00
Ingo Schommer
6ffb941c28 MINOR JS formatting 2012-02-22 11:15:54 +01:00
Stig Lindqvist
82748a0873 MINOR JS functionality on intercepting injected filtering of gridfields in LeftAndMain inherited Controllers. 2012-02-21 17:09:09 +13:00
Ingo Schommer
bb7c128025 MINOR JS syntax errors 2012-02-17 15:58:31 +01:00
Ingo Schommer
a196135089 API CHANGE Replace jQuery.metadata in DateField markup with HTML5 data attributes 2012-02-17 13:35:54 +01:00
Ingo Schommer
af4cf3ccc4 MINOR Fixed js accessor (thanks AngryPHPNerd) 2012-02-16 23:07:24 +01:00
Ingo Schommer
5911abc0f6 API CHANGE Removed prototype.js style $() alias usage for document.getElementById() to avoid confusion with the more common jQuery() alias. 
API CHANGE Removed several unsed JavaScript globals: sprintf(), Number.prototype.CURRENCIES, Number.prototype.toCurrency(), String.prototype.ucfirst(), jQuery.fn.clearFields(), jQuery.fn.clearInputs()
MINOR Removed prototype_improvements.js and jquery_improvements.js files, now contained in individual component code (or removed altogether)
 2012-02-16 12:27:47 +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
ce4f456fc7 MINOR Removed unused functionality from prototype_improvements.js 2012-02-14 13:53:35 +01:00
Ingo Schommer
e59976bb64 MINOR Removed custom TinyMCE image resizer logic, presumably added due to lack of support for retaining aspect ratio in earlier versions of the editor 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
9f12c5a252 MINOR API for clientside reloading of GridField 2012-02-14 13:30:52 +01:00
Ingo Schommer
1b42b2afa7 MINOR GridField JS API for updating state 2012-02-14 13:30:51 +01:00
Ingo Schommer
c00f0406e9 ENHANCEMENT Attaching files from /assets through UploadField 2012-02-08 15:34:41 +01:00
Ingo Schommer
4126b95cf7 ENHANCEMENT Allow selection of items in GridField (via JavaScript only) 2012-02-08 01:05:19 +01:00
Ingo Schommer
c0d187071a ENHANCEMENT New UploadField class to replace FileIframeField, ImageField and SimpleImageField 2012-02-03 01:00:08 +01:00
Stig Lindqvist
9b3af77637 BUGFIX It is not possible to use more than one autosuggestion field from GridFieldRelationAdd per view 2012-01-24 19:15:24 +01:00
Stig Lindqvist
c396c2d2ae API CHANGE Security admin supports adding, removing and searching for members by relations via gridfield 
This contains some experimental API's when using GridFieldPopupForms on GridFieldPopupForms.

- GridFieldRelationAdd
- GridFieldRelationDelete
 2012-01-24 02:46:07 +01:00
Russell Michell
ade3f5b912 MINOR: Typo in language file 2012-01-10 12:31:09 +13:00