Commit Graph

164 Commits

Author SHA1 Message Date
Ingo Schommer
0ec269f1bd Merge branch '3.0-translation-compatibility-fixes' of git://github.com/tractorcow/silverstripe-cms into tractorcow-3.0-translation-compatibility-fixes
Conflicts:
	code/controllers/CMSMain.php
2012-08-23 22:53:27 +02:00
Damian Mooyman
7807842eb1 FIXED: Additional issue where the add-page ajax parameters wouldu incorrectly concatenate additional query parameters into the add action url. Resolved by moving URL concatenation from view to controller where Controller::join_links is available 2012-08-21 15:50:03 +12:00
Ingo Schommer
2e791abad2 Better i18n for "new page" label (fixes #7796)
Also using better standard name for auto generated
page names ("Page" instead of "Site Tree",  "Pages" instead of "Site Tres" [sic])
2012-08-20 22:25:18 +02:00
Ingo Schommer
f5007a5536 Allow extension of "add" link in CMS
First use case is the "translatable" module
2012-08-16 09:29:51 +02:00
Will Rossiter
4bbd90487b BUG fix getting translated string for page type description (Fixes #7781). 2012-08-12 14:44:48 +12:00
Damian Mooyman
a6087f1d4e FIXED: Issue where links within the CMS page list view would not be correctly generated. E.g. when the translatable module is used, page links for the "show children" action would come up as admin/pages/?locale=en_NZ?ParentID=21&view=list when they should be shows as admin/pages/?locale=en_NZ&ParentID=21&view=list. Uses Controller::join_links to perform the necessary sanity check on urls. 2012-08-08 17:04:17 +12:00
Andrew Short
21bcc01878 ENHANCEMENT: Made the tree search form more extensible.
- Use DataQuery for generating the search query.
- For custom field matching, use searchcontext rather than a LIKE query.
- Added an extension hook for updating the search form.
2012-08-05 18:05:46 +12:00
Hamish Friedlander
4c91a56277 Merge in changes from 3.0.1 final 2012-07-31 16:52:55 +12:00
Hamish Friedlander
c96101654d BUG 15e2efb55d broke the Page ListView. 2012-07-28 15:43:13 +12:00
Ingo Schommer
2ad40e1ba7 Merge remote-tracking branch 'origin/3.0' 2012-07-18 13:55:46 +02:00
Ingo Schommer
abc87a4f8f Localized CMS breadcrumbs title 2012-07-18 13:51:30 +02:00
Ingo Schommer
b93e2bbee2 Remove .ss-tabset class from CMSMain forms, confuses tab state setting.
It is already applied to the parent template container,
which means that tab state finds two nested sets,
setting the wrong id (#Root instead of #pages-controller-cms-content
2012-07-13 17:37:35 +02:00
Ingo Schommer
84ad9b55f0 BUG Retain page search state on list view actions (fixes #7648)
The ".action-detail" link behaviour overloads GridField's
showDetailForm() method, which in turn appends any query params
to the URL (including the existing search params).
2012-07-13 12:15:25 +02:00
Ingo Schommer
d77c43d6c7 BUG CMS pages list view link targets (fixes #7589)
Previously broken in e7ecdf4b35
2012-07-10 10:43:07 +02:00
Devlin
e0c92f135e Display of last edit date should be exact to the minute. 2012-07-09 16:20:36 +03:00
Naomi Guyer
ef651d9d93 ENHANCEMENT: Add GridfieldLevelup component to files area 2012-06-26 13:35:38 +02:00
Sam Minnee
e7ecdf4b35 BUGFIX: Fixed page tree view 2012-06-15 16:38:55 +12:00
Sam Minnee
792c9058fa BUGFIX: Fixed DataList operations to respect the fact that they're idempotent. 2012-06-15 15:30:08 +12:00
Andrew Short
a6cee248e0 BUGFIX: Consistently style custom defined page icons.
* Renamed generateTreeStylingCSS() to generatePageIconsCSS().
* Removed legacy icon definitions.
2012-06-13 17:46:43 +10:00
Andrew Short
1c5dae9748 MINOR: Always include tree CSS so tree icons are consistently styled. 2012-06-11 21:24:58 +10:00
Ingo Schommer
c9fc7cda65 ENHANCEMENT Declaring Pjax fragments on CMS templates and forms 2012-05-30 15:06:54 +02:00
Sean Harvey
9c697f4f52 BUGFIX Fixed regression in ListViewForm not showing listChildrenLink 2012-05-30 22:12:26 +12:00
Sean Harvey
d9ee61c4a3 MINOR Use of DropdownField in CMS should call setEmptyString instead of
use the $emptyString argument, as it's deprecated.
2012-05-23 22:43:42 +12:00
Sean Harvey
60e7a5960f MINOR Adding default text to SAVEDUP entity 2012-05-18 16:54:33 +12:00
Ingo Schommer
c185c737dd MINOR More extension points in CMSMain (specifically to allow for 'locale' query parameter and language drop down of the 'translatable' extension) 2012-05-15 21:30:53 +02:00
Ingo Schommer
73e5c34896 BUGFIX Encoding multibyte characters in custom X-Status HTTP headers used in CMS (headers don't allow multibyte data) 2012-05-14 15:11:35 +02:00
Andrew Short
6b87a6edfa MINOR: Updated getResponseNegotiator visibility to match changed parent API. 2012-05-12 16:08:10 +10:00
Ingo Schommer
1863bb00db ENHANCEMENT Refactored SiteTreeURLSegmentField JS to a more selector based approach (future proof field for reusability e.g. in ModelAdmin with custom DataObject URL previews) 2012-05-10 14:50:08 +02:00
Mateusz Uzdowski
1f992c5e34 BUGFIX: unify the response method for record deletions (os7212)
sessionMessage is an old way of returning responses - the consistent way
of doing this is now X-Status header, which then gets distrubuted via JS
in the CMS frontend.
2012-05-10 14:03:17 +12:00
Sean Harvey
d79d5987cb Merge pull request #110 from chillu/trac/7170-i18n-sprintf-injections 2012-05-09 19:55:53 +12:00
Normann Lou
4b6c21b940 ENHANCEMENT: use the grid field compoent GridFieldLevelup for pages listveiw when the view is the children listing of a page 2012-05-07 13:42:56 +12:00
Ingo Schommer
38f1236b1f MINOR Switching _t() calls from sprintf() to using injection parameters (#7170) 2012-05-01 22:05:19 +02:00
Sean Harvey
a610a8c5e9 BUGFIX Fixing ListViewForm using setDisplayFields on GridField, not the component 2012-05-01 15:50:06 +12:00
Ingo Schommer
98a0331a48 BUGFIX Fixed "add page" action when invoked through tree context menu (and removed URL hardcoding in JS) (fixes #7155) 2012-04-30 16:42:45 +02:00
Robert Curry
7850499687 ENHANCEMENT: Part of fix to #7010. Change to some gridfield calls to setDisplayFields and friends. 2012-04-19 12:07:10 +12:00
Ingo Schommer
4fd757341a MINOR Consistent link method names: LeftAndMain->PreviewLink() changed to LinkPreview() 2012-04-18 22:59:31 +02:00
Ingo Schommer
6aeac37906 API CHANGE Combined "Pages" and "Edit Page" into a single menu entry
ENHANCEMENT Namespaced tree search parameters in CMSMain, in order to detect more reliably if a filter has been applied. Changing page search form to standard pushState behaviour, same as ModelAdmin (for both tree and list view).
MINOR Refactored list view loading
2012-04-17 22:59:08 +02:00
Ingo Schommer
52e69dd1fd MINOR Removed usage of deprecated $priority argument for _t() 2012-04-15 16:49:31 +02:00
Ingo Schommer
2dc0e72c00 ENHANCEMENT Caching expensive CMSMain->SiteTreeHints() call on disk 2012-04-15 16:49:31 +02:00
Will Rossiter
4718f14ecc MINOR: look for framework version in framework path rather than CMS path 2012-04-15 14:56:45 +12:00
Simon Welsh
c4e018928e API-CHANGE sapphire folder can now be renamed. 2012-04-15 10:56:40 +12:00
Sean Harvey
74b341ee56 MINOR Fixed stray newline at the top of CMSMain 2012-04-12 09:46:26 +12:00
Ingo Schommer
73a466c927 Merge branch 'integration' 2012-04-11 16:25:46 +02:00
Ingo Schommer
57d7655f80 Merge pull request #91 from silverstripe-big-o/silverstripe-cms
---

...the designs.

Conflicts:
	code/controllers/AssetAdmin.php
	code/controllers/CMSMain.php
2012-04-11 16:17:51 +02:00
Ingo Schommer
69e819a417 BUGFIX Moved 'rollback' logic back from CMSPageHistoryController to CMSMain (used in edit mode as well), removed unnecessary performRollback(), and introduced PJAX response handling to ensure the edit view is loaded correctly regardless of context (edit or history mode) (fixes #7108) 2012-04-11 10:19:54 +02:00
Normann Lou
81cc214f66 BUGFIX SSF-124 remove one of the duplicated 'Any' options which also cause that search on the second 'Any' broke. 2012-04-11 17:43:46 +12:00
Jeremy Bridson
778fd28877 BUGFIX:Trac #6854 / #7115 - aligned action buttons in filter panel with the designs. 2012-04-11 16:01:15 +12:00
Normann Lou
7c44e95287 BUGFIX SSF-124 the $filterOn pass-as-reference variable name should be consist with where its value is altered so as the variable is correctly assigned
MINOR SSF-124 correct inline document
2012-04-11 12:18:58 +12:00
Julian Seidenberg
5a18e3b4d3 ENHANCEMENT: SSF-124 making the links in the list view ajax history links, so they don't refresh the whole browser window 2012-04-10 15:48:53 +12:00
Julian Seidenberg
93f1696a66 BUGFIX: SSF-124 linking to the correct page edit form in the list view 2012-04-10 14:32:41 +12:00
Normann Lou
4a36b1e490 ENHANCEMENT SSF-124 finished ajax version of admin/pages/listchildren/ID in Pages admin 2012-04-10 14:14:58 +12:00
Ingo Schommer
76f4e6d93b Merge branch 'master' into integration 2012-04-09 21:08:37 +02:00
Wolf Vollprecht
a18b9bd85e ENHANCEMENT: Flyout menu to directly choose the pagetype one wants to add. 2012-04-09 21:08:15 +02:00
Ingo Schommer
a6c586ae20 MINOR Using new PjaxResponseNegotiator in CMSMain 2012-04-05 22:27:47 +02:00
Ingo Schommer
3341a181c7 MINOR Using SS_HTTPRequest->isAjax() instead of deprecated RequestHandler API 2012-04-05 14:45:26 +02:00
Normann Lou
7d9873472b ENHANCEMENT SSF-124 customise displayed fields of page list view, add children list view links 2012-04-05 17:33:37 +12:00
Normann Lou
8f5ec545ae BUGFIX SSF-124 remove Notice level message 2012-04-05 15:57:18 +12:00
Normann Lou
50e50f712a MINOR SSF-124 remove debug info 2012-04-05 15:47:41 +12:00
Normann Lou
f101595921 FEATURE SSF-124 first version of tree list view added 2012-04-05 15:39:46 +12:00
Ingo Schommer
de573e087d MINOR Using late static binding instead of Object::create() calls 2012-04-04 18:29:11 +02:00
Matt Gunn
4e9cbe0771 Prevents notice error when parent page isn't set 2012-03-24 13:56:05 +13:00
Ingo Schommer
6876c9a802 BUGFIX CMSMain->delete()/deletefromlive() consistently show page in "archive mode", rather than empty form (or 404 response) (fixes #6973) 2012-03-12 13:57:38 +01:00
Ingo Schommer
a097266ded BUGFIX CMSMain->delete()/deletefromlive() return to "Pages" overview when permanently deleting the record (= no readonly view available) 2012-03-12 13:26:43 +01:00
Ingo Schommer
454a6e891d ENHANCEMENT Allow adding new pages under specific nodes via tree context menu 2012-03-12 11:40:43 +01:00
Ingo Schommer
4225c0a966 MINOR Flattened AddForm and SiteConfig CMS logic, moved from base classes to specialised classes for better overview, and less inheritance where its not necessary. 2012-03-09 23:35:43 +01:00
Ingo Schommer
0633c10075 API CHANGE Removed CMSMain->getpagecount() unused helper method (should be a report, anyway) 2012-03-09 23:13:27 +01:00
Ingo Schommer
22cd47cc84 MINOR Removed unused CMSMain->sendFormToBrowser() 2012-03-09 23:07:44 +01:00
Ingo Schommer
055b3b9799 API CHANGE Removed CMSMain->SideReportsForm() and related functionality, now handled by dedicated ReportAdmin interface 2012-03-09 23:07:31 +01:00
Mark Stephens
463ee0c5f7 ENHANCEMENT: added option to add page to top level 2012-03-09 18:07:35 +13:00
Ingo Schommer
79269a22ed MINOR Moved CMSMain->RootForm() to CMSSettingsController (same effect, but clearer structure) 2012-03-08 18:24:35 +01:00
Ingo Schommer
e0a67a80c7 BUGFIX Restored old permission code model, broken due to new controller structure. Introduced LeftAndMain::$required_permission_codes as a way to control permissions independently of subclasses, and "cluster" multiple classes under a single code. 2012-03-05 18:42:44 +01:00
Ingo Schommer
18e612e65b MINOR Moved CMSMain.GridField.js logic into LeftAndMain.js (applies to all CMS interfaces), fixed event bugs with GridField overloading in AssetAdmin.js 2012-03-01 00:19:34 +01:00
Andrew O'Neil
346b9d06f7 MINOR: SSF-106 Include cms gridfield javascript hooks 2012-02-28 15:05:30 +13:00
Ingo Schommer
09fd710dd4 MINOR Combining CSS in CMS, added AssetAdmin styles 2012-02-23 23:15:37 +01:00
Ingo Schommer
f620f9b46c MINOR Using <button> tags for CMS UI, and new 'data-icon' HTML5 attribute to denote icons 2012-02-17 15:30:37 +01:00
Ingo Schommer
38cf7e5c4d ENHANCEMENT Using new "tools" panel architecture to render CMS templates, which e.g. allows CMSPageEditController to reload the form without the tree in the side-by-side display variation, and hence avoids slowing down the loading and saving process 2012-02-15 14:28:07 +01:00
Ingo Schommer
f88d4006f8 ENHANCEMENT CMSMain->Breadcrumbs() 2012-02-14 16:11:38 +01:00
Ingo Schommer
c96e2ba7ca API CHANGE Removed ThumbnailStripField class, as it was only used for the CMS image insertion logic (which was rewritten with a more powerful file selection based on GridField) 2012-02-14 13:32:58 +01:00
Will Rossiter
c958147609 MINOR: update HTTPResponse to SS_HTTPResponse. Ensure ID is casted as int when displaying in error message 2012-02-11 15:50:09 +13:00
Simon Welsh
fd39ed20a7 BUGFIX Preview button URL had wrong case for stage parameter. 2012-02-10 13:41:40 +13:00
Ingo Schommer
71220ee99f API CHANGE silverstripe_version file now contains the plain version number, rather than an SVN path 2012-02-01 18:42:13 +01:00
Ingo Schommer
908a98b55b API CHANGE Default to /admin/pages rather than homepage edit view when CMS is first opened (#6762) 2012-01-24 14:20:55 +01:00
Ingo Schommer
d88075edea MINOR Disabling empty requirement in CMSMain 2012-01-06 17:59:02 +01:00
Ingo Schommer
6bff69117a MINOR Better combination of i18n JS files in CMSMain 2012-01-06 12:12:41 +01:00
Ingo Schommer
6887b88099 MINOR Selection bugfixes for CMSMain.AddForm.js, more efficient tree metadata 2012-01-05 23:17:12 +01:00
Ingo Schommer
6dd0535442 MINOR Only set current record in CMSMain->AddForm() if its not the homepage - not ideal, but root is the more likely default given the information at hand 2012-01-05 23:17:12 +01:00
Ingo Schommer
167bc045fe MINOR Making page drop down searchable on CMS add form, and ensuring that the default page option is showing first 2012-01-05 13:45:07 +01:00
Ingo Schommer
8da0defa27 MINOR Using new triangle/step markup in AddForm 2012-01-03 22:55:59 +01:00
Ingo Schommer
f8d1523823 MINOR Moved EditorToolbar() from CMSMain to LeftAndMain (as we don't support loading link forms via ajax) 2012-01-03 22:55:56 +01:00
Ingo Schommer
e35991b363 MINOR Misc styling fixes around dialogs and "add page" styling 2012-01-03 17:57:04 +01:00
Ingo Schommer
ee2c8003db MINOR Merge error 2011-12-29 09:53:18 +01:00
Ingo Schommer
1914f0b29d MINOR Checking for existence of defaultParent in CMSMain->SiteTreeHints() 2011-12-20 18:21:45 +01:00
Ingo Schommer
0d008b6496 ENHANCEMENT Allowing to add pages from main interface, in addition to dialog triggered from admin/pages (through CMSPageAddController) 2011-12-20 17:45:07 +01:00
phalkunz
ac79934077 ENHANCEMENT Render page tree icons as stylesheets rather than $_TREE_ICONS JS definitions. Removed file/folder swapping of SiteTree::$icon, use relative file path including extension instead. 2011-12-19 14:03:42 +01:00
Ingo Schommer
4c8f6e7f4d MINOR Reduced HTML validation errors in CMS 2011-12-18 16:59:49 +01:00
Will Rossiter
e17b4a185a MINOR: update PageTypes to use updated tab path for CMS fields. Fixes #6811 2011-12-17 16:46:26 +13:00
Ingo Schommer
8d3d71027e MINOR Remove JavaScript validation handler from CMS, it doesn't work with ajax 2011-12-14 12:41:04 +01:00
Ingo Schommer
c380af6836 BUGFIX Including HTMLEditorConfig::include_js() in LeftAndMain instead of CMSMain for loading consistency. 2011-12-12 22:56:10 +01:00
Ingo Schommer
d66a47271d MINOR Implemented CMSMain->PreviewLink() (moved from LeftAndMain) 2011-10-29 22:04:40 +02:00
Stig Lindqvist
d799c80cc5 API CHANGE Changed name from DataObjectSet to either ArrayList or DataList 2011-10-27 20:24:45 +02:00