Commit Graph

129 Commits

Author SHA1 Message Date
Sam Minnee
18add377f2 MINOR Fixed wrong default value for AssetAdmin (see r101106) (from r101111)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111637 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:07:04 +00:00
Sam Minnee
c49b38f615 MINOR Disabled metadata upload in AssetAdmin by default, configurable through AssetAdmin::$metadata_upload_enabled. Feature needs UI review. (from r101106)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111636 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:06:57 +00:00
Sam Minnee
f8f18f40aa Several merges from branches/2.4
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111631 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:04:21 +00:00
Sam Minnee
70105f066e ENHANCEMENT AssetAdmin now uses Upload_Validator instead of setting the rules directly on Upload (from r100058)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111618 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:47:30 +00:00
Sam Minnee
b212b5c98b FEATURE set file metadata on upload. (from r97780) (from r99117)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111601 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:21:21 +00:00
Ingo Schommer
2a5cb1eb87 ENHANCEMENT: Select the uploaded image after uploading by default. #4962 (from r97765)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102747 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 01:33:29 +00:00
Ingo Schommer
32bdc74381 APICHANGE: removed SWFUpload. Refactored Content Editors uploader to use standard uploader. (from r97489)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102718 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 21:57:55 +00:00
Ingo Schommer
afd8faf567 BUGFIX #4857 Fixed potential bug where a file would just be uploaded to a random folder, also files can now be uploaded to the assets root properly (from r96993)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102705 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 06:59:09 +00:00
Ingo Schommer
168589a59f MINOR Updated jQuery.concrete references to point to the new "entwine" name
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102697 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 05:55:56 +00:00
Ingo Schommer
cc522e07ae MINOR moved allowed_extensions and friends to the model layer (from r92046) (from r96816)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102678 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 03:55:52 +00:00
Ingo Schommer
480d5068d1 API CHANGE: Added numChildrenMethod argument to LeftAndMain::getSiteTreeFor()
BUGFIX: Use the correct numChildrenMethod when showing the 'all children, including deleted' tree (from r91166) (from r96809)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102474 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 09:22:43 +00:00
Ingo Schommer
0624cc69ed MINOR Moved defined variables in AssetAdmin::doUpload() to the top of the method for consistency (from r96230)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102468 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 08:47:46 +00:00
Ingo Schommer
677beef9dd MINOR Removed ContentNegotiator::disable() since it's disabled by default (in AssetAdmin) (from r93681)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@93954 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-30 01:05:13 +00:00
Ingo Schommer
8e8f9c5e77 MINOR Fixed Requirements path references in LeftAndMain and AssetAdmin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92861 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 04:50:02 +00:00
Ingo Schommer
394e0c0b38 MINOR Removed cms/thirdparty/swfupload, moved to sapphire/thirdparty
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92852 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:21:16 +00:00
Ingo Schommer
990ae9f145 BUGFIX Fixed CMSMain.js search clearing logic, wasnt clearing the first field properly. Fixed LeftAndMain->getsubtree() filtering in AssetAdmin and SecurityAdmin.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92849 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:21:03 +00:00
Ingo Schommer
9c3ecea1e7 ENHANCEMENT Unifying tree logic in most LeftAndMain subclasses: CMSMain, SecurityAdmin, AssetAdmin. Using a common LeftAndMainMarkingFilter. Allowing for custom node counts in SecurityAdmin and AssetAdmin.
API CHANGE Renamed CMSMain->getfilteredsubtree() to doSearchTree()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92848 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:21:00 +00:00
Ingo Schommer
b943a65f37 API CHANGE Moved SecurityAdmin/AssetAdmin doAdd() and AddForm() methods into a common base implementation on LeftAndMain
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92841 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:20:41 +00:00
Ingo Schommer
7569c5385e MINOR Removed unnecessary Requirements in AssetAdmin->init() - they are now included by jquery.ondemand
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92838 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:20:34 +00:00
Ingo Schommer
e91c0ca9df MINOR Using Filesystem::makeFolder() for creating /assets in AssetAdmin->init()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92837 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:20:32 +00:00
Ingo Schommer
45f87288fc API CHANGE Moved CMSMain/AssetAdmin/SecurityAdmin implementations for getEditForm() and save() to a common parent: LeftAndMain
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92834 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:20:26 +00:00
Ingo Schommer
9d0954e129 BUGFIX Setting AssetAdmin::tree_class to the actually managed object: 'Folder' instead of 'File'
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92833 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:20:23 +00:00
Ingo Schommer
98ce1b1f07 MINOR Moved batch actions code from AssetAdmin/CMSMain to a common LeftAndMain parent (which is now reused by SecurityAdmin as well)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92832 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:20:21 +00:00
Ingo Schommer
c467c926fd ENHANCEMENT Converted AssetAdmin and AssetTableField javascript to jquery-concrete
MINOR Moved AssetAdmin->movemarked() logic to AssetTableField

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92829 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:20:11 +00:00
Ingo Schommer
26df8bd9af ENHANCEMENT Moved AssetAdmin->deletemarked() logic into AssetTableField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92826 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:20:03 +00:00
Ingo Schommer
343044e89c ENHANCEMENT Using built-in TableListField javascript deletion for AssetTableField
ENHANCEMENT Less template overloading in AssetTableField.ss

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92820 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:19:47 +00:00
Ingo Schommer
97ece94acf BUGFIX Fixed AssetAdmin->doUpload() javascript callbacks
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92815 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:19:35 +00:00
Ingo Schommer
5738c57d8a MINOR Fixed ParentID setting in AssetAdmin->doAdd() and using instead of
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92812 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:19:29 +00:00
Ingo Schommer
067b7bcaeb ENHANCEMENT Changed AssetAdmin interface 'delete' action to behave same as main CMS interface: Show 'batch actions' with dropdown. Added AssetAdmin_DeleteBatchAction class.
ENHANCEMENT Moved 'Sync files' action in AssetAdmin from toplevel tab to the bottom of the tree and hooked up to AssetAdmin->SyncForm to avoid hardcoding the URL.
ENHANCEMENT Changed AssetAdmin interface 'create' button to show dialog and 'go' button, and behave similar to the main CMS interface

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92802 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:19:05 +00:00
Ingo Schommer
e47ce88853 ENHANCEMENT Making CMSBatchActionHandler specific to record class, in order to have different batch actions for AssetAdmin (removing folders). Added CMSBatchActionHandler->batchActions() and changed internal representation of batch actions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92801 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:19:02 +00:00
Ingo Schommer
34f8f9eaf3 MINOR Moved batch actions javascript from CMSMain.BatchAction.js to LeftAndMain.BatchActions.js to make it reuseable in AssetAdmin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92798 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:18:55 +00:00
Ingo Schommer
a9adcbefaa MINOR Overloading 'create' button for AssetAdmin.js to perform action instead of opening a tab.
MINOR Moved drag/drop functionality into new AssetAdmin.DragDrop.js location (will most likely be temporary until we switch to jQuery drag/drop)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92787 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:18:25 +00:00
Ingo Schommer
2fce8cf06e MINOR Adjusted AssetAdmin->getEditForm() to comply with changed javascript - it returns the rendered form now
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92785 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:18:19 +00:00
Ingo Schommer
9504fc1d57 BUGFIX Removed LeftAndMain.js requirement from AssetAdmin->uploadIframe(), unclear why its needed, and it breaks due to missing jquery/concrete dependencies
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92784 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:18:15 +00:00
Ingo Schommer
97f74765fa MINOR Removed duplicate greybox.css requirement from AssetAdmin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92783 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:18:10 +00:00
Ingo Schommer
23bac6e84f API CHANGE LeftAndMain->EditForm() returns EmptyForm() by default, as not all subclasses might want to implement the previously used getEditForm() method (e.g. ModelAdmin, which has its own sub-controllers to handle requests). Added specialized EditForm() overrides to AssetAdmin and CMSMain
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92759 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:17:16 +00:00
Ingo Schommer
d0d676b1b0 MINOR Fixed remaining references to jsparty/ directory in CSS and PHP files
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92750 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:16:54 +00:00
Ingo Schommer
dc4375a383 API CHANGE Removed LeftAndMain->EditForm(), please use getEditForm() instead
API CHANGE Returning LeftAndMain->EmptyForm() as a welcome/placeholder message from LeftAndMain->getEditForm() if no record is found. Removed this placeholder from LeftAndMain_right.ss
ENHANCEMENT Allowing optional $id parameter in LeftAndMain->getEditForm() (and subclasses)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92710 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:15:13 +00:00
Ingo Schommer
e30f92a2f8 API CHANGE Returning empty form from getEditForm() method in CMSMain, AssetAdmin, SecurityAdmin to avoid an <% if %> condition in the template. The previous placeholder text is now always stored alongside the form template. This also allows for easier class overloading with different URLs, as the form action is no longer hardcoded in the template placeholder form.
BUGFIX Adjusted AssetAdmin_left.ss, CommentAdmin_left.ss
MINOR Removed CommentAdmin_right.ss, SecurityAdmin_right.ss - inherits a more generic LeftAndMain_right.ss instead
MINOR Merged CommentAdmin_SiteTree.ss template back into CommentAdmin_left.ss

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92705 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:15:00 +00:00
Ingo Schommer
c2d24f9022 FEATURE Changed CMSMain and LeftAndMain form submissions to return raw HTML instead of using FormResponse logic and evaluated javascript. This allows a more customizeable UI layer that is decoupled from the serverside logic. Any state changes should be propagated through the form itself.
ENHANCEMENT Using new 'X-STATUS' HTTP response header for CMS form responses, as it is more robust for submitting variable length strings than the original 'Status' header. The status is evaluated in LeftAndMain.EditForm.js
API CHANGE Removed CMSMain->tellBrowserAboutPublicationChange(), LeftAndMain->returnItemToUser(), LeftAndMain->getActionUpdateJS(), LeftAndMain->addTreeNodeJS(), LeftAndMain->deleteTreeNodeJS(). Use javascript to respond to state changes
API CHANGE Removed CMSForm and CMSRightForm javascript classes, superseded by LeftAndMain.EditForm.js
ENHANCEMENT Removed custom change detection in LeftAndMain->save(), this should be handled by DataObject->write()
ENHANCEMENT Removed switch in LeftAndMain->save() which doesnt process saving if the record hasn't been altered, to simplify the saving logic
ENHANCEMENT Removed custom add/remove tree node logic in LeftAndMain->save() which was retrieving state from DataObjectLog. This was never actively used, and should be handled by custom clientside logic.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92674 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:39:12 +00:00
Ingo Schommer
0b9f4ab533 MINOR Adjusted to SiteTree->getTreeTitle() api change
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92669 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:38:59 +00:00
Ingo Schommer
ba0e2ffb86 MINOR Removed layout_helpers.js dependency
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92629 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:37:30 +00:00
Ingo Schommer
81fe7a2f10 MINOR Removed loader.js dependencies
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92628 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:37:27 +00:00
Ingo Schommer
538ff9b321 MINOR Moved jquery-fitheighttoparent, jquery-layout, swfupload from sapphire into cms
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92614 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:36:54 +00:00
Ingo Schommer
e17b09b2cc MINOR Changed paths to moved thirdparty dependencies (mostly from /jsparty to /sapphire/thirdparty, /cms/javascript and /sapphire/javascript)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92613 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:36:38 +00:00
Ingo Schommer
ac9ed436ab BUGFIX FolderID was not present in post, so file would not be uploaded to the correct place. (from r91958)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92472 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 02:01:06 +00:00
Will Rossiter
cd1a08d6a6 BUGFIX: fixed doUpload ajax submission to correctly handle files submitted via the content editor submission.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@91480 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-12 22:06:37 +00:00
Will Rossiter
3a96282669 BUGFIX: fixed file path error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@91350 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-11 23:06:08 +00:00
Sam Minnee
287887ccca BUGFIX #4642: Fixed creation of folders in non-english languages.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@90552 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-31 01:25:32 +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