From 4bdffb110bb0ec8a6b9a95c93065eec9cebc7bbe Mon Sep 17 00:00:00 2001
From: Benni Mack <benni@typo3.org>
Date: Mon, 11 Jan 2016 16:42:21 +0100
Subject: [PATCH] [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: Susanne Moog <typo3@susannemoog.de>
Tested-by: Susanne Moog <typo3@susannemoog.de>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
---
.../core/Classes/Messaging/ErrorpageMessage.php | 16 +++++++++++++++-
.../Resources/Private/Templates/Page/Error.html} | 4 ++--
.../Resources/Public/Css}/errorpage-message.css | 0
3 files changed, 17 insertions(+), 3 deletions(-)
rename typo3/sysext/{t3skin/templates/errorpage-message.html => core/Resources/Private/Templates/Page/Error.html} (86%)
rename typo3/sysext/{t3skin/stylesheets/standalone => core/Resources/Public/Css}/errorpage-message.css (100%)
diff --git a/typo3/sysext/core/Classes/Messaging/ErrorpageMessage.php b/typo3/sysext/core/Classes/Messaging/ErrorpageMessage.php
index 57c325eb4d45..06da9decd607 100644
--- a/typo3/sysext/core/Classes/Messaging/ErrorpageMessage.php
+++ b/typo3/sysext/core/Classes/Messaging/ErrorpageMessage.php
@@ -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;
+ }
+
}
diff --git a/typo3/sysext/t3skin/templates/errorpage-message.html b/typo3/sysext/core/Resources/Private/Templates/Page/Error.html
similarity index 86%
rename from typo3/sysext/t3skin/templates/errorpage-message.html
rename to typo3/sysext/core/Resources/Private/Templates/Page/Error.html
index 5e8ff1c8eec7..3232b903b099 100644
--- a/typo3/sysext/t3skin/templates/errorpage-message.html
+++ b/typo3/sysext/core/Resources/Private/Templates/Page/Error.html
@@ -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">
diff --git a/typo3/sysext/t3skin/stylesheets/standalone/errorpage-message.css b/typo3/sysext/core/Resources/Public/Css/errorpage-message.css
similarity index 100%
rename from typo3/sysext/t3skin/stylesheets/standalone/errorpage-message.css
rename to typo3/sysext/core/Resources/Public/Css/errorpage-message.css
--
GitLab