Commit Graph

333 Commits

Author SHA1 Message Date
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
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
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
eba4d205c3 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-01-30 12:44:40 +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
Ingo Schommer
317977a227 More useful default cols on "Pages" list (fixes #8199) 2013-01-22 15:37:20 +01:00
Ingo Schommer
8a9acaa5ba Fixed "add page" type icons (fixes #8190) 2013-01-17 19:59:54 +01:00
Ingo Schommer
76aeec70e7 NEW SiteTree->PreviewLink() for fine grained URL control 2013-01-14 17:12:23 +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
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
a8478d2e46 Merge remote-tracking branch 'origin/3.0' into 3.1 2012-12-14 10:55:51 +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
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
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
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
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
Andrew O'Neil
b31188f252 APICHANGE: Use late static binding for Object::has_extension() 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
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
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
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
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
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
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
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
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
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
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