tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1250 from jonom/choose-file-thumbnails-3.2

Browse Source 
Moved image thumbnail style rules to Framework
This commit is contained in:
Damian Mooyman 2015-08-03 08:40:21 +12:00
commit e45ef93aa7
3 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/controllers/AssetAdmin.php
View File

@ -176,13 +176,12 @@ JS
$columns = $gridField->getConfig()->getComponentByType('GridFieldDataColumns');
$columns->setDisplayFields(array(
'StripThumbnail' => '',
// 'Parent.FileName' => 'Folder',
'Title' => _t('File.Name'),
'Title' => _t('File.Title', 'Title'),
'Created' => _t('AssetAdmin.CREATED', 'Date'),
'Size' => _t('AssetAdmin.SIZE', 'Size'),
));
$columns->setFieldCasting(array(
'Created' => 'Date->Nice'
'Created' => 'SS_Datetime->Nice'
));
$gridField->setAttribute(
'data-url-folder-template',

3
css/screen.css
View File

@ -38,9 +38,6 @@
.cms .AssetAdmin .cms-content-toolbar .cms-page-add-button span.btn-icon-add { height: 17px; }
.cms .AssetAdmin .cms-content-toolbar .cms-page-add-button span.ui-button-text { color: #393939; text-shadow: white 0 1px 1px; }
.cms .AssetAdmin #Root_TreeView .cms-tree ul .class-Folder a span.text span.jstree-foldericon { background: url(../images/blue-folder-horizontal.png) no-repeat; width: 16px; height: 16px; float: left; display: block; margin-right: 4px; }
.cms .AssetAdmin table.ss-gridfield-table td { padding-top: 0; padding-bottom: 0; }
.cms .AssetAdmin table.ss-gridfield-table td.bottom-all { padding: 0.7em; }
.cms .AssetAdmin table.ss-gridfield-table td.col-StripThumbnail { padding: 1px 5px; width: 32px; height: 32px; }
.cms .AssetAdmin table.ss-gridfield-table td.col-StripThumbnail img { width: 32px; height: 32px; }
.cms .AssetAdmin table.ss-gridfield-table tr[data-class=Folder] td.col-StripThumbnail { background: transparent url(../images/treeicons/blue-folder-horizontal.png) no-repeat center; }
.cms .AssetAdmin table.ss-gridfield-table tr[data-class=File] td.col-StripThumbnail { background: transparent url(../images/treeicons/blue-document.png) no-repeat center; }

13
scss/_AssetAdmin.scss
View File

@ -39,23 +39,10 @@
table.ss-gridfield-table {
td {
// Taken care of by minimum image sizes
padding-top: 0;
padding-bottom: 0;
&.bottom-all {
padding:0.7em;
}
}
td.col-StripThumbnail {
padding: 1px 5px;
width: 32px;
height: 32px;
img {
width: 32px;
height: 32px;
}
}
tr[data-class=Folder] {
td.col-StripThumbnail {
background: transparent url(../images/treeicons/blue-folder-horizontal.png) no-repeat center;