tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-06-26 14:39:27 +02:00
Code Issues Projects Releases Wiki Activity
4,656 Commits 30 Branches 398 Tags 25 MiB
7dfe145412
Commit Graph

58 Commits

Author SHA1 Message Date
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
scott1702
e4ccd2d4bc move allowed extensions into a sidebar 2015-11-05 19:33:58 +13:00
scott1702
6dc3fc1f26 Update asset admin toolbar 2015-10-30 10:05:51 +13:00
scott1702
c028278957 Update font icons to use new library 2015-08-25 15:08:09 +12:00
Daniel Hensby
39ee2ec634 Merge branch '3.2' into 3 
Conflicts:
	lang/en.yml
 2015-08-17 14:23:16 +01:00
Jonathon Menz
7041a43684 Moved image thumbnail style rules to Framework 
for consistent styling of image thumbnails in GridFields
 2015-07-30 16:15:35 -07: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
scott1702
2ad395ed37 Add drag/drop icons to smaller site tree 2015-06-17 10:24:27 +12:00
Ingo Schommer
286dfe4d86 Fixed duplicate CSS scoping in AssetAdmin.scss 2014-10-16 10:36:31 +13:00
Ingo Schommer
4bc942df76 Merge pull request #761 from jonom/patch-1 
FIX #527 : Add Thumbnails to 'Choose another file' dialogue
 2013-06-11 00:01:00 -07:00
Ingo Schommer
b7b2839df7 Don't show "edit tree" in list view (fixes #627) 2013-06-03 14:11:01 +02:00
jonom
97489b6b18 Allow asset admin styles to be used in 'Choose another file' dialogue of UploadField 
I've added thumbnails to the 'Choose another file' dialogue, this style change allows for that gridfield to be styled the same way with compact rows
 2013-05-31 18:12:19 -05: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
uniun
e8f7f3db7f Make message always visible at the top of the page 
Make message always visible at the top of the page like the message in CMS preview iframe.
 2013-03-18 16:29:10 +02: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
Ingo Schommer
0dd6dedab2 Moving "edit tree" button next to "add new" (fixes #8119) 2013-01-16 00:19:56 +01:00
Ingo Schommer
58d316e985 Moving "edit tree" button next to "add new" (fixes #8119) 2012-12-17 15:35:52 +01:00
Ingo Schommer
a52514a306 ENHANCEMENT Tab style consolidation and design consistency 2012-11-06 22:24:01 +01:00
Ingo Schommer
abba77af51 Fixes required for jQuery UI 1.9 2012-11-06 15:54:37 +01:00
Sam Minnée
149de5e703 Merge pull request #182 from ryanwachtl/url-segment-loading-indicator 
BUG Visual cue that URLSegment is updating
 2012-08-27 21:11:59 -07:00
Ingo Schommer
cd8c3a0245 NEW Re-added SilverStripeNavigator styling 2012-08-27 11:53:57 +02:00
Ryan Wachtl
5f9362e742 BUG Visual cue that URLSegment is updating 
Added a loading class on .field.urlsegment to indicate that the URLSegment is updating its value, set before and after self.suggest().
 2012-08-17 03:05:39 -05:00
Ingo Schommer
e486a16a8f "Edit tree" button alignment 
Happens to work for the width of the english label,
but breaks on any other language with longer labels.
Don't make the button absolutely positioned.
Partially reverts 1e25637a.
 2012-08-12 23:20:26 +02:00
Hamish Friedlander
1717e400f6 Always show badge on current page in side tree 2012-07-23 22:16:39 +12: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
Ingo Schommer
01201f04bb MINOR Resetting margin on URLSegment help text (changed due to new .help default styling in core) 2012-06-13 13:16:15 +02:00
Andrew Short
acc6115154 MINOR: Removed extra margin from tools add page button. 2012-06-13 17:49:04 +10:00
Ingo Schommer
bda7272761 ENHANCEMENT Show node badges in tree sidebar view on hover (fixes #7410) 2012-06-12 19:35:17 +02:00
Sean Harvey
a7626829f6 MINOR AssetAdmin tweaks to folder/file thumbnail columns to be tidier 2012-05-18 14:39:26 +12:00
Ryan Wachtl
f56126470d ENHANCEMENT Update URLSegment from Title (closes #6981) 2012-05-12 23:55:26 -05:00
Robert Curry
28a1d0d4e7 BUGFIX: Change styles on tabs to new format. 2012-05-11 11:31:40 +12: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
Ryan Wachtl
bd94c6f336 Trac 6981: Opt-in URL Updating 2012-05-09 19:01:57 -05:00
Ingo Schommer
3f57aa01c9 Merge pull request #111 from silverstripe-big-o/Trac-7222-change-gallery-icon 
ENHANCEMENT:changed gallery icon to an edit icon for assetAdmin
 2012-05-02 04:34:54 -07:00
Jeremy Bridson
a895d0bbe5 ENHANCEMENT:changed gallery icon to an edit icon for assetAdmin 2012-05-02 11:47:31 +12:00
Jeremy Bridson
4faf02e6cc ENHANCEMENT:added folder icons to assetAdmin tree view 2012-04-26 12:30:32 +12:00
Jeremy Bridson
1e25637acb ENHANCEMENT:Trac#7166 - styled the new combined tree and edit view. 2012-04-18 13:36:15 +12: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
Simon Welsh
c4e018928e API-CHANGE sapphire folder can now be renamed. 2012-04-15 10:56:40 +12:00
jbridson
9bb3104253 BUGFIX:fixed padding issues with navigation tabs on Asset Admin 2012-03-27 14:57:39 +02:00
jbridson
ddcf979fb5 BUGFIX:Trac Ticket #7015 - removed unnecessary scrollbars from files and images filter and increased height of search field to accommodate the dropdown. 2012-03-27 14:57:39 +02:00
jbridson
bdb832ef4a BUGFIX:SSF-30 - Fixed dropdown cutoff in all browsers. 2012-03-27 14:57:39 +02:00
jbridson
a5e9a3d350 BUGFIX:SSF-106 - fixed overflow issues on asset admin 2012-03-13 10:52:30 +13:00
jbridson
83aae46236 BUGFIX:SSF-30 - moved tabs SCSS from _style.scss to AssetAdmin.scss 2012-03-08 09:05:14 +13:00
jbridson
590027cfe3 ENHANCEMENT:SSF-30 - changed color of add folder button. 2012-03-07 17:33:29 +13:00
jbridson
12c01d45de MINOR:SSF-106 - added padding to the tfoot of the asset admin datagrid (for the styling of pagination) 2012-03-06 15:00:36 +13:00
Ingo Schommer
75694726d9 MINOR Removed duplicate AssetAdmin.scss file 2012-03-02 15:22:38 +01:00