Skip to content
Snippets Groups Projects
Commit 97b97783 authored by Georg Ringer's avatar Georg Ringer
Browse files

[BUGFIX] Include CSS of AdminPanel only if shown

Include the CSS file only if the AdminPanel is rendered

Change-Id: If194cd8d36c34cc60a39924e5d021d7211808c82
Resolves: #68591
Releases: master
Reviewed-on: https://review.typo3.org/44726


Reviewed-by: default avatarAnja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: default avatarAnja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: default avatarJosef Glatz <josef.glatz@typo3.org>
Reviewed-by: default avatarMartin Kutschker <martin.kutschker@ymail.com>
Tested-by: default avatarMartin Kutschker <martin.kutschker@ymail.com>
Tested-by: default avatarGianluigi Martino <gmartino27@gmail.com>
Reviewed-by: default avatarWouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: default avatarGeorg Ringer <georg.ringer@gmail.com>
Tested-by: default avatarGeorg Ringer <georg.ringer@gmail.com>
parent 37122190
Branches
Tags
No related merge requests found
......@@ -335,7 +335,9 @@ class AdminPanelView
TSFEtypo3FormFieldSet(theField, evallist, is_in, checkbox, checkboxValue);
}') . '/*]]>*/</script><script language="javascript" type="text/javascript">' . $this->extJSCODE . '</script>';
}
$cssPath = htmlspecialchars($this->getTypoScriptFrontendController()->absRefPrefix . ExtensionManagementUtility::siteRelPath('t3skin')) . 'stylesheets/standalone/admin_panel.css';
$out .= '<script src="' . GeneralUtility::locationHeaderUrl('typo3/sysext/frontend/Resources/Public/JavaScript/AdminPanel.js') . '" type="text/javascript"></script><script type="text/javascript">/*<![CDATA[*/' . 'typo3AdminPanel = new TYPO3AdminPanel();typo3AdminPanel.init("typo3-adminPanel-header", "TSFE_ADMIN_PANEL_FORM");' . '/*]]>*/</script>
<link type="text/css" rel="stylesheet" href="' . $cssPath . '" media="all" />
<!--
TYPO3 admin panel end
-->
......
......@@ -36,5 +36,4 @@ if (TYPO3_MODE === 'BE' || TYPO3_MODE === 'FE' && isset($GLOBALS['BE_USER'])) {
// extJS theme
$GLOBALS['TBE_STYLES']['extJS']['theme'] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('t3skin') . 'extjs/xtheme-t3skin.css';
$GLOBALS['TBE_STYLES']['stylesheets']['admPanel'] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath('t3skin') . 'stylesheets/standalone/admin_panel.css';
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment