Commit Graph

242 Commits

Author SHA1 Message Date
Sam Minnee
75c64136ad MINOR Removed underscores from combined files in LeftAndMain, made redundant by r100536 (from r100537)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111627 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 06:01:08 +00:00
Sam Minnee
f04470ddf0 MINOR LeftAndMain combined files don't need to be prefixed with "assets" because default combined folder is set in sapphire/_config.php (from r100530)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111626 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:53:25 +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
cb5cb90889 BUGFIX #5135 LeftAndMain extra requirements loading for "themedcss" should use Requirements::themedCSS() not Requirements::css() - thanks Hamish! (from r100394)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111623 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:49:33 +00:00
Sam Minnee
a1cbf0cddf BUGFIX: Use underscores in names of combined .js (#3581) (from r99887)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111616 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:46:09 +00:00
Sam Minnee
325a57eea6 BUGFIX #5073: Fixed CMS version indicator for alpha and beta versions. (from r99789)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111615 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:46:01 +00:00
Sam Minnee
b1cc843801 MINOR: Bugfix in previous commit (from r98660) (from r99127)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111608 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:29:53 +00:00
Sam Minnee
c8f22503fc BUGFIX: Fixed cache prepopulation on sitetree load. (from r98651) (from r99125)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111606 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-04 05:29:34 +00:00
Ingo Schommer
2143443472 BUGFIX: Fixed bug in r97395 (from r97508) (from r99115)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@108819 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-08-03 03:15:46 +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
9a05d59f35 MINOR Added Requirements for SilverStripeNavigator (see r99080) (from r99098)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@106130 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-06-03 01:33:26 +00:00
Ingo Schommer
0ea8977cdc BUGFIX: columns quoted properly (from r98694)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@106110 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-06-03 00:16:58 +00:00
Ingo Schommer
12e7d39f27 MINOR: Only clear theme in CMS if we're not redirecting to the login form (better for testing). (from r98264)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@105859 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-28 02:37:30 +00:00
Ingo Schommer
5577dab2c5 MINOR Added jquery.metadata requirement to LeftAndMain::init()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@105522 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-05-25 02:57:00 +00:00
Ingo Schommer
01b02969f9 MINOR Fixed phpdoc documentation
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@103384 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-23 00:11:32 +00:00
Ingo Schommer
21aa2c6729 ENHANCEMENT: Performance improvement to CMS load time with many pages. (from r95490) (from r98165)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102886 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 06:14:47 +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
6c300f5659 MINOR added locking to static publisher to avoid two queues running at the same time. (from r87792) (from r98164)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102757 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 02:14:34 +00:00
Ingo Schommer
ca7d87078f MINOR when you delete a user from a group, they are also removed from any sub groups. (from r87119) (from r98158)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102754 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 01:49:29 +00:00
Ingo Schommer
67e39d229b BUGFIX: Don't let a user's theme break the CMS. (from r97909)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102748 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 01:34:13 +00:00
Ingo Schommer
29292b865d BUGFIX: Don't rely on the current directory for any logic. (from r97727)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102738 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 22:24:12 +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
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
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
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
1dfe8f3a83 ENHANCEMENT: Let LeftAndMain subclass canView() methods optionally redirect. (from r90018) (from r96800)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102663 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-13 03:26:55 +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
49cff72b8f BUGFIX: fixing CMS_ACCESS_LeftAndMain permission (=access all cms sections). Also added the test. (from r95788)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102465 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 08:44:29 +00:00
Ingo Schommer
49dd8ddfa5 ENHANCEMENT Allowing custom 'root forms' when id values '0' or 'root' are passed from the tree selection.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@98710 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-02-10 23:06:34 +00:00
Sean Harvey
760ee29f7c BUGFIX: Fix default inclusion of (theme|project)/css/editor.css into the WYSWIWYG editor. (from r94350)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@95647 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:58:37 +00:00
Sean Harvey
7269c7dfd5 MINOR Fixed undefined Director::join_links() error in Hierarcy eval'd code
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@93970 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-30 01:41:36 +00:00
Ingo Schommer
a0b82a2ec3 MINOR removed Director::Link(). Use Controller::join_links() instead (from r93785)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@93959 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-30 01:19:22 +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
Will Rossiter
8d52651923 APICHANGE: removed deprecated extend calls
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@93632 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-26 20:40:49 +00:00
Ingo Schommer
fdc736686a MINOR Syntax
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92939 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-22 08:23:14 +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
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
e3a51fe6b9 MINOR Bugfixes for SWFUpload
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92853 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:21:19 +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
1bc268e287 MINOR Only fetching EditForm in LeftAndMain->show() if called by ajax, the customize() call for non-ajax views confuses the renderer otherwise
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92847 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:20:56 +00:00
Ingo Schommer
32d6342aff MINOR Fixed merge errors
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92845 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:20:50 +00:00
Ingo Schommer
0df7de0c6b BUGFIX Using getRecord() in LeftAndMain->getEditForm(), passing through ID request params from getitem()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92844 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:20:47 +00:00
Ingo Schommer
8f92ee35fb MINOR Fixed Requirements paths in LeftAndMain.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92843 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:20:45 +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
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
c44bc29a8f ENHANCEMENT Adding ParentID and ClassName fields in LeftAndMain->getEditForm() if they're not already present. This ensures the UI can update state properly, e.g. to set the current tree element
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92836 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:20:30 +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