Commit Graph

1297 Commits

Author SHA1 Message Date
Sean Harvey
60ff36ea47 MINOR Removed cases where GhostPage was being unset from the tests
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@77384 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:23 +13:00
Sean Harvey
435dea0c76 MINOR Removed unused ReportField_Controller URL rule from cms/_config.php
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@77381 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:22 +13:00
Andrew O'Neil
1f3b3f49cd Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@77326 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:22 +13:00
Sean Harvey
03aa331441 BUGFIX WidgetAreaEditor gets it's related WidgetArea using getComponent(), a more robust way of getting the component
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@77282 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:22 +13:00
Sean Harvey
30c95b1a65 MINOR Tweaked font size to be consistent with the other text in the CMS for TableField items and the URL field
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@77239 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:22 +13:00
Andrew O'Neil
3760e6b8c4 BUGFIX: #4082 - Translatable CMS fields layout broken in IE6
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@77111 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:22 +13:00
Hamish Friedlander
05599ac95b MINOR: Move CMS HtmlEditorConfig configuration from _config to LeftAndMain#init. Not it's final home, but less troublesome than _config.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@77048 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:22 +13:00
Hamish Friedlander
f4fae2a91e BUGFIX: Add JavaScript for HtmlEditorField on every CMS page, to avoid issue where loading form with HtmlEditorField via ajax doesn't work because scripts are stripped out.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@77031 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:22 +13:00
Ingo Schommer
5b53fda4e3 MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@77009 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:22 +13:00
Hamish Friedlander
f27e284f5f ENHANCEMENT: Significant speed up for SiteTree Filter
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76944 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:21 +13:00
Hamish Friedlander
ddbf2e2e99 MINOR: Make return trigger search, not clear, on SiteTree Filter
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76943 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:21 +13:00
Sean Harvey
6bdb807af1 BUGFIX Fixed potential non-object error in LeftAndMain::callPageMethod()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76930 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:21 +13:00
Sean Harvey
6c3a3677fe BUGFIX Fixed missing tinymce_template bug in ReportAdmin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76913 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:21 +13:00
Sean Harvey
88600e41ec MINOR Fixed faulty test case CMSMainTest->testPublish() to make use of $this->session() instead of creating a new one
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76887 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:21 +13:00
Ingo Schommer
292ccddad8 MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76879 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:21 +13:00
Hamish Friedlander
ac95e659f8 BUGFIX: Fix javascript error in IE caused by Changeset 76845 where reloading a page would trigger a resetChanged before the tinyMCE instance existed
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76875 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:21 +13:00
Ingo Schommer
b8b84d7687 MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76871 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:21 +13:00
Ingo Schommer
cc31e10672 MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76856 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:21 +13:00
Hamish Friedlander
f80bd441b7 BUGFIX: Fix issue with 'clear' button on CMS SiteTree search
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76852 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:21 +13:00
Hamish Friedlander
9e177f4c10 ENHANCEMENT: Use new HtmlEditorConfig API to specify options for CMS HtmlEditorField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76845 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:20 +13:00
Ingo Schommer
0e3b4bfc88 MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76843 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:20 +13:00
Hamish Friedlander
29ab106af8 ENHANCEMENT: Correct issue with SiteTree filtering not persisting and add drop down for page type and clear button. Part of a re-work of the search system
@todo: Tests, speed optimisation, proper connection of filtering with tree control checkboxes

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76779 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:20 +13:00
Sam Minnee
dad1e68bcf MINOR: Fixed tests
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76749 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:20 +13:00
Ingo Schommer
413b73dc0d MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76733 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:20 +13:00
Sam Minnee
b5c024a87b BUGFIX: Fixed WidgetAreaEditor javascript in IE
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76729 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:20 +13:00
Sam Minnee
0518e205c7 API CHANGE: Made batch actions pluggable through CMSBatchActionHandler::register()
ENHANCEMENT: Added batch actions for unpublish and delete from published.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76666 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:20 +13:00
Ingo Schommer
6196f7bbbb MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76656 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:20 +13:00
Ingo Schommer
bf68f58d17 MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76653 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:19 +13:00
Ingo Schommer
e5df9592ee MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76612 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:19 +13:00
Ingo Schommer
0ce9e774b3 MINOR Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76609 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:19 +13:00
Will Rossiter
617a60de49 BUGFIX: fixed treedropdownfield cropping long names off
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76435 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:19 +13:00
Will Rossiter
664a5e113a MINOR: fixed sitetree checkboxs layout in IE
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76434 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:19 +13:00
Sam Minnee
812fad5964 BUGFIX: Fix modeladmin scrollbars in ie7
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76268 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:19 +13:00
Sean Harvey
aa54b9916c Merged from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76260 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:19 +13:00
Sam Minnee
b2aa86140a API CHANGE: Made ModelAdmin's configuration statics public rather than protected, so that they can be accessed with Object::get_static()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76124 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:19 +13:00
Sam Minnee
5f8839b6d8 MINOR: Added additional tests for LeftAndMain and ModelAdmin
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76112 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:19 +13:00
Andrew O'Neil
b456a2c56e MINOR: Allow imagemaps in tinymce
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76111 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:18 +13:00
Andrew O'Neil
d4c788d4b5 MINOR: Allow imagemaps in tinymce
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76109 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:18 +13:00
Sean Harvey
f2aa215cce BUGFIX Ensure that template path comments don't make it into ViewArchivedEmail
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75919 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:18 +13:00
Sam Minnee
2414eb30cc ENHANCEMENT: Added page location fields in the behaviour tab, as an alternative to drag and drop
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75815 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:18 +13:00
Sean Harvey
a0f7e9f1a7 Reverted r69828
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75812 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:18 +13:00
Will Rossiter
fbac34c7c7 BUGFIX: set when ajax is disabled for commenting that we redirect manually down to the comment form
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75785 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:18 +13:00
Sam Minnee
820d6b92cd ENHANCEMENT: Added 'show deleted pages' function to CMS, with a restore page option.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75737 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:17 +13:00
Sam Minnee
b6e0c2358b BUGFIX: Allow insertion of object tags (such as youtube vids) into WYSIWYG's HTML view
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75733 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:16 +13:00
Sean Harvey
3cafb8c7aa BUGFIX Fixed right hand image add/edit form panel sizing
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75705 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:16 +13:00
Sean Harvey
fbf54ad2aa Merged r75696 from cms/trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75703 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:16 +13:00
Ingo Schommer
f34259148c MINOR Merged Translatable fixes from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75686 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:15 +13:00
Sean Harvey
15f18179d4 BUGFIX Fixed PageCommentInterface $this->class being NULL because parent::__construct() wasn't called
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75654 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:15 +13:00
Sam Minnee
62f9202c00 BUGFIX: Fixed refactoring of getRecord() so that it can handle currentPage() calls properly.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75614 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:15 +13:00
Sam Minnee
d33c2869a7 BUGFIX: Let CMS users open pages deleted from draft; bug introduced by translatable.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75611 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:15 +13:00