Commit Graph

570 Commits

Author SHA1 Message Date
Andrew O'Neil
c7a03db6e7 BUGFIX: Add EditForm to list of allowed actions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70729 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:03 +13:00
Saophalkun Ponlu
12bd84481c Merged patch submitted by ajshort that calls loadDataForm on a newly created object in ModelAdmin so that properties of the object are loaded properly
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70702 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:03 +13:00
Will Rossiter
5759314893 BUGFIX: show flash icon and box if flash file exists. MINOR: created a default editor.css file which has base css styles for the CMS.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70691 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:03 +13:00
James Kirkus-Lamont
c15b86a86e BUGFIX: cms ui added colon to image upload prompt (inline with other step)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70683 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:03 +13:00
Sean Harvey
39b10d2923 MINOR Code formatting for delete unused thumbnails functionality
MINOR Use FormResponse instead of echoing strings as JS

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70678 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:02 +13:00
Ingo Schommer
a48a119bcc MINOR merged r70323 from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70663 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:48:01 +13:00
Will Rossiter
fe4e18bc0e MINOR: merged patch from keeny. Put comment data into Cookie and load if user fails maths spam question. Clear comment cookie on successful posting
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70530 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:57 +13:00
Will Rossiter
1c7895683f MINOR: added empty statics to PageComment to allow for decoration
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70408 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:56 +13:00
Will Rossiter
59d89be316 MINOR: removed Gallery Module code from AssetTableField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70360 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:55 +13:00
Sean Harvey
bf200c86b8 MINOR Removed redundant code from MemberTableField
MINOR Code tidy up and coding style fixes for MemberTableField


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70236 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:54 +13:00
Normann Lou
9f406531b7 BUGFIX: due to changeset 65289 by phalkunz, the ImportForm() and import() functions need to move from CRMAdmin class to CRMAdmin_CollectionController class, fix relative bugs by the move.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70172 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:54 +13:00
Normann Lou
ec6282c808 FEATURE: add permission control for AddForm and EditForm
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70142 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:54 +13:00
Sean Harvey
dd61569d6c ENHANCEMENT Creation of a new page type now uses a consistent source of classes that respect $hide_ancestor on SiteTree.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70131 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:54 +13:00
Sean Harvey
ba854a960e BUGFIX Removed ANSI compatible SQL that shouldn't be in branches/2.3 - this feature is available in trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70077 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:53 +13:00
Sean Harvey
9b84e9df6f MINOR Removed redundant code in CMSMain->AddPageOptionsForm()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70065 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:53 +13:00
Sean Harvey
8f22f4ffc3 ENHANCEMENT Default to "Page" for new page type dropdown
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70064 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:53 +13:00
Normann Lou
6b5cab8dab MINOR: fix on-line documentation syntax so that phpDocumentor can creating automatically the API doc
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70032 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:53 +13:00
Sam Minnee
db9b53d786 BUGFIX: Added page-limiting back to CMS tree querying
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69986 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:53 +13:00
Sam Minnee
508aa8a80b Pre-cache page version numbers when querying CMS tree for query efficiency
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69982 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:53 +13:00
Ingo Schommer
9274c1f234 MINOR Passing context object through in LeftAndMain->getSiteTreeFor() (necessary for Translatable)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69955 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:53 +13:00
Ingo Schommer
4cf2ee5e38 BUGFIX Explicitly setting "lang" as a GET var when getting a page within the CMS (if the language chooser DOM object is available, hence translation mode is enabled). Used in CMSMain->init() to set the "current language". (merged from branches/translatable in r64523, thanks wakeless!)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69899 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:52 +13:00
Ingo Schommer
559a4e5899 ENHANCEMENT Moved i18n::get_existing_content_languages() to correct namespace in Translatable::get_existing_content_languages().
BUGFIX Using SQL DISTINCT in get_existing_content_languages()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69891 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:52 +13:00
Sean Harvey
c247db5146 ENHANCEMENT Allow selection of parent page with adding page through URL - Ticket #3177. Thanks simon_w!
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69864 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:52 +13:00
Ingo Schommer
3351aef184 MINOR Merged r69410 from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69839 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:52 +13:00
Sam Minnee
48ab578fcb ENHANCEMENT #3180: Added RsyncMultiHostPubilsher to 2.3 from trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69821 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:52 +13:00
Sam Minnee
879c391a61 API CHANGE: Removed access to broken image editor feature
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69730 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:51 +13:00
Sam Minnee
4f714efa6d BUGFIX #3081 simon_w: Fixed pagination on spam comments
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69690 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:50 +13:00
Ingo Schommer
c2de88f893 BUGFIX Fixed js error due to inlined inclusion of CMSMain_upload.js which was conflicting with inline initialization. Disabled initializiation as the flash uploader was pulled out a while ago anyway (see #3251)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69657 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:50 +13:00
Ingo Schommer
cbe7fe56e2 MINOR More LeftAndMain translatable strings (see #3286)
MINOR Updated cms master tables

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69611 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:50 +13:00
Ingo Schommer
62a064ceab ENHANCEMENT Improved styling of side reports
ENHANCEMENT Added .message styles to cms/css/layout.css

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69449 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:49 +13:00
Ingo Schommer
4ed5760c90 BUGFIX Fixed permissions in CMSMain->revert() - only needs edit permissions, not publish permissions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69442 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:49 +13:00
Sam Minnee
b503041f09 Fixed label of back button
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69382 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:49 +13:00
Sam Minnee
640e2beb85 API CHANGE: Added ModelAdmin_CollectionController::columsnAvailable() and ModelAdmin_CollectionController::columnsSelectedByDefault() that can be overridden to customise the fields available in the column selection control.
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69363 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:49 +13:00
Ingo Schommer
fa8e4a12a6 ENHANCEMENT More readable (and linked) output of "you are comparing..." message when viewing version of a page
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@69322 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:49 +13:00
Sean Harvey
6eea8c657f BUGFIX Make sure the website URL that the commenter posts has a correct "http://" or "http://" bit at the start of the string
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68999 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:49 +13:00
Sam Minnee
b4d24d441d Fixed loading of CMS toolbar with the HtmlEditorField
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68945 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:48 +13:00
Sean Harvey
e0611be469 BUGFIX Fixed PHP notice potential error in MemberTableField->addtogroup()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68935 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:48 +13:00
Ingo Schommer
aa0f54fa97 ENHANCEMENT Appending classnames to translated pagetype titles in CMSMain->getPageTypes() when the cms is loaded in a non-english version - see inline comment
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68818 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:48 +13:00
Ingo Schommer
d635f0ead2 BUGFIX Making only formfields readonly (not formactions) when comparing versions and showing historical versions within CMSMain
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68810 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:48 +13:00
Ingo Schommer
66be81326d ENHANCEMENT Improved display of class permissions in /admin/security by using the menu title in addition to the classname (users won't necessarily know which classname an admin area corresponds to). Also using "Access to all CMS interfaces" as a permission description for CMS_ACCESS_LeftAndMain
MINOR Updated language tables

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68771 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:48 +13:00
Ingo Schommer
b62d7d832b BUGFIX Fixed additional tabs for image popus in AssetTableField. They we're not being generated in non-english interfaces due to the translated title being used as the tab identifier
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68757 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:47 +13:00
Ingo Schommer
9845cadb3b BUGFIX Limiting readonly transformation of form in CMSMain->EditForm() to fields only (excluding actions). FormAction readonly transformations were fixed a while ago, which meant that they were actually enforced now, causing unavailable cms actions in certain scenarios (e.g. with a page deleted from live, which should make the fields readonly, but leave buttons functional)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68754 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:47 +13:00
Sam Minnee
45e34d4255 BUGFIX: Updated CMS to support HtmlEditorField changes in r68701
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68702 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:47 +13:00
Ingo Schommer
aae16dc1f6 MINOR Hardcoded yoursite.com in assets treeview (see #3230)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68534 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:46 +13:00
Ingo Schommer
12f46de93d MINOR fixed php notices on AssetAdmin (see #3187)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68517 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:46 +13:00
Ingo Schommer
d9e9e5f348 ENHANCEMENT Using LeftAndMain->canView() in LeftAndMain->init() - if current admin interface can't be viewed, iterate over remaining interfaces until we find a valid one. This only includes admin interfaces with a valid controller, so it should fix the obnoxious redirect to userhelp.silverstripe.com when a website-user tries to access the CMS.
ENHANCEMENT Added LeftAndMain->canView() to check for logged-in member and CMS_ACCESS_* permissions in a testable way
ENHANCEMENT Don't show "Reports" admin section if no subclasses of SSReport are found (or none of the existing subclasses returns a valid canView())
ENHANCEMENT Added CMSMenu::get_viewable_menu_items() and using it in LeftAndMain->MainMenu()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68460 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:46 +13:00
Ingo Schommer
e817a013d8 BUGFIX Fixed ModelAdmin import success message (too few arguments for sprintf())
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68331 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:46 +13:00
Brian Calhoun
709e352bbc Added ability for comment authors to leave a URL as a separate form field
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68326 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:46 +13:00
Ingo Schommer
f461b91eba BUGFIX Moved creation of "help" menu entry from cms/_config.php to LeftAndMain::init() to get localized titles (locale isn't set at _config.php level)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68177 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:45 +13:00
Ingo Schommer
c09aed0fda BUGFIX Fixed i18n display of menu titles rendered by CMSMenu in LeftAndMain->MainMenu()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68176 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 17:47:45 +13:00