Commit Graph

2501 Commits

Author SHA1 Message Date
Andrew Short
e17fb17520 Merge branch '3.1'
Conflicts:
	lang/es.yml
2013-11-11 18:24:03 +11:00
Damian Mooyman
f9c3f4d1cc Merge pull request #889 from chillu/pulls/2638-uploadfield
Disable UploadField change detection in assets/admin/add
2013-11-06 17:16:17 -08:00
Stephen Shkardoon
f972466880 Refactor old page redirector into an extension 2013-11-06 23:00:50 +13:00
Ingo Schommer
2d0ee2ca91 Disable UploadField change detection in assets/admin/add
See https://github.com/silverstripe/silverstripe-framework/issues/2638
2013-11-06 10:08:15 +01:00
Trevor
e3724e9207 Fix comment typo 2013-10-28 13:48:31 +11:00
Loz Calver
b6589ba9a9 NEW: Page types no longer require a controller, they can inherit the parent page type's
Use ClassInfo::ancestry() instead of get_parent_class()

Fall back to ContentController by default
2013-10-23 16:44:59 +01:00
Ingo Schommer
ef0f633f46 Merge remote-tracking branch 'origin/3.1' 2013-10-23 14:53:33 +02: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
Ingo Schommer
0a1ffd3e1a Merge remote-tracking branch 'origin/3.1'
Conflicts:
	.travis.yml
2013-10-20 13:51:19 +02:00
Ingo Schommer
aae6b2b296 Avoid encoded HTML breadcrumbs 2013-10-11 00:27:21 +02:00
Andrew Short
68d254c3c4 Add an extension hook for customising site tree hints. 2013-10-11 01:31:07 +11:00
Ingo Schommer
dd29936fee Merge remote-tracking branch 'origin/3.1' 2013-10-10 12:10:20 +02: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
2a4191d449 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-10-02 12:21:50 +02:00
Ingo Schommer
92e0c410b8 Fixed report link escaping 2013-10-02 12:19:23 +02:00
Ingo Schommer
956b6de05c Merge remote-tracking branch 'origin/3.0' into 3.1 2013-10-01 11:19:14 +02:00
Ingo Schommer
daf92e6ce0 FIX ReportAdmin report links regression
Regression from 79996a76fe,
escaped quotes are no longer necessary because the string
doesn't get eval'ed.
2013-10-01 11:17:36 +02:00
Ingo Schommer
32478ab512 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	code/controllers/ReportAdmin.php
	code/reports/Report.php
2013-09-27 19:07:13 +02: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
Ingo Schommer
e170f4c21b FIX Escaping in "dependent pages" (SS-2013-009) 2013-09-24 21:37:26 +02:00
Ingo Schommer
79996a76fe Clearer escaping in ReportAdmin
No direct security issue since report titles can't be set by the user
2013-09-24 21:37:26 +02:00
Ingo Schommer
29e502a63a Hints for SiteTree.TreeTitle casting
Relates to SS-2013-009
2013-09-24 21:37:26 +02:00
Ingo Schommer
201f4881e6 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-09-12 17:16:29 +02:00
Ingo Schommer
4e031076be Search callback for "add page" selector
Necessary since we now default $showSearch=true in TreeDropdownField.
See https://github.com/silverstripe/silverstripe-framework/pull/2364
2013-08-29 17:08:42 +02:00
Tom Densham
4f30fedafd FIX: GridField button styling in reports 2013-08-29 13:56:29 +01: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
6d694a550a Merge pull request #837 from ARNHOE/3.1-siteconfigfix
SiteConfig updated to modeladmin style and fixed ajax switching
2013-08-28 02:20:47 -07:00
Sean Harvey
27749fdb7a AssetAdmin: PHP warning trying to add empty values into CompositeField
If the logged in user doesn't have permission to add a Folder record,
AssetAdmin::getEditForm() tries to enter an empty value into the
children of a ComposteField. This breaks SSViewer with a
call_user_func invalid args PHP warning.

Only include these buttons when they're available to the user.
2013-08-27 14:30:39 +12:00
Arno Poot
920da0d120 SiteConfig updated to modeladmin style and fixed ajax switching 2013-08-24 12:33:38 +02:00
Ingo Schommer
c62f992dc3 Merge remote-tracking branch 'origin/3.1' 2013-08-22 13:56:28 +02:00
Ingo Schommer
3dc86f98a3 Fixed merge error 2013-08-20 22:25:24 +02:00
Ingo Schommer
ba57d42349 Merge remote-tracking branch 'origin/3.0' into 3.1.0
Conflicts:
	code/controllers/ContentController.php
	code/model/SiteTree.php
	tests/search/SearchFormTest.php
2013-08-20 20:59:44 +02:00
Ingo Schommer
7ad9712f05 Merge remote-tracking branch 'origin/3.1' 2013-08-16 13:37:49 +02:00
Ingo Schommer
44fdf66834 Merge pull request #809 from ARNHOE/3.1-siteconfig
Updated siteconfig layout to be more like modeladmin
2013-08-15 13:45:50 -07:00
Hamish Friedlander
71608f0d4a FIX Add SiteTree link tracking as an extension, and apply to SiteTree itself 2013-08-09 11:46:32 +02:00
Sam Minnée
d7d0cb45ae Merge pull request #824 from hafriedlander/fix/archivedate
FIX ArchiveDate enforcement
2013-08-08 17:38:53 -07:00
Simon Welsh
b1664f86a4 FIX Check for stage and drafts in SiteTree::canView() 2013-08-09 10:45:09 +12:00
Hamish Friedlander
2fae9280e5 FIX ArchiveDate enforcement 2013-08-08 17:17:35 +12:00
Ingo Schommer
5eaeb7462a Merge remote-tracking branch 'origin/3.1'
Conflicts:
	lang/en.yml
2013-08-07 17:20:28 +02:00
Ingo Schommer
99ba7bdb4e Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	lang/en.yml
	templates/CMSPageHistoryController_versions.ss
2013-08-07 17:15:17 +02: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
Ingo Schommer
ab0f83c48d 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
- Renamed "lolcat" locale from "lc_xx" to "en@lolcat" (Transifex/CLDR notation)
- 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 11:05:41 +02:00
Ingo Schommer
e0aa610172 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	.travis.yml
	templates/Includes/ReportAdmin_Content.ss
	templates/ReportAdminForm.ss
