Commit Graph

224 Commits

Author SHA1 Message Date
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
00a5a5bd5b Reverted r111624
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111625 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:52:58 +00:00
Sam Minnee
ba163b83ae MINOR Replaced locations of Director::is_ajax() and Director::redirectBack() with instance method calls - the latter static function is deprecated (from r100484)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111624 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:51:54 +00:00
Sam Minnee
4c510624b1 APICHANGE: Refactor Versioned so a single state is kept for stage, archived date, or any module specific reading modes (from r98161) (from r99119)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111604 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:27:08 +00:00
Sam Minnee
5b2897381b BUGFIX: Fix navigator links not opening in new windows. (from r97510) (from r99116)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111600 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:21:14 +00:00
Ingo Schommer
e65b892e31 MINOR Don't use FormResponse in CMSMain::save_siteconfig()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@108833 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-08-03 03:57:55 +00:00
Ingo Schommer
139c3e8c40 APICHANGE: Use the same navigator items in the CMS that are used on the frontend (from r97395) (from r99114)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@106143 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-06-03 02:45:23 +00:00
Ingo Schommer
653d162939 MINOR pingStatus ping frequency reduced
MINOR updated lang file for SiteConfig
MINOR improved documentation in StaticPublisher
MINOR improved documentation in CMSMain surrounding reports and siteconfig
MINOR migrated headers in SiteConfig to i18n'd (from r86429) (from r99112)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@106135 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-06-03 01:34:52 +00:00
Ingo Schommer
a3940b4e50 MINOR Fixed SS_HTTPResponse references in CMSBatchActionHandler (from r98285)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@106105 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-06-03 00:00:14 +00:00
Ingo Schommer
1eb1608707 MINOR Removed arguments to Hierarchy::getDescendantIDList() calls, as the method does not have any (from r98341)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@105861 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-28 02:37:58 +00:00
Ingo Schommer
850a9a9f6a BUGFIX: More fixes renaming SSReport to SS_Report (from r98218)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@105856 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-28 02:35:56 +00:00
Ingo Schommer
0389e784b2 API CHANGE: Removed SideReport class, use SSReport as the base-class for them instead.
API CHANGE: Use SSReport::register(SideReport) to explicitly register reports on the LHS of the content view.
BUGFIX: Updated all cms side reports to use SSReport as the base class. (from r95884) (from r98176)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@105827 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-28 02:23:10 +00:00
Ingo Schommer
258f779587 MINOR: Nicer date formatting (from r95761) (from r98171)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@105680 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-25 23:41:18 +00:00
Ingo Schommer
aaaaa86ca4 BUGFIX Using getRecord() instead of DataObject::get_by_id() in CMSMain->getEditForm() to fetch records deleted from stage or live (regression from jsrewrite feature branch)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102790 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 03:28:42 +00:00
Ingo Schommer
47dfe8b2ab ENHANCEMENT Redirecting to new record from LeftAndMain/CMSMain->doAdd() if not called via ajax
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102784 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 03:06:22 +00:00
Ingo Schommer
006ad3062f BUGFIX Fixed incorrect logic in CMSMain::generateTreeStylingJS() stopping different tree icons from working (from r98018)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102750 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 01:36:57 +00:00
Ingo Schommer
fe543edcd6 BUGFIX: Ticket #4805
added a canCreateTopLevel() if there is no parent object in CMSMain.php 
added testCreationOfTopLevelPage toCMSMainTest.php
added the nessessary 'database entries' in the CMSMainTest.yml (from r98001)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102749 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 01:36:42 +00:00
Ingo Schommer
3b50f8d3f3 ENHANCEMENT Changed menu title from "Site Content" to "Pages" to be consistent with other menu labels
ENHANCEMENT Changed tree root node in CMS to get title from SiteConfig rather than defaulting to "Site Content"
ENHANCEMENT Changed tree panel headline in CMS from "Site Content and Structure" to "Page Tree" to stay consistent with new CMS menu title (from r97597)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102731 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 22:19:49 +00:00
Ingo Schommer
2e1b39dfc4 MINOR Backwards compat fix for sprintf() call in CMSMain->providePermissions() (#4764) (from r97485)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102716 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 20:37:34 +00:00
Ingo Schommer
af2f81e37a BUGFIX Setting 'Locale' as HiddenField in CMSMain->getEditForm() to support translatable SiteConfig records (see r97370, #4770) (from r97472)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102715 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 20:37:16 +00:00
Ingo Schommer
ffbcc5d778 MINOR Reverted 'single instance only' feature from r79868, delayed until later release (see #4277) (from r97182)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102710 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 07:01:56 +00:00
Ingo Schommer
bce6ff833b MINOR Removed 'print' button from CMSMain->getEditForm() for display of older versions (see #4745) (from r97178)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102708 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 06:59:47 +00:00
Ingo Schommer
184289b3d9 BUGFIX: Use canDeleteFromLive instead of canPublish for checking delete from live action (from r93316) (from r96817)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102679 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 03:56:00 +00:00
Ingo Schommer
fd2037f603 BUGFIX: Use doDeleteFromLive when deleting pages from live, so that onBeforeUnpublish and onAfterUnpublish are called. (from r91381) (from r96811)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102674 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 03:52:07 +00:00
Ingo Schommer
1e972ed695 MINOR add a hidden field to attach the subsite ID, rather than relying on the session (from r91014) (from r96808)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102672 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 03:51:24 +00:00
Ingo Schommer
4078c31f66 MINOR: Fixed notice-level error in rollback. (from r90260) (from r96804)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102667 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 03:28:36 +00:00
Ingo Schommer
e98eb98238 BUGFIX: Don't set the Owner by default on new records. (from r89910) (from r96796)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102659 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 03:26:19 +00:00
Ingo Schommer
b7a1e438f7 BUGFIX: Fix changing the URLSegment on a page making the Draft Site link
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102475 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 09:41:45 +00:00
Ingo Schommer
51a330f594 BUGFIX Removed calls to Translatable::is_enabled() since it's deprecated, replaced with Object::has_extension('SiteTree', 'Translatable') instead (from r93676)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@93953 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-30 01:04:56 +00:00
Ingo Schommer
b29d887cc2 MINOR l10n in CMSMain.php, CMSMain.js and CMSSiteTreeFilter.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92941 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-22 08:45:59 +00:00
Ingo Schommer
a5070b858a API CHANGE Removed CMSSiteTreeFilter->showInList(), using custom logic in CMSMain->SearchTreeForm() instead
API CHANGE Returning arrays instead of Query resource from CMSSiteTreeFilter->pagesIncluded()
MINOR Removed unused LeftAndMain->getMarkingFilter() and CMSMainMarkingFilter, now handled by CMSSiteTreeFilter and CMSMain->SearchTreeForm()
ENHANCEMENT Moved 'page tree filter' dropdown logic into an additional option for CMSMain->SearchTreeForm() (originally implemented in r83674)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92938 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-22 08:23:12 +00:00
Ingo Schommer
683dfa9426 MINOR Styling of side reports and tree area in CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92850 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:21:08 +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
f793ffd368 ENHANCEMENT SideReportsHandler class for easier handling and templating of "side reprts" in the CMS interface
API CHANGE Removed CMSMain->ReportFormParameters()/ReportForm()/sidereport(), replaced with new SideReportsHandler class

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92846 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:20:54 +00:00
Ingo Schommer
2d82a2ff35 MINOR Syntax error and documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92839 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:20:36 +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
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
0c52d36846 BUGFIX Fixed undefined variable in CMSMain
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92821 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:19:49 +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
2e7f100a1c MINOR Moved LeftAndMain.BatchActions.js to LeftAndMain, its used in AssetAdmin as well
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92809 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:19:20 +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
58cd7beb33 MINOR Renamed CMSMain->addpage() to CMSMain->doAdd()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92800 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:18:59 +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
b9bfcc99b5 API CHANGE Renamed CMSMain->AddPageOptionsForm() to AddForm()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92797 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:18:51 +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
e22fdb94ca BUGFIX Defaulting to current page ID in CMSMain->EditForm()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92757 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:17:11 +00:00
Ingo Schommer
94eada294e API CHANGE Removed unnecessary CMSMain->getpagecount() method
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92751 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:16:57 +00:00
Ingo Schommer
44e3966d96 ENHANCEMENT Removed manual SiteTree->Status setting in LeftAndMain controllers, use specific getters like SiteTree->IsAddedToStage for this purpose
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92745 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:16:42 +00:00
Ingo Schommer
64e042a2a3 ENHANCEMENT Removed unused LeftAndMain->DeleteItemsForm
ENHANCEMENT Moved LeftAndMain->deleteitems() into SecurityAdmin, its the only place where its not replaced by CMSBatchAction yet

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92743 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:16:38 +00:00
Ingo Schommer
420d0a5c57 MINOR Removed unused LeftAndMain->PublishItemsForm(), has been replaced by CMSBatchAction a while ago
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92742 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:16:35 +00:00