Commit Graph

21 Commits

Author SHA1 Message Date
Damian Mooyman
d7d6fd8758 Merge 3 into master
# Conflicts:
#	code/controllers/CMSPageAddController.php
#	code/model/ErrorPage.php
#	composer.json
#	css/screen.css
#	tests/behat/features/insert-a-link.feature
2016-04-29 14:34:29 +12:00
Ingo Schommer
e4861bdc79 Adjust file paths for new static file structure in framework 2016-04-20 21:13:20 +12:00
Jake Bentvelzen
68694c01b7 Added readonly version of SiteTreeURLSegmentFiled, small quality of life thing when a user is looking at readonly data and wants to easily view the frontend of that page. 2016-03-15 10:48:46 +11:00
Damian Mooyman
849cd898a4 Cleanup trailing whitespace 2016-03-09 10:28:45 +13:00
scott1702
66f6ecc57e Implement RFC-7 JavaScript module loader in CMS 2016-01-27 14:56:47 +13:00
Sam Minnee
bbc3aaaf9f MINOR: Remove training whitespace.
The main benefit of this is so that authors who make use of
.editorconfig don't end up with whitespace changes in their PRs.

Spaces vs. tabs has been left alone, although that could do with a
tidy-up in SS4 after the switch to PSR-1/2.

The command used was this:

for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do
	find . -path ./thirdparty -prune -o -type f -name "$match" -exec sed -i '' 's/[[:space:]]\+$//' {} \+
	find . -path ./thirdparty -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
2016-01-07 10:32:05 +13:00
Ingo Schommer
36ac61115a Fix auto-setting of URL from localized page titles
Replace the hardcoded check for english locale ("new-page")
with a localized version.

See https://github.com/silverstripe/silverstripe-translatable/issues/180
2015-04-29 00:16:53 +12:00
Gus King
7b4cc316ef Numerous PHPDoc fixes. 2014-02-10 15:35:13 -05: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
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
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
Simon Elvery
6a69a2f71a BUGFIX Ensure required lang and css are loaded when using SiteTreeURLSegmentField 2012-11-08 12:53:43 +10:00
Ingo Schommer
df44239060 Method visibility according to coding conventions 2012-09-20 10:41:50 +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
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
Simon Welsh
b8e86ae261 MINOR Add newline to end of files without one 2012-04-15 10:56:40 +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
4524d1c594 MINOR Fixed usage of deprecated Form->dataFieldByName() 2012-04-05 23:00:04 +02:00
Cam Findlay
21289128bb MINOR SiteTreeURLSegmentField has new methods to aid in displaying URL prefix and secondary information text (fixes #6852) 2012-02-14 11:12:47 +01:00
Ingo Schommer
e35991b363 MINOR Misc styling fixes around dialogs and "add page" styling 2012-01-03 17:57:04 +01:00
Ingo Schommer
b4eda409c2 ENHANCEMENT Replaced client side URL filtering in CMS with ajax callbacks to new SiteTreeURLSegmentField, in order to align with extended server side logic (and avoid pre-filtering values too heavily before passing them to the server). Removed suggestions from client side user confirmation. 2011-11-14 15:29:19 +01:00