2013-08-03 19:46:46 +02:00
Loz Calver
09b869f5d3 Move CMSMain->generatePageIconsCss() into a LeftAndMain extension (fixes #798) 2013-07-31 09:30:58 +01:00
Arno Poot
afd9f28279 Updated siteconfig layout to be more like modeladmin 2013-07-26 17:45:28 +02:00
Simon Welsh
ff18abb994 Merge branch '3.0' into 3.1
Conflicts:
	.travis.yml
2013-07-14 17:24:06 +12:00
Simon Welsh
3a3e8f2faa Adds LoginForm as an allowed action
Behaves as a form method defined on ContentController
2013-07-14 17:21:59 +12:00
Andrew Short
1710958207 Merge branch '3.1'
Conflicts:
	.travis.yml
	code/controllers/ReportAdmin.php
2013-07-09 13:54:05 +10:00
Hamish Friedlander
a5f00ae2c3 FIX Not checking stage in SiteTree#canView
SiteTree versions that arent the live version shouldnt be accessed by
regular users, but the logic to check that was split off into canViewStage,
which wasnt checked by code that isnt specifically SiteTree aware
(like RestfulServer)
2013-07-05 12:14:22 +12:00
Ingo Schommer
a2c2be2ad5 Correct form name in CMSFileAddController, fixes upload
Fixes https://github.com/silverstripe/silverstripe-framework/issues/2172
2013-07-02 09:33:38 +02:00
Ingo Schommer
0bd257c8fc Merge pull request #770 from chillu/pulls/cmsform
Using new CMSForm class to allow for validation errors in CMS
2013-06-28 02:54:09 -07:00
Ingo Schommer
98750a9cf1 Merge pull request #772 from chillu/pulls/sitetree-urlsegment-votes
API SiteTree->validURLSegment() prioritizes extension votes
2013-06-25 02:18:08 -07:00
Ingo Schommer
aeacbc38aa Fix AssetAdmin::$allowed_actions 2013-06-21 00:54:28 +02:00
Ingo Schommer
a29ce594a1 Merge remote-tracking branch 'origin/3.1' 2013-06-19 11:17:57 +02:00
Jeremy Thomerson
b8908efdf7 ENHANCEMENT: allow sites to override meta generator tag 2013-06-17 20:35:14 +00:00
Mike Parkhill
c7f14129ea FIX #651 Broken redirection after creating new folder in assets 2013-06-13 14:58:09 +02: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
Ingo Schommer
0c4b2f8157 API SiteTree->validURLSegment() prioritizes extension votes
Tri-state, use NULL to ignore the extension result
2013-06-12 12:32:42 +02:00
g4b0
238f2908e5 BUG: fixed "regression" inserted with 9281ebc647 adding a new class to SiteTree elem (edit-disabled) 2013-06-03 13:46:10 +02:00
Ingo Schommer
c21c9cba0d Merge remote-tracking branch 'origin/3.1' 2013-05-31 18:10:26 +02:00
Sean Harvey
206f09ab65 Merge pull request #757 from mparkhill/651-assets-broken-redirection
FIX #651 Broken redirection after creating new folder in assets
2013-05-27 15:04:22 -07:00
Mike Parkhill
85f5a45951 FIX #651 Broken redirection after creating new folder in assets 2013-05-27 17:21:07 +12:00
Sean Harvey
20f044cef0 BUG Fixing regression from silverstripe/sapphire/67d1327
Status flag classes didn't pick up styling because the flag was
changed to prefix "status-".
2013-05-26 12:31:15 +12:00
Simon Welsh
e8f6b416d7 Revert call to setCheckModelPermissions() 2013-05-25 13:56:02 +12:00
Sean Harvey
9c1a69ae08 Merge pull request #755 from patbolo/restored-page-correct-title
FIX Correct page title shown when restoring a page, instead of html of t...
2013-05-24 18:45:38 -07: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
Will Rossiter
ae494b01bc Merge pull request #259 from chillu/pulls/perms-opt-in
FIX: Respect model permissions in AssetAdmin
2013-05-24 15:44:55 -07:00
Russell Michell
9281ebc647 BUGFIX: Content authors with SiteTree#canView() but not SiteTree#canEdit() were unable to click on SiteTree items in the CMS.
- The 'disabled' attribute in <li> will now only render if the author _really_ can't do _anything_
2013-05-23 14:48:24 +12:00
Fred Condo
cd81d327ac Return 410 for successfullyinstalled after install files are gone
It was possible to append '/successfullyinstalled' to any SilverStripe
URL (with the cms module present), and the code would run, including
republishing the 404 page.

Now, if the install.php file is gone, this controller method throws the
410 (Gone) status code. The 410 status is chosen rather than 404 to
mitigate the likelihood that crawlers such as the Googlebot will follow
stray links to this URI.
2013-05-21 15:11:57 -07:00
Ingo Schommer
b2e9353755 Merge pull request #701 from tractorcow/3.1-api-updaterelativelink
API Added SiteTreeExtension::updateRelativeLink
2013-05-17 05:05:03 -07:00
Mateusz Uzdowski
bccd2f8e51 API Add a missing alternatePreviewLink hook for SiteTree extensions. 2013-05-17 15:00:08 +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
Sean Harvey
a681b8e4ab BUG Don't redirect to ErrorPage in CMS with x-cms-edit-link 2013-05-14 00:06:09 +12:00
Will Rossiter
7c68414fe7 FIX: Rename search locale variable to avoid conflicts with locale switcher.
Fixes http://open.silverstripe.org/ticket/6204
2013-05-11 19:31:02 +12:00
Simon Welsh
be25c302ac FIX Escape the sitetree_link shortcode return value 2013-05-10 14:05:06 +12:00
Damian Mooyman
61312a5d7f API Added SiteTreeExtension::updateRelativeLink
Updated SiteTreeExtension PHPDoc
Refactored out Translatable extension in RelativeLink
2013-05-10 12:22:22 +12:00
Sean Harvey
c7ebf76757 Page history panel: show appropriate message when viewing latest version 2013-05-07 17:14:28 +12:00
Sean Harvey
b4f2e35b32 Updating text for permission description to be accurate for 3.x 2013-04-30 17:58:47 +12:00
Ingo Schommer
c0302bc24d Merge remote-tracking branch 'origin/3.1' 2013-04-29 08:59:11 +02:00
Ingo Schommer
878cf541b9 Better UI feedback on VirtualPage states (fixes #1594) 2013-04-16 11:56:33 +02:00
Ingo Schommer
2227ed3629 Merge remote-tracking branch 'origin/3.1' 2013-04-11 11:26:24 +02:00
Ingo Schommer
d7435cde71 Merge pull request #676 from kinglozzer/urlsegmentfield-error-fix
Better error message when attempting to enter a blank URL Segment (fixes silverstripe/sapphire#1570)
2013-04-08 07:58:49 -07:00
Ingo Schommer
da515b8f65 FIX Use SSViewer.theme_enabled in CMS logic 2013-04-08 19:29:09 +12:00
Will Rossiter
6e2906d01e API: remove static related classes, now staticpublisher module 2013-04-06 17:26:15 +13:00
Loz Calver
ea446f2ade Better error message when attempting to enter a blank URL Segment (fixes silverstripe/silverstripe-cms#1570) 2013-04-05 14:06:32 +01:00
Ingo Schommer
51c00e33e6 Merge remote-tracking branch 'origin/3.1' 2013-03-27 12:12:21 +01:00
Ingo Schommer
18201c05af Fixed Config usage in ErrorPage 2013-03-27 12:00:55 +01:00
Ingo Schommer
8eb3840325 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	code/controllers/ReportAdmin.php
	code/reports/Report.php
	tests/reports/CmsReportsTest.php
2013-03-26 10:58:07 +01: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
Ingo Schommer
c3b4d68664 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	code/controllers/SilverStripeNavigator.php
2013-03-19 14:04:24 +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
uniun
5c933b40e5 BUG SilverStripeNavigator shows wrong message.
The message was always 'Published Site'.
Also there were no 'active' class on links.
2013-03-18 15:57:20 +02:00
Andrew Short
18f4f68101 Merge branch '3.1' 2013-03-15 21:59:52 +11: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
a5e84c0a06 Merge pull request #294 from dhensby/request-patch
BUG Request object now has URL changed
2013-03-07 11:32:40 -08: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
Daniel Hensby
eb2e0d7877 BUG Request object now has URL changed
Instead of cloning the Request object and losing all the custom
attributes that don't come through the construct (eg: headers) we can
now set the URL alone.
2013-02-28 08:51:25 +00:00
Ingo Schommer
56208a59e5 Merge remote-tracking branch 'origin/3.1' 2013-02-27 13:32:55 +01:00
Sam Minnee
b7b62e5aea FIX: Fixed create-folder function: 2013-02-26 13:39:48 +13:00
Daniel Hensby
e131a041d4 BUG Metadata heading removed from RediretorPage
Currently the empty metadata accordion stays on the RedirectorPage. This is now removed.
2013-02-20 13:32:55 +00:00
Ingo Schommer
c09bca6fac Merge remote-tracking branch 'origin/3.1'
Conflicts:
	lang/ja_JP.yml
	lang/lt.yml
	lang/pl.yml
2013-02-18 14:18:27 +01:00
Ingo Schommer
537b0c6117 Define $allowed_actions consistently
Required due to stricter $allowed_actions checks in 3.1
2013-02-18 15:12:46 +13:00
Ingo Schommer
53c2059a01 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	code/controllers/SilverStripeNavigator.php
2013-02-07 21:44:41 +01:00
Ingo Schommer
a0e965b7b4 Revert "FIX: updateCMSFields not accepting var by reference"
This reverts commit e56a78b160.
2013-02-06 18:59:51 +01:00
Ingo Schommer
8c3f87bb8a Results returned from FSP->publishPages()
Aids further processing and verbose display,
e.g. when the publication is triggered by a queuing mechanism.
2013-02-06 10:47:41 +01:00
Ingo Schommer
23eeb99075 FIX Clear Requirements before in-memory HTTP request for ErrorPage
For example, avoids issues where separate controllers (calling and called) operate on the same
set of files through Requirements::combine_files().
2013-02-06 10:43:42 +01:00
Ingo Schommer
b19a82b693 SiteTree on*() callbacks now consistently invoke on subclasses as well
Before this was only possible for some specific ones, like onBeforeWrite.
This excludes any callbacks with augment*() or update*() naming,
since these are assumed to be on extension only, with a corresponding
base method available on the class itself (e.g. "updateCMSFields()"
vs "getCMSFields()").
2013-02-06 10:43:31 +01:00
Ingo Schommer
97fbfd3f12 FIX Respect escaping rules on readonly fields in CMS history view
Avoids showing unescaped HTML on fields which didn't allow it otherwise,
e.g. TextField. This also fixes problems with SiteTree->ExtraMeta
which got evaluated within the CMS. If this section contains any
JavaScript it gets executed and can disrupt CMS operation.
2013-02-04 17:16:15 +01:00
Michael Andrewartha
e56a78b160 FIX: updateCMSFields not accepting var by reference
updateCMSFields should be taking the fields var by reference.
@see https://github.com/silverstripe/sapphire/pull/1156
2013-02-04 12:55:29 +00:00
Ingo Schommer
00097a5d5d NEW Clickable URL preview in CMS
- Refactored SiteTreeURLSegmentField to render controls in template
rather than JS for better clientside performance, and cleaner behaviour.
- Added dynamic ellipsis to start of URL, to retain most relevant
part of the URL (the last bits)
- Added "suffix" setting to field, which defaults to ?stage=Stage
- Removed prefix from edit view to leave more room for URL

Thanks to @sunnysideup for getting this started in
https://github.com/silverstripe/silverstripe-cms/pull/269
2013-02-04 12:12:28 +01:00
UndefinedOffset
119d8aa892 ENHANCEMENT: Do not display SilverStripeNavigator_CMSLink when in a LeftAndMain extension not just CMSMain extensions 2013-02-01 14:16:19 -04:00
Ingo Schommer
931b726589 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-01-30 13:09:14 +01:00
Ingo Schommer
b25063b09c Extracted ErrorPage default data to getter
Allows for less verbose overloading, while still keeping i18n capabilities
in place, which isn't possible with DataObject::$default_records
2013-01-30 13:07:11 +01:00
Ingo Schommer
eba4d205c3 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-01-30 12:44:40 +01:00
Ingo Schommer
416178b668 Reduced code duplication in ErrorPage (no functional changes) 2013-01-29 19:34:05 +01:00
Ingo Schommer
b15b98345f Using new "Security.login_url" configuration value 2013-01-29 18:06:49 +01:00
Ingo Schommer
649de6e1bc BUG Reinstated CMS "History" Preview (fixes ##8089) 2013-01-25 11:35:48 +01:00
Kirk Mayo
81cd0e6e04 BUG: Replaced extendedSQL with DataList as per ticket 8183 2013-01-24 08:45:30 +13:00
Ingo Schommer
317977a227 More useful default cols on "Pages" list (fixes #8199) 2013-01-22 15:37:20 +01:00
Ingo Schommer
8ab66c93b6 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	code/reports/Report.php
	composer.json
2013-01-21 11:24:05 +01:00
Ingo Schommer
61f2ab7519 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-01-21 10:03:30 +01:00
Will Rossiter
06e8499070 Remove outdated ReportAdmin assets 2013-01-21 16:53:19 +13:00
unclecheese
cfc976bff8 MINOR: Grammar error 2013-01-17 14:31:35 -05:00
Ingo Schommer
8a9acaa5ba Fixed "add page" type icons (fixes #8190) 2013-01-17 19:59:54 +01:00
Will Rossiter
56346a50bf API: moved reports API to separate module 2013-01-17 21:58:03 +13:00
Ingo Schommer
93bee9422a Don't duplicate SS_Report title in GridField 2013-01-14 17:12:27 +01:00
Ingo Schommer
76aeec70e7 NEW SiteTree->PreviewLink() for fine grained URL control 2013-01-14 17:12:23 +01:00
Andrew O'Neil
f9504ee983 ENHANCEMENT Writing caching metadata as HTML comments in FilesystemPublisher (through StaticPublisher::$include_caching_metadata) (ischommer) 2013-01-14 17:08:12 +01:00
Normann Lou
f674af0c73 BUG: dependentPages grid field not showing necessary columns and their values. 2013-01-09 22:35:54 +01:00
Ingo Schommer
ffc6d6ffad BUGFIX Disable CMS preview for RedirectorPage (fixes #7127)
If the redirect is to an internal page, the preview iframe
will automatically load this new URL, causing the CMS edit
form to switch as well - effectively making it impossible
to edit a redirector page in the CMS as soon as it is saved
with an internal redirection target.
2013-01-09 21:44:52 +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
cc536f644e Fixed "last edited" display in CMS actions 2012-12-17 12:31:28 +01:00
Ingo Schommer
9403dd6e38 Respecting model permissions in AssetAdmin 2012-12-16 23:32:09 +01:00
Ingo Schommer
c2d31e55dd BUG Hiding group selections in "Settings"
JS functionality was only applied to page-specific settings
with similar fields, but not to SiteConfig settings.
2012-12-15 20:01:05 +01:00
Ingo Schommer
5b2cc19704 Added placeholder text to group listboxes 2012-12-15 19:57:14 +01:00
Ingo Schommer
a8478d2e46 Merge remote-tracking branch 'origin/3.0' into 3.1 2012-12-14 10:55:51 +01:00
Ingo Schommer
74d63791b7 Fixed regression in SiteTree->getCMSActions()
Caused by toolbar recent changes
2012-12-14 01:21:54 +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
Niklas Forsdahl
d42c0041d2 BUG: Fixed pagination functionality on root assets folder
Moving to another page in the GridField for the root assets folder in AssetAdmin
caused all files to be displayed. This was caused by the functionality that tries
to fix some edge cases for detail view kicked in and didn't filter the list properly.

Fixed by making the edge case detection a little more specific (i.e. checking if
a numeric ID was sent as a request variable).
2012-12-13 16:31:19 +02:00
Ingo Schommer
2e164eae51 API Report::get_reports() returns native array (fixes #8096)
Used to return ArrayList, but since 9d74c99e08 its no
longer using keys, which they functionality using these return
values rely on. Hence the breakage of ReportAdmin,
since no report was being detected as "current" by looking
through the array keys.
2012-12-13 00:46:17 +01:00
Ingo Schommer
8cd29b627c Merge branch 'pulls/selectiongroup' 2012-12-11 11:08:30 +01:00
Mateusz Uzdowski
a9004b9978 Restore numbering to navigator items so we can use iterator.
Otherwise the numbering is by priority which is not traversable
(1000, 2000, 3000...).
2012-12-10 18:09:55 +01:00
Mateusz Uzdowski
230182fc77 Remove preview button from history section.
No longer works. Needs to be rewritten to work with side-by-side.
2012-12-10 18:09:54 +01:00
Mateusz Uzdowski
47f41d80c6 API Machine-friendly name for CMS states navigator (stages).
Used programmatically by the side-by-side state switcher.
2012-12-10 18:09:54 +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
Naomi Guyer
0711c321c5 Add side-by-side translation context. 2012-12-10 18:09:54 +01:00
Naomi Guyer
639f6e4d95 NEW Side by side editing functionality - first cut (os#7412)
Introduces a preview window that appears when the screen is wide enough,
removes old preview button, adds a draft-public switch, adds variety of
preview options which are not hooked up yet.

Relies on sapphire's f95fadc84416835302fe6c8448054960b5e7ec65
2012-12-10 18:09:54 +01:00
Ingo Schommer
1bf67fd942 Merge remote-tracking branch 'origin/3.0' 2012-12-10 18:09:34 +01:00
Mateusz Uzdowski
c0751df54e BUG Remove handwritten SQL and use the ORM.
The custom SQL does not take subsites into account and breaks the CMS
on certain pages - under some circumstances the custom count will return
1 or more, while the set will be in fact empty because of augmentation.
2012-12-05 10:27:12 +13:00
Andrew O'Neil
6b6571cd28 BUGFIX: Only rely on request var ParentID, instead of using both $this->currentPage() and the request var. This will hopefully fix issues around the parent ID getting lost. 2012-12-04 11:16:40 +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
Ingo Schommer
2cd46ff0ed Use new SelectionGroup_Item API in "add page" UI 2012-11-30 15:34:10 +01:00
Ingo Schommer
027a41aec7 Consistent naming for root breadcrumb on page controllers (fixes #8057) 2012-11-29 14:43:37 +01:00
Ingo Schommer
e6e12fe00e Merge branch '3.0'
Conflicts:
	composer.json
2012-11-22 23:48:18 +01:00
Tim Klein
59719a46cc MINOR removed reference to non existent js
cms/javascript/SitetreeAccess.js is no longer with us :)
2012-11-19 16:15:57 +13:00
Ingo Schommer
65fe8e5ae3 Fixed line length 2012-11-19 01:18:01 +01:00
Kirk Mayo
d58b23d6fa BUG AssetAdmin filter array indices (fixes #8014) 2012-11-19 00:51:12 +01:00
Sean Harvey
4c73f23ddb Removing deprecated FileList as it relies on TableListField
This has been moved to "legacytablefields" module
https://github.com/silverstripe-labs/legacytablefields
2012-11-16 12:42:04 +13:00
Sean Harvey
cef087f689 Removed deprecated SiteTree::TreeTitle(), use getTreeTitle() instead 2012-11-15 14:41:17 +13:00
Sean Harvey
d236bb58eb Removed deprecated SiteTree::prepopuplate_permission_cache()
This function is misspelled, and was marked deprecated. This commit
removes that function. Please use prepopulate_permission_cache()
instead (note the removal of the extraneous "p" in "prepopuplate")
2012-11-15 14:39:48 +13:00
Sean Harvey
94b37dbeb0 Fixing AssetAdmin to use static FormField::create_tag()
Instead of createTag() which is deprecated
2012-11-15 14:32:52 +13:00
Sean Harvey
33884acbc5 Removed deprecated ContentController::LangAttributes()
Use ContentLocale() instead and write attribute names suitable
to XHTML/HTML instead
2012-11-15 14:32:21 +13:00
Sean Harvey
555ecd7f24 Removed deprecated SiteTreeDecorator, use SiteTreeExtension instead 2012-11-15 14:31:54 +13:00
Sean Harvey
35bcf69c01 Removed deprecated Register::register() and unregister()
Report automatically includes reports instead, and
add_excluded_reports() can be used to exclude certain reports
2012-11-15 14:30:47 +13:00
Simon Welsh
d006c08db3 Reverts test code committed in a52514a3 2012-11-10 15:42:45 +13:00
Simon Elvery
6a69a2f71a BUGFIX Ensure required lang and css are loaded when using SiteTreeURLSegmentField 2012-11-08 12:53:43 +10:00
Andrew O'Neil
b31188f252 APICHANGE: Use late static binding for Object::has_extension() 2012-11-07 11:08:36 +13:00
Andrew O'Neil
1722f00869 APICHANGE: add_extension() is now called directly on the class, instead of on Object 2012-11-07 11:08:36 +13:00
Ingo Schommer
a52514a306 ENHANCEMENT Tab style consolidation and design consistency 2012-11-06 22:24:01 +01:00
Sam Minnee
ef32310ef8 FIX: Allow 1024 chars for keywords, not a mere 255 2012-11-05 17:58:32 +13:00
Sean Harvey
79e6304ce1 Merge branch '3.0' 2012-11-05 15:13:06 +13:00
Stig Lindqvist
fa348d6666 MINOR Code refactoring of CMSMain::SearchForm() extracted some methods. 2012-11-02 23:52:24 +01:00
Ingo Schommer
600c73086b Merge pull request #223 from adrexia/7883-File-Uploading-Notifications
BUG: File Uploading Notifications (fixes #7883)
2012-11-02 14:08:20 -07:00
Ingo Schommer
53e92a080a Merge pull request #226 from adrexia/asset-grid-filter
BUG: Filter in asset grid appears in incorrect place
2012-10-30 14:59:25 -07:00
Ingo Schommer
7131e167f1 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	code/model/RedirectorPage.php
2012-10-30 17:54:55 +01:00
Will Rossiter
b221f7ba7a FIX Remove Metadata Label from RedirectorPage. (Fixes #7959) 2012-10-23 19:32:25 +13:00
Naomi Guyer
0d642af136 BUG: Filter in asset grid appears in incorrect place
Moved the filter component in the asset gridfield to after the sortable
header
2012-10-23 15:00:49 +13:00
Russell Michell
72543440cb BUGFIX: Fixed SideReport for use with Postgres (using v8.4) which requires table/column-names to be quoted. MySQL seems OK with either/both 2012-10-19 16:04:32 +13:00
Naomi Guyer
d61f16d54a BUG: File Uploading Notifications (fixes #7883)
* Moved allowed file types into a variable to be used in the template.
2012-10-16 18:43:10 +13:00
Sean Harvey
8a0ae5653f Merge branch '3.0' 2012-10-15 10:10:52 +13:00
Sean Harvey
98197525c6 Remove use of backticks in BrokenLinksReport, always use ANSI quotes 2012-10-11 17:24:23 +13:00
Sam Minnée
de4f207534 Merge pull request #208 from halkyon/upload_assets_changes
Uploads go to "assets/assets" instead of root of assets
2012-10-10 13:24:06 -07:00
Ingo Schommer
17113039be NEW Enable SiteTree::$nested_urls by default 2012-10-08 17:05:46 +02:00
Jeremy Bridson
76e569a8bb ENHANCEMENT: open/7886 added preview button to the settings page so that when a user changes the theme they can preview the change. 2012-10-05 16:27:13 +13:00
Ingo Schommer
0d03c62984 Merge remote-tracking branch 'origin/3.0' 2012-10-03 16:16:25 +02:00
Ingo Schommer
a6d09988ed Merge pull request #214 from silverstripe-droptables/ssexpress
Tweaks to CMS required for Translatable
2012-10-02 02:10:47 -07:00
Robert Curry
9cf5a6f47a BUG: Remove the is_null check on augmentValidURLSegment
Object::extend already does a check for NULL before it adds the results
to the array of return values. This was required for Translatable as the
result from Translatable::augmentValidURLSegment was being ignored.
2012-10-02 11:29:10 +13:00
Simon Welsh
03ae8e3728 Merge pull request #213 from sminnee/http-error-catching
FIX Use RequestHandler::httpError() for all HTTP errors.
2012-09-26 18:00:32 -07:00
Sam Minnee
39792debb8 FIX Use RequestHandler::httpError() for all HTTP errors.
https://github.com/silverstripe/sapphire/pull/827 adds some extension points for catching HTTP errors such as 404.  This change fixes some issues where httpError() isn't used all the time.  Note that the aforementioned pull request will be necessary to ensure that it works properly.
2012-09-27 12:56:56 +12:00
Sean Harvey
cb8c10a473 Merge branch '3.0' of github.com:silverstripe/silverstripe-cms into 3.0 2012-09-27 10:49:03 +12:00
Roman
bde71c1b9c Fixing permission issue with CMSSettingsController, where it won't show up for users with limited rights, even when they have the EDIT_SITECONFIG permission 2012-09-25 22:13:31 +02:00
Sean Harvey
686f70330b Merge pull request #210 from chillu/pull/sitetree-meta-removal
API Removed SiteTree.MetaTitle and MetaKeywords
2012-09-24 21:15:24 -07:00
Sean Harvey
345dbc8a4f BUG Fixing broken links "admin/show", should be "admin/pages..." 2012-09-25 15:31:42 +12:00
Sean Harvey
d229fdcc6d Merge branch 'removestatic' of git://github.com/wilr/silverstripe-cms into wilr-removestatic 2012-09-25 14:15:09 +12:00
Ingo Schommer
cbd31e3ab2 API Removed SiteTree.MetaTitle and MetaKeywords
They are irrelevant in terms of SEO, general page informancy,
clutter up the CMS UI, and encourage CMS authors to waste
their time filling them out.

[1] http://www.seomoz.org/learn-seo/title-tag
[2] http://www.mattcutts.com/blog/keywords-meta-tag-in-web-search/
2012-09-21 11:31:00 +02:00
Ingo Schommer
cebce51bc1 Merge branch 'open/7875' of git://github.com/jbridson/silverstripe-cms into jbridson-open/7875 2012-09-21 10:49:20 +02:00
Will Rossiter
a3007b618f API moved StaticCache / StaticPublisher to module.
Removed all related functionality for exporting a static version of the website to the silverstripe-static module.
2012-09-21 19:59:31 +12:00
Sean Harvey
118b28dea1 BUG setFolderName in CMSFileAddController should default to the root
setFolderName expects a folder name relative to the root. Specifying
ASSETS_DIR will create a duplicate folder called "assets", so the
file gets uploaded into "assets/assets". Specifying "/" means the
file will get uploaded into the root instead, which is correct.
2012-09-21 16:00:35 +12:00
Ingo Schommer
df44239060 Method visibility according to coding conventions 2012-09-20 10:41:50 +02:00
Jeremy Bridson
05d5bd7508 ENHANCEMENT:open/7875 - added help labels to metadata fields on page content edit screen. 2012-09-20 13:22:12 +12: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
17db5baf19 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-12 11:02:24 +02:00
Ingo Schommer
9b6ca79746 Fixed report title column localization 2012-09-12 11:02:24 +02:00
Ingo Schommer
9124d8ae1a Fixed report title column localization 2012-09-11 12:49:27 +02:00
Damian Mooyman
02e95adb4c BUG Consistently save SiteConfig, and refactor Translatable hooks
Squashed commit of the following:

commit a60eddfacc710d3047bd1d5107e5df0cc6dba93c
Merge: c847b55 76be14b
Author: Ingo Schommer <ingo@silverstripe.com>
Date:   Fri Sep 7 17:02:47 2012 +0200

    Merge branch '3.0-translation-migration' of git://github.com/tractorcow/silverstripe-cms into tractorcow-3.0-translation-migration

commit 76be14b1fc
Author: Damian Mooyman <damian.mooyman@gmail.com>
Date:   Fri Aug 24 08:28:18 2012 +1200

    FIXED: Indentation

commit 715b60387c
Author: Damian Mooyman <damian.mooyman@gmail.com>
Date:   Fri Aug 24 08:25:14 2012 +1200

    FIXED: Coding style inconsistencies

commit 6395f9030e
Author: Damian Mooyman <damian.mooyman@gmail.com>
Date:   Thu Aug 16 16:30:11 2012 +1200

    FIXED: Issue where new SiteConfig instances weren't always saved to the database

commit aca242e31c
Author: Damian Mooyman <damian.mooyman@gmail.com>
Date:   Thu Aug 16 14:22:56 2012 +1200

    UPDATED: Refactored Translation module specific code out of the SiteConfig
2012-09-07 17:06:29 +02:00
Ingo Schommer
c847b55608 Merge pull request #195 from creamarketing/page-type-dropdown-translations
BUG: Page type names not translated in pages overview search form
2012-09-06 12:36:35 -07:00
Andrew O'Neil
f843dd56dc BUGFIX: Fix site tree filter not showing parents of results more than a level deep in the hierachy 2012-09-05 14:35:48 +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
jean
53fdafb473 NEW 7839 Support for documents as a file type in Files and images 2012-09-04 11:26:09 +12: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
1cd82e2db1 BUG Enforce $allowed_children in controllers on page creation (fixes #7694)
Original bug fix contributed by @kmayo-ss
2012-09-02 18:20:22 +02:00
Saophalkun Ponlu
e5401668fa BUG Filter pages by LastEdited always returns an empty list
This is caused by the input date values entered by the user are passed into query without converting in a correct format first.
2012-08-30 22:42:45 +12:00
Ingo Schommer
f454f481f2 BUG Session namespace sharing for CMS controllers
Ideally we could do this without session, but pragmatically
we still need it, because of the inflexible routing system,
and because of performance considerations.

Example: The tree is lazy loaded via a generic  URL (admin/pages/treeview).
While we could add ?ID=<currentpage> to make the view (more or less) stateless,
it would trigger a full tree reload on every tree navigation action.
Instead, we assume that all "reachable" nodes are already cached,
and simply mark a different one as current. For this to work, we need
shared session state between CMS controllers.

See http://open.silverstripe.org/ticket/7815 for detail.
2012-08-29 15:09:15 +02: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
Ingo Schommer
7525e3c977 Merge pull request #183 from adrexia/installer
BUG: Installer templates
2012-08-29 02:25:19 -07:00
Hamish Friedlander
d9243cddde FIX Pages with obsolete class shouldnt do first versionless write 2012-08-29 16:17:17 +12:00
Hamish Friedlander
949507c3fe NEW Add warning if viewed SiteTree object class is obsolete 2012-08-29 14:48:23 +12:00
Hamish Friedlander
fdecfbc091 Merge pull request #189 from silverstripe-rebelalliance/open/7754
BUG: Fixing a issue with a undefined variable in getLink
2012-08-28 16:09:35 -07: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
Ingo Schommer
8a514d8b64 BUG Correct live state in SiteTree->getAbsoluteLiveLink()
Was fetching the record from live (and its direct URLSegment),
but all of its parents from the current stage, which might be draft,
leading to "mixed" draft/live nested URLs which might no longer
be reachable in live mode.
2012-08-28 19:04:16 +02:00
Saophalkun Ponlu
436972744d Enable page sorting by Page name in list view (see #7601) 2012-08-28 21:18:07 +12:00
jean
62cfd871b6 FIX 7819 Check if the current folder ID is in the url before assuming the list should not filter by folder ID 2012-08-28 16:43:54 +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
cd8c3a0245 NEW Re-added SilverStripeNavigator styling 2012-08-27 11:53:57 +02:00
Ingo Schommer
8442ed0ecd i18n for report table title (see #7798) 2012-08-26 23:58:38 +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
6b6dfaed7b Fixed i18n namespace for "Sync Files" 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
Naomi Guyer
4fdc76d904 BUG: Installer templates
Installer was feeing the title "Title" to the template. Template
rearranged for usability concerns (people were missing the email and
password when going to the CMS login page)
2012-08-22 13:52:33 +12: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
Sean Harvey
c019f22163 Fix notice when ErrorPage tries to create static error pages and can't write 2012-08-20 15:23:46 +12: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
Ruud Arentsen
18a40b4b5d BUG Adding siteconfig translations
translations were not added in the same translation group, and the
translation module didn't work. Also commited changes in the translation module, which will need this commit.
2012-08-10 10:16:39 +02:00
Will Rossiter
24ce0c199a Merge pull request #174 from adrexia/add-archive
BUG: Missing preview archive version button (fixes 7656)
2012-08-09 02:57:59 -07: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
Kirk Mayo
03e4893b15 BUG: Fixing a issue with a undefined variable in getLink 2012-08-08 16:39:10 +12:00
Ingo Schommer
39a9093715 BUG SiteTree->provideI18nEntities() limited to class
Called for each subclass by the collector,
so we don't need to aggregate here.
In fact, its harmful because it causes entities
to be placed in the wrong definitions file.
The <class>.DESCRIPTION entity was always placed in cms/lang/en.yml,
regardless of the original location of the file containing the class.
2012-08-06 14:28:04 +02:00
Ingo Schommer
671c7daa4c SiteConfig load/save with ID in CMS
Allow loading a SiteConfig by ID (by specifying $tree_class),
and pass the ID through with the form data. Unifies processing
with SiteTree, and allows the Translatable module
to use the same logic for interacting with the load/save process.
2012-08-06 09:36:25 +02:00
Ingo Schommer
9076286162 SiteTree->CMSEditLink()
Mainly to make it compatible with the Translatable
extension linking to existing translations of it,
but also to make it work similarly to the SiteTree logic elsewhere.
2012-08-05 20:52:22 +02:00
Will Rossiter
5938ab06ba Merge pull request #165 from silverstripe-droptables/search-form-fix
BUG: Check for the parameter existence.
2012-08-04 23:18:45 -07: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
Marcus Nyeholt
97d678b258 BUGFIX Provide default constructor value to filesystem publisher so that singleton calls (which don't pass params) don't fail 2012-08-05 18:02:13 +12:00
Naomi Guyer
7c0e38707c BUG: Missing preview archive version button (fixes 7656)
Added missing preview button
2012-07-31 17:49:59 +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
Hamish Friedlander
6d5d3d19b4 Merge remote-tracking branch 'origin/3.0' 2012-07-25 11:46:14 +12:00
carlos barberis
f7b6f1de5a BUGFIX: ticket #5239 - Infinite loop: live subpage of draft page redirects onto itself when called just by url segment 2012-07-23 17:06:37 +12:00
Mateusz Uzdowski
ee2b1a9070 BUG Check for the parameter existence.
The specific situation is if the SearchForm.ss is overriden, and the
$SearchQuery parameter is used in the template. This will throw a Notice
in case the form is rendered without searching.
2012-07-20 14:04:52 +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
Kirk Mayo
b15fabaf0d BUG: open ticket 5880 always show the current page type in the page type dropdown list 2012-07-16 14:56:24 +12:00
Ingo Schommer
69e4fa072a Toggle metadata fields in SiteTree->getCMSFields()
To save space, reduce clutter and deemphasize the fields.
Partially fixes #7405, needs better design though.
2012-07-15 21:29:46 +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
b74178e7fd BUG Reload full view in admin/settings to avoid tabs breaking
Had the pjax "CurrentForm" marker set to the <form> tag,
which makes sense, but excludes the tabs. On refresh,
the tabset wasn't reinitialized, showing all form elements on
one page. Its easier to simply refresh the whole content area.
2012-07-13 11:00:21 +02:00
Mateusz Uzdowski
54fd54a2fb BUG Change all shortcodes into the new, comma separated, format.
Ref http://open.silverstripe.org/ticket/7337
2012-07-12 17:57:38 +02:00
Ingo Schommer
8055fc2e7b FIX Corrected page edit links in reports 2012-07-12 16:30:17 +02:00
Ingo Schommer
57c615d6b2 NEW Reinstated filters in ReportAdmin
- Moved report table generation back to its original location in Report->getCMSFields(),
in order to keep it customisable rather than duplicating it in ReportAdmin.
- Using History.js to set URL state and reload panel
- Namespacing filter GET parameters in order to only include them in URL state
2012-07-12 16:19:23 +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
Julian Seidenberg
63ad68a7d3 BUGFIX: fixing an edge-case bug where a 404-page would get statically published and overwrite the homepage of the site (this would sometimes happen when a RedirectorPage was set to an external URL and still referenced an internal page ID) 2012-07-09 13:20:58 +12:00
Ingo Schommer
d1bc7219a8 Merge branch '3.0' 2012-07-05 17:53:35 +02:00
Ingo Schommer
89079c4ca0 Checking for existence of 'Locale' data in CMS controllers
Only applies for Translatable extension installed
2012-06-29 14:22:24 +02:00
Sam Minnee
040f780a15 BUG: Allow children on RedirectorPage (Trac #7587) 2012-06-29 16:24:20 +12:00
Naomi Guyer
ef651d9d93 ENHANCEMENT: Add GridfieldLevelup component to files area 2012-06-26 13:35:38 +02:00
Ingo Schommer
bb5e3e5fbd MINOR Remove DB dependency from SiteTree->provideEntities()
Use class manifest instead, which provides same level of info,
and means we can run the text collector on bare checkouts
without a database set.
2012-06-25 14:01:19 +02:00
Hamish Friedlander
34ee111ff7 Merge pull request #152 from sminnee/trac-7174
REMOVE: Remove action handler for widgets. (Trac #7174)
2012-06-21 19:40:03 -07:00
Hamish Friedlander
8c05f3554f BUGFIX: Add batch handler status messages (fixes #7427)
7427 was mostly fixed by Ingos previous patch. But two batch actions, delete from draft site and delete from published site werent returning
status messages. Abstracted out the status preperation code that the batch actions that were returning status messages were using, and
used that to add status messages to the problem two
2012-06-22 14:09:52 +12:00
Sam Minnee
3fbf57245c REMOVE: Remove action handler for widgets. (Trac #7174)
The widget functionality has been moved into a module, and this URL handler was the last of the code still in the core app related to widgets.  As well as this commit, there is a related change to the silverstripe-widgets module to add this feature there: 025ee424c4
2012-06-22 14:05:27 +12:00
Will Rossiter
facc8ba653 MINOR: restore backlinkcount into cms module. (removed from framework in 266a61221c) 2012-06-20 16:27:47 +02:00
Ingo Schommer
4986355e3f MINOR Simplified page type dropdown labels, removed redundant info (fixes #7474) 2012-06-15 16:22:27 +02:00
Ingo Schommer
c8052da5b8 BUGFIX Corrected page history pane loading (fixes #7477) 2012-06-15 12:50:54 +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
Ingo Schommer
3c81958345 MINOR Only set folder field state in AssetAdmin if a folder is shown 2012-06-14 20:21:28 +02:00
Ingo Schommer
a64cf8c27b BUGFIX AssetAdmin->delete() is now allowed, and redirects to parent folder automatically 2012-06-14 20:21:04 +02:00
Ingo Schommer
eaf05a6a7c BUGFIX AssetAdmin root navigation (fixes #7448)
Return a new object instance rather than relying on singleton(),
which might've been modified elsewhere, and have a non-zero ID/ParentID.
2012-06-14 09:42:55 +02:00
Ingo Schommer
6581831396 MINOR Disable parent node search in CMSPageAddController
The search <input> field can't handle HTML returned by SiteTree.TreeTitle, see #7455 for proposed fix
2012-06-13 16:11:35 +02:00
Ingo Schommer
eccfc1a664 Merge branch 'stylingfixes' of https://github.com/ajshort/silverstripe-cms into ajshort-stylingfixes 2012-06-13 13:24:12 +02: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
Ingo Schommer
e50936fe9f MINOR Added caching to SiteTree->getStatusFlags(), as its called twice for every node now in LeftAndMain->SiteTreeAsUL() (see #7410) 2012-06-12 19:35:15 +02:00
Ingo Schommer
bc2fb3c900 Merge pull request #147 from ajshort/silverstripe-cms
---
2012-06-12 00:35:21 +02:00
Andrew Short
cdea489fcb BUGFIX: Catch and display validation errors when adding a page. 2012-06-11 23:19:59 +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
ca9f4f6f6f Merge branch 'pjax-multiple' 2012-06-05 14:01:20 +02:00
Ingo Schommer
8b8de0564c BUGFIX Don't filter AssetAdmin list view when showing detail view (fixes #7408) 2012-06-05 13:42:38 +02:00
Ingo Schommer
b5254862a2 MINOR Added feedback after creating page (fixes #7297) 2012-06-04 09:57:40 +02:00
Ingo Schommer
ad7c443255 ENHANCEMENT Saving tab state for CMSPagesController 2012-05-30 16:04:51 +02: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
Marcus Nyeholt
9f51c87884 MINOR Use injector to create controllers in ModelAsController 2012-05-30 15:09:25 +10:00
Sean Harvey
ad28780959 MINOR Use shorthand syntax for DataList querying 2012-05-28 21:05:24 +12:00
Sean Harvey
808819ec3b BUGFIX Themes dropdown in SiteConfig::getCMSFields() should use setEmptyString() as the $emptyString argument is now deprecated. 2012-05-24 14:38:00 +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
542d727db2 MINOR Don't use deprecated extraStatics when adding extra statics with
DataExtension
2012-05-23 22:13:27 +12:00
Sean Harvey
ec3ebc91d8 MINOR Use instance methods on current Controller instance for redirect()
instead of static Director functions
2012-05-23 21:45:16 +12:00
Sean Harvey
7ed09917ac BUGFIX Fixing incorrect URL to edit canonical page on VirtualPage 2012-05-22 17:44:01 +12:00
Ingo Schommer
1614bc4505 MINOR Removed unknown "cancel draft" button icon (fixes #7333) 2012-05-20 14:20:59 +02:00
Sean Harvey
60e7a5960f MINOR Adding default text to SAVEDUP entity 2012-05-18 16:54:33 +12:00
Julian Seidenberg
7112032b4c BUGFIX: fixing the look of Settings tab in the CMS if it has multiple tabs 2012-05-18 16:33:34 +12:00
Sean Harvey
5b223aa3b5 MINOR Use GridFieldToolbarHeader and GridFieldFilterHeader in AssetAdmin GridField, set title of the table to the current folder title. 2012-05-16 17:32:52 +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
20af440694 BUGFIX Decode URLSegment before showing it through SiteTreeURLSegmentField, to separate presentation from its internal url encoded value 2012-05-14 15:12:33 +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
af48b3948b Merge pull request #121 from chillu/silverstripe-cms
---

....Main" to "Root.Main", merged "Root.Content.Metadata" tab into "Root.Main"

See https://github.com/silverstripe/sapphire/pull/420

Conflicts:
	code/model/SiteTree.php
2012-05-11 14:03:44 +02: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
Ingo Schommer
526120d949 Merge pull request #122 from ryanwachtl/silverstripe-cms
---

Basic behaviour for opt-in URL updating. URL is auto-generated on initial edit of the page Title after creating a new page. After page Title has been updated; URLSegment, MenuTitle, and MetaTitle are updated manually. Adds edit, ok, and cancel buttons to URLSegment field. Action to "update from Title" and help text not implemented yet. Any feedback welcome and appreciated.
2012-05-10 11:59:15 +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
Ryan Wachtl
bd94c6f336 Trac 6981: Opt-in URL Updating 2012-05-09 19:01:57 -05:00
Ingo Schommer
42d404faa8 API CHANGE Restructured SiteTree->getCMSFields() tabs from "Root.Content.Main" to "Root.Main", merged "Root.Content.Metadata" tab into "Root.Main" (fixes #7261) 2012-05-09 17:48:59 +02:00
Ingo Schommer
d15b4ad8ee Merge pull request #119 from chillu/urlsegment-multibyte-fix
Urlsegment multibyte fix
2012-05-09 01:32:52 -07:00
Sean Harvey
d79d5987cb Merge pull request #110 from chillu/trac/7170-i18n-sprintf-injections 2012-05-09 19:55:53 +12:00
Ingo Schommer
8563322971 BUGFIX Fixed publication of multibyte URLSegment in SiteTree->onBeforeWrite(), was wrongly detecting a change and double encoding 2012-05-08 23:45:29 +02:00
Ingo Schommer
77e52d6344 ENHANCEMENT Url encoding URLSegments before matching them against database records in ModelAsController, to match behaviour of SiteTree with URLSegmentFilter::$default_allow_multibyte=true. Not an API change because all encodable characters have been removed by the default URLSegmentFilter already (see http://www.w3.org/International/articles/idn-and-iri/#iriproblem) 2012-05-08 23:45:26 +02:00
Ingo Schommer
63536af875 MINOR Documentation 2012-05-08 22:22:11 +02:00
Ingo Schommer
08a7bf0879 BUGFIX Remove double URL/filename filtering in FilesystemPublisher to avoid breaking multibyte URLs (now possible through recently introduced URLSegmentFilter class). Multibyte safe url path processing in FilesystemPublisher. 2012-05-08 22:22:08 +02:00
Ingo Schommer
f7661780d3 MINOR Added padding to CMSSettingsController view 2012-05-08 00:53:26 +02:00
Ingo Schommer
6ec6b107ca BUGFIX Don't require ParentModeField in CMSpageAddController submissions, to allow for easier programmatical submission of "add page" form (via CMS tree). Reset any selected parent nodes in the interface instead 2012-05-07 14:30:08 +02:00
Ingo Schommer
1fa54abf6c Merge pull request #114 from ohararyan/silverstripe-cms
---

http://open.silverstripe.org/ticket/7214

Added watermark to show current state of preview.
2012-05-07 13:00:52 +02:00
Ingo Schommer
32f4672744 Merge pull request #118 from normann/silverstripe-cms
---

Add page icons to the tree node in TreeDropdownField in page add form.
2012-05-07 11:03:02 +02:00
Normann Lou
85a69c0260 ENHANCEMENT: add page icons for tree dropdown field when creating a new page and setting its parent 2012-05-07 15:41:33 +12:00
Sam Minnée
81e559d0ff Merge pull request #117 from normann/trac/7173
trac 7173: Add "level up" list entry to CMS page list view
2012-05-06 20:31:27 -07:00
Sean Harvey
45810a1848 MINOR Using new API methods after SQLQuery API changes 2012-05-07 14:22:21 +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
Ryan O'Hara
ad1f7c1f76 ENHANCEMENT: Add Watermark for preview states (TRAC-7214) 2012-05-04 11:50:09 +12:00
Ingo Schommer
7c25754cb1 ENHANCEMENT Localization of installation success screen 2012-05-03 17:53:33 +02:00
Ingo Schommer
d072f715b7 MINOR Don't show title on reports GridField (duplicates the section title) 2012-05-03 13:50:01 +02:00
Ingo Schommer
f812e56022 ENHANCEMENT Moving action buttons in AssetAdmin to "details" tab (fixes #7221) 2012-05-03 11:26:09 +02:00
Ingo Schommer
f8abcd8fa5 Merge pull request #112 from silverstripe-big-o/Trac-7266-sync-files-icon
ENHANCEMENT:Trac 7266 - added an icon to the 'sync files' button in Asse...
2012-05-03 02:24:15 -07:00
Jeremy Bridson
3cdca3ea05 ENHANCEMENT:Trac 7266 - added an icon to the 'sync files' button in AssetAdmin + regenerated css files. 2012-05-03 12:17:49 +12:00
Ingo Schommer
38f1236b1f MINOR Switching _t() calls from sprintf() to using injection parameters (#7170) 2012-05-01 22:05:19 +02:00
Ingo Schommer
9f1668505b MINOR Remove usage of deprecated array access on SQLQuery in SiteTreeFolderExtension 2012-05-01 17:58:14 +02:00
Sean Harvey
a610a8c5e9 BUGFIX Fixing ListViewForm using setDisplayFields on GridField, not the component 2012-05-01 15:50:06 +12:00
Sean Harvey
7c54c60311 MINOR Rename setModel to setDataModel due to API changes 2012-05-01 14:46:48 +12:00
Robert Curry
db3332e629 MINOR: Modify VirtualPage to work with lazy loading. 2012-05-01 09:38:20 +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
Ingo Schommer
8c1651ec59 MINOR Using GridField instead of TableListField for SiteTree->getCMSFields() DependentPages (fixes #7239) 2012-04-30 16:10:24 +02:00
Ingo Schommer
a73e45769a ENHANCEMENT Titles for lozenges in page tree for more context (fixes #7206) 2012-04-30 14:56:42 +02:00
Sean Harvey
614f307a37 ENHANCEMENT When loading CMS, ensure that "Parent page" tree dropdown is
either hidden or shown depending on initial "Page location" state
2012-04-23 21:02:29 +12:00
Julian Seidenberg
8ad93a197e BUGFIX: check for abstract classes when automatically registering SS_Report classes. Abstract classes are now no longer included in the list of Reports. Includes unit test for this scenario. 2012-04-20 16:32:39 +12: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
8a72b32e95 API CHANGE Moved Widget API to new module (https://github.com/silverstripe/silverstripe-widgets), incl. WidgetArea and WidgetAreaEditor classes 2012-04-18 23:21:59 +02:00
Ingo Schommer
4fd757341a MINOR Consistent link method names: LeftAndMain->PreviewLink() changed to LinkPreview() 2012-04-18 22:59:31 +02:00
Ingo Schommer
e5000dd330 MERGE List view breadcrumbs 2012-04-18 21:14:14 +02:00
Ingo Schommer
ca853d73f2 ENHANCEMENT Renamed "Content" tab in SiteTree->getCMSFields() to "Main Content" to distinguish it from the top-level "Content" tag 2012-04-18 16:28:07 +02:00
Ingo Schommer
0f7dd7922f API CHANGE Removed $controller context from SiteTree->CMSTreeClasses(), now handled through closures in the specific LeftAndMain usage instead (to handle separate contexts for links and determining "current page") 2012-04-17 22:59:11 +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
Andrew O'Neil
4057956a8b MINOR: Use ajax to load reports 2012-04-16 11:17:55 +12: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
Ingo Schommer
d9c4aa8583 MINOR Using new DataObject::fieldLabels() caching in SiteTree 2012-04-15 16:49:30 +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
Simon Welsh
b8e86ae261 MINOR Add newline to end of files without one 2012-04-15 10:56:40 +12:00
Will Rossiter
d4750c2a96 MINOR: group ShowInMenus and ShowInSearch check boxes. Fixes #6901 2012-04-14 18:16:47 +12:00
Will Rossiter
8531525789 MINOR: remove $template var as sapphire/07d2d52 will pick this up automatically 2012-04-14 18:15:49 +12:00
Ingo Schommer
dc0168d01b MINOR Removed $params argument to DataObject->getCMSFields(), please use FormScaffolder directly (fixes #7135) 2012-04-13 15:55:32 +02:00
Ingo Schommer
2592d62a4c Merge pull request #94 from silverstripe-big-o/report-fixes
ENHANCEMENT: replacing ReportAdmin report listing paginator with a new f...
2012-04-12 05:14:30 -07:00
Julian Seidenberg
203bfc9e99 ENHANCEMENT: replacing ReportAdmin report listing paginator with a new footer GridField component 2012-04-12 16:13:24 +12:00
Sean Harvey
6b3d8904e3 BUGFIX Fixed broken test LeftAndMain caused by createTag being called
statically in AssetAdmin, when it shouldn't be
2012-04-12 13:04:01 +12:00
Sam Minnée
117b8c3f97 Merge pull request #93 from halkyon/e_strict_fixes
E_STRICT compliance fixes for CMS module
2012-04-11 16:30:46 -07:00
Sean Harvey
8325d73665 MINOR Fixing method signatures not compliant with the parent 2012-04-12 11:23:15 +12:00
Sean Harvey
5e567cbf80 BUGFIX Declare StaticPublisher::set_static_publisher_theme() and
StaticPublisher::static_publisher_theme() as static, since they're only
called statically. This is a fix for E_STRICT compliance.
2012-04-12 11:21:21 +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
363dc9a4a9 MINOR Searching both Title and Filename in AssetAdmin (fixes #7013, see pull request #71) 2012-04-11 16:18:38 +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
bacbb8a8d0 Merge pull request #89 from halkyon/modelascontroller_fix
BUGFIX Removed double check of find_old_page() in ModelAsController
2012-04-11 06:41:40 -07:00
Ingo Schommer
59366769ae Merge pull request #92 from ajoneil/estrict
MINOR: Fix E_STRICT warnings
2012-04-11 06:38:47 -07:00
Stig Lindqvist
587de186d0 Merge pull request #90 from halkyon/redirectorpage_changes
BUGFIX Adding RedirectorPage.js to cms module (was in sapphire) and swapping out old behaviour.js usage
2012-04-11 04:10:01 -07: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
Sam Minnee
ca4e8e1bdb BUGFIX: Fixed sort order of files and images GridField 2012-04-11 18:13:45 +12:00
Andrew O'Neil
12b30ff538 MINOR: Fix E_STRICT warnings 2012-04-11 18:09:11 +12: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
Sam Minnee
7213d2b7dc MINOR: Clarified meaning of SiteTree:: 2012-04-11 15:48:17 +12:00
Sean Harvey
240627b504 BUGFIX Adding RedirectorPage.js to cms module (was in sapphire) and
fixing to use entwine/jquery instead of old behaviour
2012-04-11 15:32:41 +12:00
Sean Harvey
8b44955c6e BUGFIX Removed double check of find_old_page() in ModelAsController 2012-04-11 14:51:33 +12:00
Normann Lou
7900da4d9d MINOR SSF-168 add Pagination to the report list so it show the bottom bar 2012-04-11 12:44:11 +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
Normann Lou
3d0566638a BUGFIX: SSF-124 filter on a value only if this value is not an empty string 2012-04-11 12:12:57 +12:00
Ingo Schommer
bc4208097f Merge pull request #87 from halkyon/advancedsearchform_removal
API CHANGE Removed AdvancedSearchForm, extend SearchForm for custom adva...
2012-04-10 03:39:59 -07:00
Ingo Schommer
44f2b88bd4 Merge pull request #86 from halkyon/deprecated_fixes
MINOR Fixing deprecated ereg functions with preg in SideReport and Widget
2012-04-10 03:38:38 -07:00
Sean Harvey
55bbda3a39 API CHANGE Removed AdvancedSearchForm, extend SearchForm for custom advanced search functionality instead. 2012-04-10 22:35:15 +12:00
Ingo Schommer
f021b9eec1 BUGFIX Writing version in SiteTree->doRestoreToStage, regression from 9451993d (fixes #7107) 2012-04-10 12:27:08 +02:00
Sean Harvey
d914ee0f2c MINOR Fixing ereg functions with preg in SideReport and Widget 2012-04-10 22:16:17 +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
Andrew O'Neil
97482f8664 BUGFIX Fix Breadcrumbs in ReportAdmin 2012-04-10 14:49:19 +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
Andrew O'Neil
9888f980aa ENHANCMENT: Link pages in reports to cms edit 2012-04-10 11:54:21 +12:00
Julian Seidenberg
8df5cd74fc BUGFIX: SSF-168 fixing "print" and "export to CSV" button in Report Admin 2012-04-10 11:15:29 +12:00
Julian Seidenberg
151693409c Revert "BUGFIX: SSF-168 fixing rendering issue in Chrome, which displays extra control at the bottom of the window in a report that is of a certain length"
This reverts commit 68aa59b25e.
2012-04-10 09:58: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
4524d1c594 MINOR Fixed usage of deprecated Form->dataFieldByName() 2012-04-05 23:00:04 +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
Julian Seidenberg
ea377b6012 BUGFIX: fixing URL suggestion when changing the name of a page 2012-04-05 16:39:56 +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
Julian Seidenberg
68aa59b25e BUGFIX: SSF-168 fixing rendering issue in Chrome, which displays extra control at the bottom of the window in a report that is of a certain length 2012-04-05 14:48:51 +12:00
Julian Seidenberg
e43d0b4640 MINOR: SSF-168 adding additional class to grid field that displays all reports 2012-04-05 14:14:09 +12:00
Julian Seidenberg
44e64344f0 ENHANCEMENT: SSF-168 adding breadcrumbs to ReportAdmin 2012-04-05 13:19:17 +12:00
Julian Seidenberg
b1e286cb23 BUGFIX: SSF-168 fixing bug in report admin where back button didn't work 2012-04-05 13:04:59 +12:00
Normann Lou
c1b248e2cf ENHANCEMENT SiteTree->getStatusFlags() which makes SiteTree->getTreeTitle() extensible 2012-04-04 23:02:53 +02:00
Ingo Schommer
de573e087d MINOR Using late static binding instead of Object::create() calls 2012-04-04 18:29:11 +02:00
Andrew O'Neil
4c76c8563c ENHANCEMENT: Use GridFields to show reports in the ReportAdmin 2012-04-04 17:58:29 +12:00
Normann Lou
029f83347b BUGFIX: use getName() for FormField object since Name() has been deprecated in SilverStripe 3 2012-04-04 14:31:40 +12:00
Jeremy Bridson
a48254a66b ENHANCEMENT:styling added to delete install files warning box 2012-04-04 13:27:01 +12:00
Sean Harvey
070c9c22aa BUGFIX Removed used of deprecated Name() method in AssetAdmin 2012-04-04 12:05:38 +12:00
Julian Seidenberg
349a04d049 API-CHANGE: SSF-168 changing the API/code-conventions for excluding specific reports. get_reports method now returns an ArrayList instead of an array of SS_Reports. 2012-04-04 10:58:48 +12:00
Julian Seidenberg
ee220bbcce API-CHANGE: SSF-168 initial rearranging the SS_Report class for use in SS3. Deprecating unnecessary methods, moving code around, rewriting get_reports method and writing unit tests 2012-04-03 18:06:35 +12:00
Ingo Schommer
651441225f Merge pull request #80 from halkyon/e_strict_support
Fixes to method arguments in cms classes for E_STRICT support
2012-03-28 02:48:17 -07:00
Ingo Schommer
a4f56b98d2 Merge pull request #81 from halkyon/e_deprecated_fixes
Remove use of deprecated ereg_replace() and use preg_replace()
2012-03-28 02:47:09 -07:00
Ingo Schommer
1827dc6727 API CHANGE Removed SiteTree->HomepageForDomain and related functionality ($write_homepage_map and generate_homepage_domain_map()), use new 'homepagefordomain' module instead (fixes #6902) 2012-03-27 14:50:09 +02:00
Ingo Schommer
c6b259e856 MINOR Redirect to page edit view after rolling back to a specific version in CMSPageHistoryController (fixes #6912) 2012-03-27 14:50:09 +02:00
Sean Harvey
1ab76865ea MINOR Remove use of deprecated ereg_replace() and use preg_replace() instead. 2012-03-27 22:52:33 +13:00
Sean Harvey
0ea9451014 MINOR Fixes to method arguments in cms classes for E_STRICT support. 2012-03-27 21:42:54 +13:00
Sean Harvey
7c9a1304a5 ENHANCEMENT Sort extension names by alphabetical order in CMSFileAddController::getEditForm()
ENHANCEMENT Ensure _t() used for "Allowed extensions" english text.
2012-03-27 13:45:43 +13:00
Sean Harvey
9e54124145 ENHANCEMENT Indicate which file extensions are allowed to be uploaded when choosing a file to upload. 2012-03-27 10:18:05 +13:00
Sean Harvey
10f030de67 BUGFIX When adding a top level folder in AssetAdmin, ensure you are
taken back to the top level folder view. Currently there is a non-object
error adding a root level folder.
2012-03-27 09:54:47 +13:00
Sam Minnee
42b7ab1930 BUGFIX: Prevent JS errors when widget area is loaded (note: doesn't actually fix it fully yet) 2012-03-24 16:38:34 +13:00
Will Rossiter
a39231f952 MINOR: add icon to ajax button in AssetAdmin 2012-03-24 14:30:10 +13: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
3248da02ce MINOR Simplified ajax/non-ajax responses in CMS. Browsers handle 3xx Ajax responses transparently, so a CMS redirect (and some smartness in the JS state handling) is enough, no conditionals required. 2012-03-12 13:45:10 +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
44a4e8a840 MINOR Fixed "Pages" breadcrumbs not to include root node, since its already in the tree panel 2012-03-12 11:52:39 +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
6768628606 MINOR Fixed "parent mode" default selection for "add page" panel, added CSS class for easier styling 2012-03-12 10:54:14 +01:00