From 1c5dae97485292d8ee5f55c03c99e6ffe882a83a Mon Sep 17 00:00:00 2001 From: Andrew Short Date: Mon, 11 Jun 2012 21:24:58 +1000 Subject: [PATCH] MINOR: Always include tree CSS so tree icons are consistently styled. --- code/controllers/CMSMain.php | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php index 05a3e7ff..737b14cf 100644 --- a/code/controllers/CMSMain.php +++ b/code/controllers/CMSMain.php @@ -57,6 +57,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr parent::init(); Requirements::css(CMS_DIR . '/css/screen.css'); + Requirements::customCSS($this->generateTreeStylingCSS()); Requirements::combine_files( 'cmsmain.js', @@ -218,21 +219,10 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr * Return the entire site tree as a nested set of ULs */ public function SiteTreeAsUL() { - $html = ''; - - // Include custom CSS for tree icons inline, as the tree might be loaded - // via Ajax, in which case we can't inject it into the HTML header easily through the HTTP response. - $css = $this->generateTreeStylingCSS(); - if($this->request->isAjax()) { - $html .= "\n"; - } else { - Requirements::customCSS($css); - } - // Pre-cache sitetree version numbers for querying efficiency Versioned::prepopulate_versionnumber_cache("SiteTree", "Stage"); Versioned::prepopulate_versionnumber_cache("SiteTree", "Live"); - $html .= $this->getSiteTreeFor($this->stat('tree_class')); + $html = $this->getSiteTreeFor($this->stat('tree_class')); $this->extend('updateSiteTreeAsUL', $html);