tonyair
/
silverstripe-cms
mirror of https://github.com/silverstripe/silverstripe-cms
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
6,553 Commits 28 Branches 397 Tags 24 MiB
Commit Graph

645 Commits

Author SHA1 Message Date
Paul Clarke 18c1a4470f Add back button on edit panel for smaller screens only 2016-10-28 15:44:31 +13:00
Damian Mooyman e5550dd680 BUG Fix search not respecting view mode 2016-10-27 17:05:36 +13:00
Damian Mooyman 8c87ea6b79 API Update listview / treeview to use pjax instead of deferred loading 
Fixes #1645
 2016-10-27 17:05:36 +13:00
Damian Mooyman c4d748cb7d
BUG Fix firefox compatibility 2016-10-27 17:02:06 +13:00
Damian Mooyman 424008cff4 BUG Fix installer for 4.0 (#1644) 2016-10-26 14:44:25 +13:00
Christopher Joe 57fb0e0b33 moved cms-tree-filtered up with flexbox-area-grow 2016-10-26 10:43:34 +13:00
Paul Clarke 6762f43511 Add scroll to panel for filtered results 2016-10-25 15:07:51 +13:00
Paul Clarke 172072df03 Remove JS from filter height and replace with flexbox 2016-10-25 14:38:58 +13:00
Christopher Joe 0d1cd1ba44 Split top toolbar to their horizontal containers for Pages section 2016-10-18 14:22:47 +13:00
Christopher Joe 38b095ca2c moved preview overlay to template, added area grow to preview panel 2016-10-11 13:51:44 +13:00
Paul Clarke 4c61868e59 move preview fallback message 2016-10-11 13:51:44 +13:00
Paul Clarke b8b35de82d Replace Layout classes with Flexbox classes 2016-10-11 13:51:44 +13:00
Paul Clarke 67aca9f4e6 Replace Layout classes with flexbox css classes 2016-10-11 13:51:44 +13:00
Damian Mooyman 760caaab44 API use new bootstrap button row template 2016-09-22 13:20:31 +12:00
Damian Mooyman b2f250c539 Merge pull request #1614 from open-sausages/pulls/4.0/alignment-and-spacing 
Alignment and spacing of main CMS panels
 2016-09-21 10:13:05 +12:00
Christopher Joe 4b3f4ba01c move BackLinkHTMLList to template 2016-09-19 10:43:39 +12:00
Paul Clarke c42a20ae05 Update preview classes as area broken 2016-09-16 15:18:54 +12:00
Paul Clarke 1158520f40 Use consistent panel styles, apply .panel styles 2016-09-16 15:18:54 +12:00
Paul Clarke 59b2e293cf Convert to new styles to use .panel and .toolbar 2016-09-16 15:18:54 +12:00
Ingo Schommer 7f3f5b63e8 Merge pull request #1603 from open-sausages/pulls/4.0/tabify 
Add Bootstrap4 classes to tabs
 2016-09-14 14:04:21 +12:00
Damian Mooyman 327a8a320e API Move preview template to cms section 2016-09-13 13:24:26 +12:00
Christopher Joe a7ca510bf5 Add Bootstrap4 classes to tabs 2016-09-12 18:45:08 +12:00
Loz Calver dbf7824367 FIX: SiteTreeURLSegmentField.ss in wrong location (fixes #1607) 2016-09-09 09:57:33 +01:00
Damian Mooyman a87a857a6e
Upgrade code for framework namespaces 
Remove @package / @subpackage
Fix inifinite loop in VirtualPage_Controller
 2016-09-07 16:29:26 +12:00
Ingo Schommer b599095a50 API Remove AssetAdmin (moved to asset-admin module) 2016-08-31 23:15:12 +12:00
Damian Mooyman 041d12129a
Fix regressions from namespacing 
Update template locations
Add permission codes to cms sections
Code, phpdoc, and typehint cleanup
Split batch actions into files
 2016-08-16 11:56:34 +12:00
Damian Mooyman 90aff08df7 API remove obsolete template 2016-08-12 11:00:49 +12:00
Damian Mooyman cb946508cf Move CMS classes and templates to namespaced locations 2016-08-10 16:09:23 +12:00
Paul Clarke 84e946a035 History panel tidy up styles 2016-07-29 10:21:30 +12:00
Paul Clarke 1c2228f508 Template reorder and adjust step styles 2016-07-28 10:24:06 +12:00
Damian Mooyman ff07a2e264 API Convert CMS forms to bootstrap 
API Update to cms-forms theme

This commit is required by and depends on https://github.com/silverstripe/silverstripe-framework/pull/5826 in framework.
 2016-07-25 17:25:22 +12:00
Daniel Hensby dc8d4ffe0b API Refactor usages of HTMLText -> HTMLFragment 
API Revert hack in VirtualPage
API Respect default_cast
 2016-07-13 18:48:46 +12:00
Damian Mooyman 59d4b51d8e BUG Fix missing tabs layout in pages view 2016-07-06 16:56:30 +12:00
Paul Clarke f4e080e046 Converted all south toolbars to use new toolbar component styles, content and preview styles for scrollbars adjusted where required 2016-05-24 12:28:38 +12:00
Paul Clarke 11192b0207 Swap out .Actions class for bootstrap .btn-toolbar 2016-05-24 12:28:38 +12:00
Damian Mooyman 90397c945d
BUG fix missing install image 
Fixes https://github.com/silverstripe/silverstripe-framework/issues/5528
 2016-05-20 17:22:11 +12:00
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
David Craig 85fb080319 Fix font-icon regression on tree view 2016-04-22 10:44:40 +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 2734f1a18e Merge remote-tracking branch 'origin/3.3' into 3 2016-02-24 17:35:46 +13:00
scott1702 459ba5676c Add no-text class to search icon 2016-02-04 10:40:11 +13:00
Damian Mooyman 0a2456e71e Merge remote-tracking branch 'origin/3' 2016-01-25 16:16:53 +13:00
Damian Mooyman 19c24bb2df Merge remote-tracking branch 'origin/3.3' into 3 2016-01-25 15:58:35 +13:00
Damian Mooyman f80467a748 BUG Don't keep stale treeview data when refreshing Content area 
Fixes https://github.com/silverstripe/silverstripe-framework/issues/4945
 2016-01-22 16:56:18 +13:00
Damian Mooyman abc5556520 BUG Fix legacy breadcrumbs appearing on page save 
Fixes #1358
 2016-01-20 15:29:51 +13:00
Damian Mooyman 7dfe145412 Merge remote-tracking branch 'origin/3' 
# Conflicts:
#	code/controllers/CMSFileAddController.php
#	code/controllers/CMSPageAddController.php
#	code/controllers/CMSPageHistoryController.php
#	code/controllers/CMSSiteTreeFilter.php
#	code/controllers/ContentController.php
#	code/controllers/LeftAndMainPageIconsExtension.php
#	code/controllers/SilverStripeNavigator.php
#	code/model/SiteTreeFileExtension.php
#	code/model/VirtualPage.php
#	composer.json
#	tests/model/ErrorPageTest.yml
#	tests/model/FileLinkTrackingTest.yml
#	tests/model/VirtualPageTest.yml
 2016-01-20 13:16:43 +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
Damian Mooyman 18e368448a Merge remote-tracking branch 'origin/3' 
Conflicts:
	code/controllers/AssetAdmin.php
	code/controllers/CMSMain.php
	code/controllers/CMSSiteTreeFilter.php
	code/controllers/LeftAndMainPageIconsExtension.php
	code/controllers/ModelAsController.php
	code/controllers/SilverStripeNavigator.php
	code/model/ErrorPage.php
	code/model/SiteTreeFileExtension.php
 2015-11-03 14:23:04 +13:00
scott1702 6dc3fc1f26 Update asset admin toolbar 2015-10-30 10:05:51 +13:00
Patrick Nelson 332e490147 FIX (partial) for #1288 where non-submit buttons are being activated on "enter" key press (relates to framework issue at https://github.com/silverstripe/silverstripe-framework/issues/3181). 2015-10-06 15:08:29 -04:00
David Craig 1ea22c766c Move UI to main assets area 2015-09-29 09:35:28 +13:00
Loz Calver 2a7a5ac9fc Merge pull request #1268 from scott1702/font-icons 
Update font icons to use new library
 2015-08-28 10:31:18 +01:00
scott1702 c028278957 Update font icons to use new library 2015-08-25 15:08:09 +12:00
scott1702 4f05c4c4f8 Update the filtered tree styling 2015-08-25 13:02:20 +12:00
scott1702 b976dc8f78 Update button styles 2015-07-07 14:46:27 +12:00
David Craig 41ce038c8f Add three column layout to Page content view 
- Content filters included in SiteTree view
 - View (tree/list) buttons included in SiteTree view
 - Update view button styles for new layout
 - Updated breadcrumbs for new layout
 2015-07-02 10:23:37 +12:00
David Craig cc3385b9f8 Move filters from panel to header 
- The filters panel has been removed in favour of a search panel in the header
- Multi-select updated
  - Renamed to Bulk actions
  - Styles updated
  - Added placeholder text / removed redundant option
  - Now appears in SiteTree view too
 2015-06-24 09:58:48 +12:00
Damian Mooyman 8de0106fea Merge remote-tracking branch 'origin/3.1' into 3.2 2015-06-19 10:35:00 +12:00
scott1702 bf25dd9492 Increase click-size of multi-selection button 2015-06-17 22:12:00 +12:00
Damian Mooyman c5e0c8f007 API Enable tree filter highlighting 
Decoupling of CMS / Framework
 2015-05-04 17:05:35 +12:00
Damian Mooyman cf4d9edafb Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	code/model/SiteConfig.php
	javascript/CMSMain.AddForm.js
	tests/model/SiteConfigTest.php
	tests/model/SiteTreeTest.php
 2015-03-31 19:54:43 +13:00
Damian Mooyman 3df41e1176 BUG Fix SiteTree / SiteConfig permissions 2015-03-19 15:29:38 +13:00
Will Rossiter 18d6c538a7 API: Extract siteconfig out to an external module. 2014-08-09 17:29:50 +12:00
Ingo Schommer 0b296b3665 Merge remote-tracking branch 'origin/3.1' 2014-06-15 22:50:35 +12:00
Rodney Way e5579511d4 Ensure ajax call includes query parameters so that SitreeFilters function as expected. Required for subtree branch loading. 2014-06-10 15:01:12 +10:00
micmania1 f46b6bde51 Added getBreadcrumbItems to SiteTree 2014-05-08 03:21:40 +01:00
Ingo Schommer 9ca336bea3 Merge remote-tracking branch 'origin/3.1' 2013-12-02 20:44:57 +01:00
Ingo Schommer bd5f631af6 Reload "Settings" form on save (fixes #895) 
Regression from 920da0d120
 2013-12-02 16:38:46 +01: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
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 9b15c8c16d Merge pull request #842 from ARNHOE/3.1-siteconfigfix 
FIX SiteConfig scrollbars visible
 2013-08-29 04:52:31 -07:00
Arno Poot 9ba92a7bc5 FIX SiteConfig scrollbars visible 2013-08-28 20:54:06 +02: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
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 26bca388e8 Revert "Updated siteconfig layout to be more like modeladmin" 
This reverts commit afd9f28279.
See https://github.com/silverstripe/silverstripe-cms/issues/830
 2013-08-20 15:20: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
Ingo Schommer d18bb858e3 Fixed share instructions wording in template 
This also removed all the existing translations from Transifex
because the string changed.
 2013-08-09 14:45:26 +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 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
Arno Poot afd9f28279 Updated siteconfig layout to be more like modeladmin 2013-07-26 17:45:28 +02:00
Arno Poot 184aeabcb4 Updated templates to be more consistent and removed trailing spaces 
Edit
 2013-07-18 13:14:29 +02:00
Andrew Short 27de4367b8 Merge branch '3.1' 2013-07-10 20:07:33 +10:00
Ingo Schommer 9417092040 Fixed installer message escaping, unified usage (fixes #2211) 
Same entity was already fixed in a different file,
we can't have them use different strings, so used the new one instead.
 2013-07-10 10:29:04 +02:00
Ingo Schommer a29ce594a1 Merge remote-tracking branch 'origin/3.1' 2013-06-19 11:17:57 +02:00
Naomi Guyer 9dfc0b0e76 Add generic notice class to filter panels 
* Added cms-notice class to filter panels for easier reuse of styles
 2013-06-04 12:05:11 +12:00
Ingo Schommer c21c9cba0d Merge remote-tracking branch 'origin/3.1' 2013-05-31 18:10:26 +02:00
Will Rossiter 2567cda0b4 Use $MenuTitle for Breadcrumbs (Fixes #743) 2013-05-16 20:11:22 +12:00
Ingo Schommer 7ecf56490a FIX URL concat in tree actions (broke with 'translatable' module) 2013-05-08 09:38:25 +02: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 1bad0742fb Merge pull request #300 from chillu/pulls/show-children-as-list 
NEW "Show children as list" tree context action
 2013-03-18 04:13:09 -07:00
jean 59e66f39b7 FIX Ticket #8318 Append the HTML used for expanding/collapsing the site tree column in template instead of creating it on the fly with js 2013-03-18 08:57:13 +13:00
Andrew Short 18f4f68101 Merge branch '3.1' 2013-03-15 21:59:52 +11:00
Ingo Schommer 1e1049b5c8 NEW "Show children as list" tree context action 
Allows for easier navigation between tree and list,
particularly if a node has many children nodes
(since it doesn't require expanding that node).

Uses a new 'ss-tabs-force-active' class on the tabset
to enforce the correct view state. This also fixes an issue
where you couldn't link to a list view directly via URL.
 2013-03-14 17:31:36 +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 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 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