Skip to content
Snippets Groups Projects
Commit 4bdffb11 authored by Benni Mack's avatar Benni Mack Committed by Wouter Wolters
Browse files

[TASK] Move Error page to EXT:core 

The error page resides in t3skin and should be moved
to EXT:core as it is used for backend, frontend etc.

Resolves: #72637
Releases: master
Change-Id: I7fe4b633dba5e382dafa8a0096fe21a586b95ba3
Reviewed-on: https://review.typo3.org/45815


Reviewed-by: default avatarSusanne Moog <typo3@susannemoog.de>
Tested-by: default avatarSusanne Moog <typo3@susannemoog.de>
Reviewed-by: default avatarWouter Wolters <typo3@wouterwolters.nl>
Tested-by: default avatarWouter Wolters <typo3@wouterwolters.nl>
parent 1d0fbc7d
No related merge requests found
Hide whitespace changes
Inline Side-by-side
typo3/sysext/core/Classes/Messaging/ErrorpageMessage.php
+ 15
− 1
View file @ 4bdffb11
......@@ -30,7 +30,21 @@ class ErrorpageMessage extends AbstractStandaloneMessage
*/
public function __construct($message = '', $title = '', $severity = AbstractMessage::ERROR)
{
$this->setHtmlTemplate(ExtensionManagementUtility::siteRelPath('t3skin') . 'templates/errorpage-message.html');
$this->setHtmlTemplate(ExtensionManagementUtility::siteRelPath('core') . 'Resources/Private/Templates/Page/Error.html');
parent::__construct($message, $title, $severity);
}
/**
* Returns the default markers for the template, with some additional parameters for the error page.
*
* @return array
*/
protected function getDefaultMarkers()
{
$defaultMarkers = parent::getDefaultMarkers();
$defaultMarkers['###EXTPATH_CORE###'] = ExtensionManagementUtility::siteRelPath('core');
$defaultMarkers['###EXTPATH_BACKEND###'] = ExtensionManagementUtility::siteRelPath('backend');
return $defaultMarkers;
}
}
typo3/sysext/t3skin/templates/errorpage-message.html → typo3/sysext/core/Resources/Private/Templates/Page/Error.html
+ 2
− 2
View file @ 4bdffb11
......@@ -8,7 +8,7 @@
<base href="###BASEURL###" />
<link rel="stylesheet" href="###TYPO3_mainDir###sysext/t3skin/stylesheets/standalone/errorpage-message.css" />
<link rel="stylesheet" href="###EXTPATH_CORE###Resources/Public/Css/errorpage-message.css" />
</head>
<body class="t3-message-page t3-###CSS_CLASS###page-message">
......@@ -16,7 +16,7 @@
<div class="t3-error-wrap">
<div class="t3-message-page-container">
<div class="t3-message-page-logo">
<img src="###TYPO3_mainDir###sysext/backend/Resources/Public/Images/typo3_orange.svg" class="typo3-error-image" alt="TYPO3 logo">
<img src="###EXTPATH_BACKEND###Resources/Public/Images/typo3_orange.svg" class="typo3-error-image" alt="TYPO3 logo">
</div>
<div class="callout callout-danger">
<div class="media">
......
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