Commit Graph

210 Commits

Author SHA1 Message Date
Martijn
dec2be38fa use Controller::join_links() for listview links
This fixes incorrect adding of the locale parameter when using translatable :

http://site.com/admin/pages/edit/show?locale=nl_NL/11
2013-12-06 15:45:15 +01:00
Ingo Schommer
3d9fc2cc4c Default CMSMain to Versioned::reading_stage("Stage")
Regression caused by https://github.com/silverstripe/silverstripe-framework/pull/2585
2013-10-23 14:29:24 +02:00
Ingo Schommer
c645d76b1f Merge pull request #879 from sheadawson/833-currentPageID
Add hook for extensions to update current page id, before falling ...
2013-10-21 00:24:06 -07:00
sheadawson
1b5465809d MINOR add hook for extensions to update current page id, before falling back to default 2013-10-21 17:42:45 +11:00
Andrew Short
68d254c3c4 Add an extension hook for customising site tree hints. 2013-10-11 01:31:07 +11:00
Andrew Short
b7476f2a46 BUG: Fix add new button not passing the correct parent ID.
The `%s` parent ID placeholder was being URL encoded, so it was not being
replaced properly when adding a new page. This fix separately adds
placeholder parameters to the URL to avoid this issue.

The fix is not ideal, but there is no easy way to indicate that some
URL parameters should be URL encoded and others should not while still
correctly constructing the URL.
2013-10-10 13:09:24 +11:00
Loz Calver
66bfff4d15 FIX Don't validate pages when restoring or reverting (fixes #2449)
Use new method
2013-10-03 16:54:38 +01:00
Ingo Schommer
8a96bab70d Merge remote-tracking branch 'origin/3.0' into 3.1 2013-09-27 18:50:52 +02:00
Ingo Schommer
9a4a5d909d Merge pull request #816 from kinglozzer/798-custom-page-icons
Move CMSMain->generatePageIconsCss() into a LeftAndMain extension (fixes #798)
2013-09-25 12:54:01 -07:00
Ingo Schommer
86339a551d Clearer escaping in CMSMain
No direct security issue, but makes intent clearer
2013-09-24 21:37:26 +02:00
Damian Mooyman
5f828149c3 BUG Fixed instances of loosely defined SQL predicates not qualified by table name
Fixed duplicate SQL escaping on SiteTree::get_by_link
2013-08-29 13:59:45 +12:00
Ingo Schommer
07cccc8e95 Translations: Switch to Transifex format
- Based on new (last) translation download from getlocalization.com
- Removed untranslated strings. Getlocalization started including those at some point
which is highly annoying, unnecessary and breaks the new transfix system,
since it'll mark all of the english strings as actual translations
- Avoid dots in entities. It confuses the Transifex YML parser
- Removed some locales unknown to Transifex which didn't have any translations anyway
- Removed "lolcat" locale, uses custom notation (en@lolcal)
  which SilverStripe's i18n system can't handle
  (needs mapping from SS naming to Zend naming)
- Renamed "Te Reo/Maori" locale from "mi_NZ" to "mi" (Transifex/CLDR notation)
- Namespaced all entities used in templates (deprecated usage)
- Converted dots to underscores where template filenames are used for namespaces,
since Transifex YML parsing handles them as separate YML keys otherwise
- Removed whitespace in entity names, SilverStripe i18n can't handle it
- Only allow selection of locales registered through i18n::$all_locales to avoid
  issues with unknown locales in Zend's CLDR database
2013-08-04 12:31:29 +02:00
Ingo Schommer
3f118ef08f Translations: Switch to Transifex format
- Based on new (last) translation download from getlocalization.com
- Removed untranslated strings. Getlocalization started including those at some point
which is highly annoying, unnecessary and breaks the new transfix system,
since it'll mark all of the english strings as actual translations
- Avoid dots in entities. It confuses the Transifex YML parser
- Removed some locales unknown to Transifex which didn't have any translations anyway
- Removed "lolcat" locale, uses custom notation (en@lolcal)
  which SilverStripe's i18n system can't handle
  (needs mapping from SS naming to Zend naming)
- Renamed "Te Reo/Maori" locale from "mi_NZ" to "mi" (Transifex/CLDR notation)
- Namespaced all entities used in templates (deprecated usage)
- Converted dots to underscores where template filenames are used for namespaces,
since Transifex YML parsing handles them as separate YML keys otherwise
- Removed whitespace in entity names, SilverStripe i18n can't handle it
2013-08-04 12:28:07 +02:00
Loz Calver
09b869f5d3 Move CMSMain->generatePageIconsCss() into a LeftAndMain extension (fixes #798) 2013-07-31 09:30:58 +01:00
Ingo Schommer
2deb525d47 Using new CMSForm class to allow for validation errors in CMS
This class allows deferring handling of responses to the parent
controller's response negotiator implementation.
2013-06-13 07:44:37 +02:00
jean
698a75d903 FIX Correct page title shown when restoring a page, instead of html of tree node 2013-05-25 11:37:26 +12:00
Mateusz Uzdowski
6117057c59 Update doRollback messages to work well with the new reverts.
Currently reverts are not creating the new versions anymore - they are
simply copying the Version over. Remove incorrect message about new
version creation and remove the "cancel draft changes" message that's
not correct.
2013-05-16 08:43:12 +12:00
Ingo Schommer
51c8e8639e API Marked statics private, use Config API instead (#8317)
See "Static configuration properties are now immutable, you must use Config API." in the 3.1 change log for details.
2013-03-24 17:21:04 +01:00
Ingo Schommer
1f14654649 CMSMain->LinkWithSearch() visibility
Required for tree links retaining search state
2013-03-19 22:13:10 +01:00
g4b0
9037aa8645 Re-indexed disallowed array because of json_encode issue with non-sequential array 2013-03-18 17:18:58 +01:00
Andrew Short
b5725c7ace Merge branch '3.0' into 3.1 2013-03-15 19:36:31 +11:00
Ingo Schommer
ec93643f49 NEW Set correct ParentID when creating page from list view 2013-03-14 19:00:56 +01:00
jean
2dd0e3f02e NEW Restored duplicate and duplicated with children functionality, as in 2.4 See ticket #7602
Conflicts:
	javascript/CMSMain.Tree.js
	templates/Includes/CMSMain_TreeView.ss
2013-03-13 10:04:09 +01:00
Ingo Schommer
0f8d7a0aa4 Removed CMSMain->CMSVersion(), using LeftAndMain instead
Implementation got more complex (see https://github.com/silverstripe/silverstripe-cms/pull/289),
including composer.lock file support. So trying to to duplicate too much.
2013-02-28 13:39:13 +01:00
Ingo Schommer
317977a227 More useful default cols on "Pages" list (fixes #8199) 2013-01-22 15:37:20 +01:00
Ingo Schommer
fa78370ac4 Merge remote-tracking branch 'origin/3.0' into 3.1 2012-12-21 11:48:48 +01:00
Ingo Schommer
cb96255e80 Removed direct sprintf() usage from _t() calls
Parameterized strings are easier to understand,
and more fail-proof, don't fatal out when not enough sprintf() args
2012-12-21 11:18:18 +01:00
Ingo Schommer
1d470fe718 Removed duplciate success status feedback on CMS save/publish
We now have the CMS actions with two states for communicating
that they've saved correctly.
2012-12-13 23:29:17 +01:00
Mateusz Uzdowski
26cc14a930 API Rework the CMS actions to use alternating buttons and drop-ups.
Utilise the new features provided by the framework to get richer
interface:
* save buttons that highlight the current state of the page
* minor actions in a drop-up
* embed last publishing and saving information
2012-12-13 19:10:39 +01:00
Mateusz Uzdowski
aaae8c97e6 Explicitly mark the section as previewable.
Picked up by the forntend side-by-side preview JS.
2012-12-10 18:09:54 +01:00
Ingo Schommer
f9a5601fa3 BUG Enforce "add page" restrictions, improve UI (fixes #7879)
- Fix support for $allowed_children
- Added note when type selection is restricted
- Removed overly complex specs for "allowed children",
the data should be inferred from "disallowed children"
- Added support for SiteTree::$can_be_root
- Return raw JSON (not entity-encoded) from CMSMain->SiteTreeHints()
- Added tests for CMSMain->SiteTreeHints()
2012-12-03 16:52:17 +01:00
Andrew O'Neil
b31188f252 APICHANGE: Use late static binding for Object::has_extension() 2012-11-07 11:08:36 +13:00
Stig Lindqvist
fa348d6666 MINOR Code refactoring of CMSMain::SearchForm() extracted some methods. 2012-11-02 23:52:24 +01:00
Ingo Schommer
df44239060 Method visibility according to coding conventions 2012-09-20 10:41:50 +02:00
UndefinedOffset
a2d76c9305 BUG Remove page types from the "add new page here" menu if they appear in a hide_ancestor (fixes #7712) 2012-09-15 17:04:02 +12:00
Niklas Forsdahl
2934423ebc BUG: Page type names not translated in pages overview search form
Fixed by using the singularname translation for the class as values in the page
types array used for the page types dropdown field.
2012-09-04 09:00:04 +03:00
Hamish Friedlander
af2c890168 Merge pull request #190 from silverstripe-rebelalliance/open/5971
NEW Add warning if viewed SiteTree object class is obsolete
2012-09-02 14:12:23 -07:00
Ingo Schommer
651cb03ff2 BUG Removed 'Sort' field from CMSMain edit form
Related to #7740. The sort field gets stale if the current
record is moved in the tree. Since the sort value can't
be altered by interacting with the form, its not required
as a hidden field, either.
2012-08-29 14:58:42 +02:00
Ingo Schommer
ab0dce9127 Merge pull request #188 from phalkunz/7601-listview-sort-by-title
Enable page sorting by Page name in list view (see #7601)
2012-08-29 05:42:07 -07:00
Hamish Friedlander
d9243cddde FIX Pages with obsolete class shouldnt do first versionless write 2012-08-29 16:17:17 +12:00
Ingo Schommer
cec461b767 BUG Use AbsoluteLiveLink() for CMS previews
It uses the correct live URLSegments for its parents
by setting the global Versioned reading mode correctly,
see 8a514d8b64 for detail.
2012-08-28 19:07:12 +02:00
Saophalkun Ponlu
436972744d Enable page sorting by Page name in list view (see #7601) 2012-08-28 21:18:07 +12:00
Ingo Schommer
62783c75a9 BUG Prevent overwriting of draft/live preview form fields
By renaming fields to "StageLink" and "LiveLink",
which means they don't get influenced by the model getters
on Form->loadDataFrom(). Its also a more accurate
name for the field value, since it contains a full (nested) URL
rather than just a segment. Only used internally, so no API change.
2012-08-27 18:20:56 +02:00
Ingo Schommer
11b85e988e Fixed "from"/"to" filter field widths
Removed ineffective FieldGroup->subfieldParam setting,
replaced with a specialised template, as well as a new "stacked" styling
(both added to framework codebase)
2012-08-27 16:15:41 +02:00
Ingo Schommer
e59aec3f6f BUG Redirect to edit view after page revert in CMS (fixes #7391) 2012-08-27 14:19:40 +02:00
Ingo Schommer
59546ccf11 Localized page name in "add page" dialog and dropdowns (see #7798) 2012-08-26 23:58:38 +02:00
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