renamed t3lib_PageRenderer and the templates for backend/frontend

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@5913 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index 238b4f8..de47e4c 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2009-09-09  Steffen Kamper  <info@sk-typo3.de>
 
+       * renamed t3lib_PageRenderer and the templates for backend/frontend
        * Fixed bug #11908: Wrong labels in Media section in constants of css_styled_content
 
 2009-09-07  Francois Suter  <francois@typo3.org>

diff --git a/t3lib/class.t3lib_pagerenderer.php b/t3lib/class.t3lib_pagerenderer.php
index c097391..79174b1 100644 (file)
--- a/t3lib/class.t3lib_pagerenderer.php
+++ b/t3lib/class.t3lib_pagerenderer.php
@@ -34,7 +34,7 @@
  * @subpackage t3lib\r
  * $Id:$\r
  */\r
-abstract class t3lib_pageRenderer implements t3lib_Singleton {\r
+abstract class t3lib_PageRenderer implements t3lib_Singleton {\r
        \r
        protected $compressJavascript = FALSE;\r
        protected $compressCss = FALSE;\r
@@ -148,7 +148,7 @@ abstract class t3lib_pageRenderer implements t3lib_Singleton {
         * @return void\r
         */\r
        protected function reset() {\r
-               $this->templateFile = TYPO3_mainDir . 'templates/page_be.html';\r
+               $this->templateFile = TYPO3_mainDir . 'templates/template_page_backend.html';\r
                $this->jsFiles = array ();\r
                $this->jsFooterFiles = array ();\r
                $this->jsInline = array ();\r
@@ -1266,7 +1266,7 @@ abstract class t3lib_pageRenderer implements t3lib_Singleton {
 \r
 }\r
 \r
-if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_pagerender.php']) {\r
-       include_once ($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_pagerender.php']);\r
+if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_pagerenderer.php']) {\r
+       include_once ($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_pagerenderer.php']);\r
 }\r
 ?>
\ No newline at end of file

diff --git a/tests/t3lib/t3lib_pagerenderer_testcase.php b/tests/t3lib/t3lib_pagerenderer_testcase.php
index 80b3527..0691001 100644 (file)
--- a/tests/t3lib/t3lib_pagerenderer_testcase.php
+++ b/tests/t3lib/t3lib_pagerenderer_testcase.php
@@ -31,7 +31,7 @@
  *\r
  * @author Steffen Kamper (info@sk-typo3.de)\r
  */\r
-class t3lib_pageRenderer_testcase extends tx_phpunit_testcase {\r
+class t3lib_PageRenderer_testcase extends tx_phpunit_testcase {\r
        /**\r
         * @var t3lib_pageIncludes\r
         */\r
@@ -42,9 +42,9 @@ class t3lib_pageRenderer_testcase extends tx_phpunit_testcase {
        const PART_FOOTER = 2;\r
 \r
        public function setUp() {\r
-               $className = 't3lib_pageRenderer_' . uniqid('test');\r
+               $className = 't3lib_PageRenderer_' . uniqid('test');\r
                eval('\r
-                       class ' . $className . ' extends t3lib_pageRenderer {\r
+                       class ' . $className . ' extends t3lib_PageRenderer {\r
                        }\r
                ');\r
                $this->fixture = new $className();\r
@@ -66,7 +66,7 @@ class t3lib_pageRenderer_testcase extends tx_phpunit_testcase {
         */\r
        public function fixtureCanBeCreated() {\r
                $this->assertTrue(\r
-                       $this->fixture instanceof t3lib_pageRenderer\r
+                       $this->fixture instanceof t3lib_PageRenderer\r
                );\r
        }\r
        \r

diff --git a/typo3/sysext/cms/tslib/class.tslib_fe.php b/typo3/sysext/cms/tslib/class.tslib_fe.php
index f599f4f..5aedc07 100644 (file)
--- a/typo3/sysext/cms/tslib/class.tslib_fe.php
+++ b/typo3/sysext/cms/tslib/class.tslib_fe.php
@@ -190,7 +190,7 @@
  * @package TYPO3
  * @subpackage tslib
  */
- class tslib_fe extends t3lib_pageRenderer {
+ class tslib_fe extends t3lib_PageRenderer {
 
                // CURRENT PAGE:
        var $id='';                                                     // The page id (int)
@@ -457,7 +457,7 @@
                }
 
                $this->initCaches();
-               parent::__construct(TYPO3_mainDir . 'templates/page_fe.html');
+               parent::__construct(PATH_tslib . 'templates/tslib_page_frontend.html');
        }
 
        /**

diff --git a/typo3/sysext/cms/tslib/templates/tslib_page_frontend.html b/typo3/sysext/cms/tslib/templates/tslib_page_frontend.html
new file mode 100644 (file)
index 0000000..11fb8a6
--- /dev/null
+++ b/typo3/sysext/cms/tslib/templates/tslib_page_frontend.html
@@ -0,0 +1,28 @@
+###XMLPROLOG_DOCTYPE###\r
+###HTMLTAG###\r
+###HEADTAG###\r
+\r
+###METACHARSET###\r
+###INLINECOMMENT###\r
+\r
+###BASEURL###\r
+###SHORTCUT###\r
+###TITLE###\r
+###META###\r
+\r
+###CSS_INCLUDE###\r
+###CSS_INLINE###\r
+\r
+###JS_LIBS###\r
+###JS_INCLUDE###\r
+###JS_INLINE###\r
+\r
+###HEADERDATA###\r
+</head>\r
+###BODY###\r
+###JS_LIBS_FOOTER###\r
+###JS_INCLUDE_FOOTER###\r
+###JS_INLINE_FOOTER###\r
+###FOOTERDATA###\r
+</body>\r
+</html>\r

diff --git a/typo3/template.php b/typo3/template.php
index 702ee4d..3f9b00b 100644 (file)
--- a/typo3/template.php
+++ b/typo3/template.php
@@ -156,7 +156,7 @@ function fw($str)   {
  * @package TYPO3
  * @subpackage core
  */
-class template extends t3lib_pageRenderer {
+class template extends t3lib_PageRenderer {
 
                // Vars you typically might want to/should set from outside after making instance of this class:
        var $backPath = '';                             // 'backPath' pointing back to the PATH_typo3
@@ -222,7 +222,7 @@ class template extends t3lib_pageRenderer {
         */
        function template()     {
                global $TBE_STYLES;
-               parent::__construct(TYPO3_mainDir . 'templates/page_be.html');
+               parent::__construct(TYPO3_mainDir . 'templates/template_page_backend.html');
 
                        // Setting default scriptID:
                if (($temp_M = (string) t3lib_div::_GET('M')) && $GLOBALS['TBE_MODULES']['_PATHS'][$temp_M]) {

diff --git a/typo3/templates/page_be.html b/typo3/templates/page_be.html
deleted file mode 100644 (file)
index 0eb619e..0000000
--- a/typo3/templates/page_be.html
+++ /dev/null
@@ -1,29 +0,0 @@
-###XMLPROLOG_DOCTYPE###\r
-###HTMLTAG###\r
-###HEADTAG###\r
-\r
-###METACHARSET###\r
-###INLINECOMMENT###\r
-\r
-###BASEURL###\r
-###SHORTCUT###\r
-###TITLE###\r
-###META###\r
-\r
-###CSS_INCLUDE###\r
-###CSS_INLINE###\r
-\r
-###JS_LIBS###\r
-###JS_INCLUDE###\r
-###JS_INLINE###\r
-\r
-###HEADERDATA###\r
-<!--###POSTJSMARKER###-->\r
-</head>\r
-###BODY###\r
-###JS_LIBS_FOOTER###\r
-###JS_INCLUDE_FOOTER###\r
-###JS_INLINE_FOOTER###\r
-###FOOTERDATA###\r
-</body>\r
-</html>\r

diff --git a/typo3/templates/page_fe.html b/typo3/templates/page_fe.html
deleted file mode 100644 (file)
index 11fb8a6..0000000
--- a/typo3/templates/page_fe.html
+++ /dev/null
@@ -1,28 +0,0 @@
-###XMLPROLOG_DOCTYPE###\r
-###HTMLTAG###\r
-###HEADTAG###\r
-\r
-###METACHARSET###\r
-###INLINECOMMENT###\r
-\r
-###BASEURL###\r
-###SHORTCUT###\r
-###TITLE###\r
-###META###\r
-\r
-###CSS_INCLUDE###\r
-###CSS_INLINE###\r
-\r
-###JS_LIBS###\r
-###JS_INCLUDE###\r
-###JS_INLINE###\r
-\r
-###HEADERDATA###\r
-</head>\r
-###BODY###\r
-###JS_LIBS_FOOTER###\r
-###JS_INCLUDE_FOOTER###\r
-###JS_INLINE_FOOTER###\r
-###FOOTERDATA###\r
-</body>\r
-</html>\r

diff --git a/typo3/templates/template_page_backend.html b/typo3/templates/template_page_backend.html
new file mode 100644 (file)
index 0000000..0eb619e
--- /dev/null
+++ b/typo3/templates/template_page_backend.html
@@ -0,0 +1,29 @@
+###XMLPROLOG_DOCTYPE###\r
+###HTMLTAG###\r
+###HEADTAG###\r
+\r
+###METACHARSET###\r
+###INLINECOMMENT###\r
+\r
+###BASEURL###\r
+###SHORTCUT###\r
+###TITLE###\r
+###META###\r
+\r
+###CSS_INCLUDE###\r
+###CSS_INLINE###\r
+\r
+###JS_LIBS###\r
+###JS_INCLUDE###\r
+###JS_INLINE###\r
+\r
+###HEADERDATA###\r
+<!--###POSTJSMARKER###-->\r
+</head>\r
+###BODY###\r
+###JS_LIBS_FOOTER###\r
+###JS_INCLUDE_FOOTER###\r
+###JS_INLINE_FOOTER###\r
+###FOOTERDATA###\r
+</body>\r
+</html>\r