Commit Graph

367 Commits

Author SHA1 Message Date
Luke Hudson
3c2dcf4dd2 BUGFIX: Fix IE bug with Files&Images (#4912)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96566 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:10 +13:00
Mateusz Uzdowski
ea20f1101f BUGFIX: getting rid of problem with disappearing buttons on the initial page load (not ajax). The initialization was called twice on the CMSForm, and on the second call the ajaxActionsAtTop was removing the buttons - now the buttons are removed only when there is something to be added.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96551 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:10 +13:00
Luke Hudson
305cfe9c36 REVERT: Code duplicated, as Observable interface can be used instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96448 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:10 +13:00
Luke Hudson
e4d1eee3c1 BUGFIX: Check for functions existence
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96443 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:10 +13:00
Luke Hudson
3a63f1ab52 BUGFIX: Check for empty
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96441 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:10 +13:00
Luke Hudson
904fcf02d0 FEATURE: Add onLoad callback handler CMSLoadFunctions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96440 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:10 +13:00
Mateusz Uzdowski
08e9a35242 BUGFIX: when the JS files are combined, swfupload.js gets included in pages where there are no placeholder elements available, failing with exception and killing the javascript for the page. Now the exception is intercepted and ignored.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@95972 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:09 +13:00
Sean Harvey
451aa6c536 MINOR Set url variable in TreeAPI.reload as local variable in LeftAndMain_left.js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@95971 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:09 +13:00
Luke Hudson
c4e11804db BUGFIX: Prevent text-selection during drag operation, Firefox-specific
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@95511 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:09 +13:00
Sean Harvey
99166edd24 BUGFIX #4847 Fixed ComplexTableField undefined in IE8 when opening a CTF popup in the Security section of the CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@95091 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:08 +13:00
Sean Harvey
77dfeb267f BUGFIX #4848 Fixed ComplexTableField undefined error in IE8 when it is not available
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@95088 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:08 +13:00
Tom Rix
2d3365f7b2 MINOR make widgetarea/editor more suitable for generic use
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@95086 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:08 +13:00
Tom Rix
34c1943a26 MINOR adding maori macron button back
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@94986 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:08 +13:00
Tom Rix
6c160db322 MINOR fixed bug where widget area editor would not be activated
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@94829 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:08 +13:00
Will Rossiter
2eea820daf BUGFIX: Cleanup after aborted drag operation in Assets (#4735) (from r93071)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@94319 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:07 +13:00
Normann Lou
233690b24d BUGFIX: is tinyMCE is not loaded, we cannot call its function. This is specially important in a pop-up of ComplexTableField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@94238 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:07 +13:00
Tom Rix
d99445c01b MINOR fixed widget area
MINOR added select box listing anchors in text

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@94198 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:06 +13:00
Sean Harvey
dc76a95357 BUGFIX Fixed IE bug in ReportAdmin_left.js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@94170 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:06 +13:00
Ingo Schommer
a8fdcbd967 ENHANCEMENT Loading of tinymce_ssbuttons plugin via relative paths in HtmlEditorConfig rather than using the plugin name as a path spec (see r94060)
API CHANGE Changed cms/javascript/tinymce_ssbuttons plugin name to "ssbuttons" (see r94060)
API CHANGE Changed cms/javascript/tinymce_ssmacron plugin name to "ssmacron" (see r94060)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@94062 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:06 +13:00
Normann Lou
429de60890 BUGFIX: add proper language link broken
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93984 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:06 +13:00
Normann Lou
406c4816a4 BUGFIX: Changed paths according to moved thirdparty dependencies. This bit change is merged from r92613.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93965 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:06 +13:00
Ingo Schommer
064aa64886 MINOR Javascript variable declarations in CMSMain_left.js (#4741)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93762 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:05 +13:00
Ingo Schommer
ce3365d095 MINOR Updated paths from jsparty to sapphire/thirdparty, cms/thirdparty and cms/javascript
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93612 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:04 +13:00
Ingo Schommer
928529d04b MINOR Moved jsparty/hover.js to cms/javascript/hover.js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93569 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:04 +13:00
Ingo Schommer
1c28f65882 MINOR Moved jsparty/highlight.js to cms/javascript/highlight.js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93568 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:04 +13:00
Ingo Schommer
b18fee9e0d MINOR Moved jsparty/tinymce_ssmacron to cms/javascript/tinymce_ssmacron
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93564 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:04 +13:00
Ingo Schommer
d7f04ec49b MINOR Moved jsparty/tinymce_ssbuttons to cms/javascript/tinymce_ssbuttons
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93563 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:04 +13:00
Tom Rix
5c8628e7d4 MINOR added stubs to allow widgets to use treedropdown fields
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91850 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:03 +13:00
Will Rossiter
c35ad8c3e0 MINOR: removed debug statements
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91543 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:03 +13:00
Will Rossiter
d59b2ad5cf BUGFIX: fixed order inclusion of js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91542 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:03 +13:00
Will Rossiter
a9427422c0 FEATURE: added ability to upload images from site content pane. Merged via r9130, r91347, r91350, r91480
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91496 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:03 +13:00
Ingo Schommer
d6a2e66c89 MINOR removed concurrent editing (merged from r91198)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91205 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:03 +13:00
Andrew O'Neil
e4d9e265d2 BUGFIX: Fix concurrent editing message always being displayed on page version history.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91203 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:03 +13:00
Ingo Schommer
22aaf67b85 MINOR: fixed page comment form disappearing when validation failed (from r82778)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90846 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-05 01:11:40 +00:00
Tom Rix
a0649efa49 BUGFIX WidgetArea now works. Can have multiple areas on a page, and has unit tests
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90831 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-05 00:13:56 +00:00
Tom Rix
feafb55f94 MINOR fixed JS errors
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90684 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-03 02:01:19 +00:00
Sean Harvey
9cd09d53f8 ENHANCEMENT Current search and current page of asset section are persistent. Fixes the open source ticket #4470 and also a part of #4256 (from r84091)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89820 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-21 04:39:50 +00:00
Sean Harvey
b2fe474fde ENHANCEMENT Return the results of the FilesystemSyncTask to the status message in the CMS instead of a generic success message (from r82618)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89813 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-21 04:34:41 +00:00
Sam Minnee
a7c07369e0 FEATURE batch actions for setting/resetting embargo/expiry (from r85397)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89221 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:44:08 +00:00
Sam Minnee
2294857460 ENHANCMENT side reports can now have parameters (from r85329)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89220 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:43:58 +00:00
Sam Minnee
ce7497c38a MINOR embargo expiry fixes
MINOR deny/cancel spun out into seperate actyions (from r85047)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89219 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:43:47 +00:00
Normann Lou
7eef2f4b25 MINOR: make sure the element exists before using it.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@85124 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-25 00:22:05 +00:00
Tom Rix
2367de0758 MINOR fixed SiteTree search in admin
APICHANGE added onAfterSave in LeftAndMain

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@84570 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-17 22:31:16 +00:00
Tom Rix
15d75ad293 FEATURE concurrent editing alerts. if two users are editing a page, the will get a notice. If Bob deletes/saves the page Alice is working on, Alice will be notified.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@84231 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-12 21:19:04 +00:00
Tom Rix
6a0f21ca05 ENHANCEMENT sitetree filters now show up in a dropdown, and you can add your own by extending CMSSiteTreeFilter
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@83674 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-04 03:09:26 +00:00
Ingo Schommer
f7566166fb MINOR Removed unused ImprintStats.js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@82129 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-19 23:46:36 +00:00
Ingo Schommer
5d4ae0dde1 BUGFIX: autocomplete field should works on all config sub_item of a SecurityAdmin (merged from branches/2.3-nzct)
MINOR: the autocomplete field AjaxMemberLookup? should be only applied to the defined input field with has "text" class. This is for performance imporovement (merged from branches/2.3-nzct)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@82092 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-17 02:23:57 +00:00
Sam Minnee
7147a863b8 BUGFIX Open selected node by default when entering batch actions to trigger loading of children and avoid "missed" nodes in any batch selection
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@81459 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-09 05:40:45 +00:00
Sam Minnee
fece6769fe ENHANCEMENT Query ajaxExpansion on tree nodes without node limitation on serverside (see Hierarchy->markPartialTree()) to avoid "missing" nodes during the selection
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@81458 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-09 05:36:47 +00:00
Sam Minnee
119121b0f2 BUGFIX Open selected node and immediate child nodes when using batch actions to ensure that all nodes can actually be selected. This will optionally trigger ajax loading for further nodes
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@81457 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-09 05:36:24 +00:00