[TASK] Move PageRenderer default html template 71/20471/2
authorFelix Kopp <felix-source@phorax.com>
Fri, 3 May 2013 16:24:54 +0000 (18:24 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Sat, 4 May 2013 15:38:21 +0000 (17:38 +0200)
Moves the default html backend template for PageRenderer
to the corresponding extension EXT: core.

Change-Id: Icc69207bd74de4bc1bc0a7a7be4f8d9aceb0ed80
Fixes: #47892
Releases: 6.2
Reviewed-on: https://review.typo3.org/20471
Reviewed-by: Wouter Wolters
Tested-by: Wouter Wolters
Reviewed-by: Markus Klein
Tested-by: Markus Klein
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
typo3/sysext/backend/Classes/Template/DocumentTemplate.php
typo3/sysext/core/Classes/Page/PageRenderer.php
typo3/sysext/core/Resources/Private/Templates/PageRenderer.html [new file with mode: 0644]
typo3/templates/template_page_backend.html [deleted file]

index 171480d..ad7daf9 100644 (file)
@@ -406,7 +406,6 @@ class DocumentTemplate {
        public function getPageRenderer() {
                if (!isset($this->pageRenderer)) {
                        $this->pageRenderer = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Page\\PageRenderer');
        public function getPageRenderer() {
                if (!isset($this->pageRenderer)) {
                        $this->pageRenderer = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Page\\PageRenderer');
-                       $this->pageRenderer->setTemplateFile(TYPO3_mainDir . 'templates/template_page_backend.html');
                        $this->pageRenderer->setLanguage($GLOBALS['LANG']->lang);
                        $this->pageRenderer->enableConcatenateFiles();
                        $this->pageRenderer->enableCompressCss();
                        $this->pageRenderer->setLanguage($GLOBALS['LANG']->lang);
                        $this->pageRenderer->enableConcatenateFiles();
                        $this->pageRenderer->enableCompressCss();
index 5b2ac64..9635503 100644 (file)
@@ -508,7 +508,7 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface {
         * @return void
         */
        protected function reset() {
         * @return void
         */
        protected function reset() {
-               $this->templateFile = TYPO3_mainDir . 'templates/template_page_backend.html';
+               $this->templateFile = 'EXT:core/Resources/Private/Templates/PageRenderer.html';
                $this->jsFiles = array();
                $this->jsFooterFiles = array();
                $this->jsInline = array();
                $this->jsFiles = array();
                $this->jsFooterFiles = array();
                $this->jsInline = array();
diff --git a/typo3/sysext/core/Resources/Private/Templates/PageRenderer.html b/typo3/sysext/core/Resources/Private/Templates/PageRenderer.html
new file mode 100644 (file)
index 0000000..1a11eb9
--- /dev/null
@@ -0,0 +1,29 @@
+###XMLPROLOG_DOCTYPE###
+###HTMLTAG###
+###HEADTAG###
+
+###METACHARSET###
+###INLINECOMMENT###
+
+###BASEURL###
+###SHORTCUT###
+###TITLE###
+###META###
+
+###CSS_INCLUDE###
+###CSS_INLINE###
+
+###JS_LIBS###
+###JS_INCLUDE###
+###JS_INLINE###
+
+###HEADERDATA###
+<!--###POSTJSMARKER###-->
+</head>
+###BODY###
+###JS_LIBS_FOOTER###
+###JS_INCLUDE_FOOTER###
+###JS_INLINE_FOOTER###
+###FOOTERDATA###
+</body>
+</html>
diff --git a/typo3/templates/template_page_backend.html b/typo3/templates/template_page_backend.html
deleted file mode 100644 (file)
index 1a11eb9..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-###XMLPROLOG_DOCTYPE###
-###HTMLTAG###
-###HEADTAG###
-
-###METACHARSET###
-###INLINECOMMENT###
-
-###BASEURL###
-###SHORTCUT###
-###TITLE###
-###META###
-
-###CSS_INCLUDE###
-###CSS_INLINE###
-
-###JS_LIBS###
-###JS_INCLUDE###
-###JS_INLINE###
-
-###HEADERDATA###
-<!--###POSTJSMARKER###-->
-</head>
-###BODY###
-###JS_LIBS_FOOTER###
-###JS_INCLUDE_FOOTER###
-###JS_INLINE_FOOTER###
-###FOOTERDATA###
-</body>
-</html>