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

Merge pull request #2364 from sachajudd/pulls/4.4/font-icon-support 

NEW Add font-icon support for site tree
This commit is contained in:
Robbie Averill 2019-01-14 09:06:40 +01:00 committed by GitHub
parent 097d221150 1f1f44969a
commit ba897af221
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/Controllers/CMSPageAddController.php
View File

@ -6,6 +6,7 @@ use SilverStripe\CMS\Model\SiteTree;
use SilverStripe\Control\Controller;
use SilverStripe\Control\Session;
use SilverStripe\Control\HTTPResponse;
use SilverStripe\Core\Config\Config;
use SilverStripe\Core\Convert;
use SilverStripe\Forms\FieldList;
use SilverStripe\Forms\Form;
@ -44,7 +45,8 @@ class CMSPageAddController extends CMSPageEditController
$pageTypes = array();
foreach ($this->PageTypes() as $type) {
$html = sprintf(
'<span class="page-icon class-%s"></span><span class="title">%s</span><span class="form__field-description">%s</span>',
'<span class="page-icon %s class-%s"></span><span class="title">%s</span><span class="form__field-description">%s</span>',
Config::inst()->get($type->getField('ClassName'), 'icon_class'),
Convert::raw2htmlid($type->getField('ClassName')),
$type->getField('AddAction'),
$type->getField('Description')

2
code/Model/RedirectorPage.php
View File

@ -22,6 +22,8 @@ class RedirectorPage extends Page
{
private static $description = 'Redirects to an internal page or an external URL';
private static $icon_class = 'font-icon-p-redirect';
private static $db = array(
"RedirectionType" => "Enum('Internal,External','Internal')",
"ExternalURL" => "Varchar(2083)" // 2083 is the maximum length of a URL in Internet Explorer.

10
code/Model/SiteTree.php
View File

@ -277,6 +277,13 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
*/
private static $icon = null;
/**
* Class attached to page icons in the CMS page tree. Also supports font-icon set.
* @config
* @var string
*/
private static $icon_class = 'font-icon-page';
private static $extensions = [
Hierarchy::class,
Versioned::class,
@ -2747,7 +2754,8 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
$children = $this->creatableChildren();
$flags = $this->getStatusFlags();
$treeTitle = sprintf(
"<span class=\"jstree-pageicon page-icon class-%s\"></span><span class=\"item\" data-allowedchildren=\"%s\">%s</span>",
"<span class=\"jstree-pageicon page-icon %s class-%s\"></span><span class=\"item\" data-allowedchildren=\"%s\">%s</span>",
$this->config()->get('icon') ? '' : $this->config()->get('icon_class'),
Convert::raw2htmlid(static::class),
Convert::raw2att(json_encode($children)),
Convert::raw2xml(str_replace(array("\n","\r"), "", $this->MenuTitle))

2
code/Model/VirtualPage.php
View File

@ -29,6 +29,8 @@ class VirtualPage extends Page
{
private static $description = 'Displays the content of another page';
private static $icon_class = 'font-icon-p-virtual';
public static $virtualFields;
/**