Commit Graph

1651 Commits

Author SHA1 Message Date
Sean Harvey
477dea3161 MINOR: Fixed a few glitches in the cuke tests (from r94531)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@95649 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:59:05 +00:00
Sean Harvey
eab27b46a8 MINOR: Added a first cut of some cucumber tests for the CMS (from r94529)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@95648 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:58:50 +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
b72d51ebbd BUGFIX: IE javascript errors on Assets, see ticket #4741 (from r93070) (from r94317)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@95645 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:57:15 +00:00
Sean Harvey
70b26c2f3c MINOR fixed widget area
MINOR added select box listing anchors in text (from r94198)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@95644 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:55:26 +00:00
Sean Harvey
b3bc53738b BUGFIX: if SecurityAdmin::add_hidden_permission() is called more than once, the later one is never added due two array operator "+" (from r94100)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@95643 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:54:23 +00:00
Sean Harvey
c2403fc8c9 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) (from r94062)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@95642 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:54:10 +00:00
Sean Harvey
1c66833747 BUGFIX: add proper language link broken (from r93984)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@95641 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:53:36 +00:00
Sean Harvey
2d8192aef3 BUGFIX: Changed paths according to moved thirdparty dependencies. This bit change is merged from r92613. (from r93965)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@95640 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:53:01 +00:00
Andrew Short
ed5ef98c41 BUGFIX: Properly closed a tag in AssetTableField that was hiding content after the back link tracking tab.
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@95036 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-13 05:24:18 +00:00
Ingo Schommer
ed6334ddee MINOR Added pl_PL.js translation (#4788, thanks qlex)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@94224 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-02 03:38:44 +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
b53413924c MINOR Mergeinfo
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@93958 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-30 01:17:45 +00:00
Ingo Schommer
34d7b24892 BUGFIX Removed code that relied on deprecated functions in MemberTableField (from r93707)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@93956 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-30 01:12:53 +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
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
Mark Stephens
276a36e493 ENHANCEMENT: Change to TreeDropdownField, giving it filtering behaviour as described in ticket http://open.silverstripe.org/ticket/3007 . Its disabled by default for legacy compatibility, but enabled for HtmlEditorField so that link editor is filterable for local links, via an extra boolean parameter on TreeDowndownField.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@93932 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-29 23:29:31 +00:00
Will Rossiter
87bea98bec API CHANGE: Removed val(). Use XML_val() instead.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@93650 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-26 21:37:19 +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
fe66ca6861 MINOR Updated language master table, including all changes from jsrewrite refactoring
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92942 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-22 08:46:00 +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
d0cc476c2a MINOR Merged CanOrganiseSitetree permission into CMSMain_TreeTools.ss (originally implemented in r84073)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92940 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-22 08:23:16 +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
7a1e3a9bda ENHANCEMENT Allowing to hide certain permission from showing in SecurityAdmin through add_hidden_permission() (refactored from r92428)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92866 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 05:24:43 +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
2c7e4c1dd4 BUGFIX Fixed 'add member' popup in SecurityAdmin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92851 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:21:10 +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
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
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
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
c18923040d MINOR Fixed merge error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92842 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:20:43 +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
3a14e1dc58 MINOR Removed unused SecurityAdmin->deleteitems() method
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92840 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:20:38 +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
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
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
d732ee4c26 BUGFIX Don't invoke statusMessage() in LeftAndMain.EditForm.js form save callbacks, its already handled in LeftAndMain.js for global ajax completion callbacks
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92835 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:20:28 +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
e56852dcd8 ENHANCEMENT Adjusted SecurityAdmin to new LeftAndMain API and jquery.concrete javascript. Changed 'delete' and 'create' interface to be more in line with CMSMain parent implementation, and increase code reuse.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92831 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-21 03:20:17 +00:00