Commit Graph

156 Commits

Author SHA1 Message Date
Sam Minnee
3a61db6221 BUGFIX: Don't let a user's theme break the CMS.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97909 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:29 +13:00
Sam Minnee
51cb7f35f3 BUGFIX: Don't rely on the current directory for any logic.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97727 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:29 +13:00
Ingo Schommer
16f9491f94 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

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97597 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:27 +13:00
Will Rossiter
a19fea2416 APICHANGE: removed SWFUpload. Refactored Content Editors uploader to use standard uploader.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97489 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:24 +13:00
Ingo Schommer
cda3d5ae2a MINOR Reverted 'single instance only' feature from r79868, delayed until later release (see #4277)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@97182 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:21 +13:00
Sam Minnee
7c6623373b BUGFIX: Don't show obsolete page if you refresh the CMS after deleting a page (from r94242)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96818 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:17 +13:00
Sam Minnee
0cdd75dfb1 API CHANGE: Added numChildrenMethod argument to LeftAndMain::getSiteTreeFor()
BUGFIX: Use the correct numChildrenMethod when showing the 'all children, including deleted' tree (from r91166)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96809 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:16 +13:00
Sam Minnee
0ee53df7a6 ENHANCEMENT: Let LeftAndMain subclass canView() methods optionally redirect. (from r90018)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96800 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:14 +13:00
Sam Minnee
7af4414a02 BUGFIX: Fix changing the URLSegment on a page making the Draft Site link
point to the wrong subsite (from r87776)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96781 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:11 +13:00
Sam Minnee
00264e219c BUGFIX: Fix highlighting of incorrect page when loading a page in the
admin section via URL (from r87320)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96779 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:11 +13:00
Mateusz Uzdowski
b89cb9b018 BUGFIX: fixing CMS_ACCESS_LeftAndMain permission (=access all cms sections). Also added the test.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@95788 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:09 +13:00
Tom Rix
ee49d36dd7 MINOR remove relic of concurrent editing
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@95070 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:08 +13:00
Sam Minnee
f17dd0c37e BUGFIX: Fix default inclusion of (theme|project)/css/editor.css into the WYSWIWYG editor.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@94350 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:07 +13:00
Will Rossiter
8eddb47344 API CHANGE: removed Director::Link(). Use Controller::join_links() instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93785 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:05 +13:00
Will Rossiter
a12f9c987f API CHANGE: removed deprecated LeftAndMain::add_menu_item. Use CMSMenu::add_menu_item()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93687 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:05 +13:00
Will Rossiter
49b720ffd0 API CHANGE: removed deprecated extend calls (r93632). API CHANGE: removed fieldExists(). Use hasField() (r93633). API CHANGE removed listOfFields() (r93647). API CHANGE: removed Tag() and URL() from Image. Use getTag() and getURL(). BUGFIX: updated Image.php to use getTag() (r93639, r93646). API CHANGE: removed val(). Use XML_val() (r93650). API CHANGE: removed $add_action. Use singlar_name or lang tables (r93658). API CHANGE: removed ConfirmedFormAction (r93674). API CHANGE: removed ajax_render on CTF (r93679).
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93685 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:05 +13:00
Sean Harvey
84a591bf2b BUGFIX Removed calls to Translatable::is_enabled() since it's deprecated, replaced with Object::has_extension('SiteTree', 'Translatable') instead
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93676 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
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
dcd6c53ca5 MINOR: fixed typo with path
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91541 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
Ingo Schommer
27521df744 MINOR Changed silverstripe.com references to silverstripe.org
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@90887 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:52:03 +13:00
Sam Minnee
0e224a7daa Merge branch 'master' of git@github.com:sminnee/silverstripe-cms
From: Sam Minnee <sam@silverstripe.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89702 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-21 01:53:49 +00:00
Sam Minnee
34ca1572d3 MINOR: Moved onAfterSave call for LeftAndMain decorators to be called
slightly later, so FormResponses can be overridden if necessary. (from r85614)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89224 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:44:29 +00:00
Sam Minnee
53d735c4f6 FEATURE SiteConfig (from r85339)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@89194 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-10-15 22:33:14 +00:00
Ingo Schommer
a1a3b355d0 MINOR Explicitly allowing 'index' action in LeftAndMain and subclasses, due to api change in RequestHandler logic for $allowed_actions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@86003 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-09-10 01:38:29 +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
Andrew O'Neil
089483b2f4 NOTFORMERGE: Merged 84085 from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@84090 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-10 04:34:17 +00:00
Tom Rix
96d438f21e ENHANCEMENT added new permission, SITETREE_REORGANISE
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@84073 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-09 22:29:45 +00:00
Sam Minnee
2d97200a23 BUGFIX: Removed Requirements::combine_files() reference to non-existent cms/javascript/FilterSiteTree.js
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@84064 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-08-08 03:23:21 +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
Sam Minnee
037e73a8cb ENHANCEMENT: Dramatically improved performance of large-scale canEdit() and canDelete() checks, so that big sites can be supported in the CMS.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@83443 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-31 05:43:47 +00:00
Tom Rix
56281b7f3e MINOR prevent exceptions when the wrong object type is passed to LeftAndMain
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@82488 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-23 00:54:40 +00:00
Sam Minnee
92ff4e149b BUGFIX: Removed redundant template_templates setting that couldn't be overridden.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@81593 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-10 03:56:39 +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
7580c94b9a BUGFIX: Allow more style attributes in WYSIWYG editor so that all of the formatting buttons work.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@81003 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-07-05 22:04:05 +00:00
Sam Minnee
2bd8782cdd MINOR ajshort: Removed call to deprecated Director site mode function.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@80056 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-25 08:20:59 +00:00
Saophalkun Ponlu
5cfcf03d11 FEATURE: Single instance only page (in the site tree). OS ticket #1554
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@79868 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-23 17:45:55 +00:00
Sean Harvey
5daa1033d9 MINOR Removed commented out line referencing tiny_mce
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@79152 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-15 02:05:01 +00:00
Ingo Schommer
3095172519 MINOR Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@78169 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-01 21:14:29 +00:00
Sean Harvey
8625e3bce3 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77067 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-18 05:31:22 +00:00
Sean Harvey
f27122e102 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77033 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-18 00:23:52 +00:00
Sean Harvey
c69994f98f Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@77023 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-17 23:19:51 +00:00
Sean Harvey
b360ad9cd7 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@76857 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-14 06:11:18 +00:00
Sean Harvey
a9ea6549c3 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75905 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-04 01:27:35 +00:00
Sean Harvey
4e4810bbb6 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75780 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-30 22:47:28 +00:00
Sean Harvey
42a6692d79 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75592 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-29 01:44:28 +00:00
Ingo Schommer
8d61656c2e MINOR Changed formatting and documentation for classname change detection in LeftAndMain->save(), slightly adapted to new DataObject->newClassInstance() method
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@75250 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-27 05:58:54 +00:00
Ingo Schommer
310b75fce6 MINOR Using Translatable::choose_site_locale() instead of choose_site_lang() in LeftAndMain->init()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@74072 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-03 21:26:51 +00:00