tonyair
/
silverstripe-cms
mirror of https://github.com/silverstripe/silverstripe-cms
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2035 from oilee80/issue-2034/page-data-icons 

Issue-2034: Fix for Page icons using data urls
This commit is contained in:
Daniel Hensby 2017-11-23 16:54:39 +00:00 committed by GitHub
parent a92c03c464 d3fa8946be
commit 35a4f609d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
code/Controllers/LeftAndMainPageIconsExtension.php
View File

@ -29,22 +29,15 @@ class LeftAndMainPageIconsExtension extends Extension
public function generatePageIconsCss()
{
$css = '';
$classes = ClassInfo::subclassesFor(SiteTree::class);
foreach ($classes as $class) {
$icon = Config::inst()->get($class, 'icon');
if (!$icon) {
continue;
}
$cssClass = Convert::raw2htmlid($class);
$selector = ".page-icon.class-$cssClass, li.class-$cssClass > a .jstree-pageicon";
$iconURL = SiteTree::singleton($class)->getPageIconURL();
if ($iconURL) {
$css .= "$selector { background: transparent url('$iconURL') 0 0 no-repeat; }\n";
$cssClass = Convert::raw2htmlid($class);
$selector = sprintf('.page-icon.class-%1$s, li.class-%1$s > a .jstree-pageicon', $cssClass);
$css .= sprintf('%s { background: transparent url(\'%s\') 0 0 no-repeat; }', $selector, $iconURL);
}
}
return $css;
}
}

3
code/Model/SiteTree.php
View File

@ -2854,6 +2854,9 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
if (!$icon) {
return null;
}
if (strpos($icon, 'data:image/') !== false) {
return $icon;
}
// Icon is relative resource
$iconResource = ModuleResourceLoader::singleton()->resolveResource($icon);