[TASK] Move Views/LogoView to View/LogoView
authorGeorg Ringer <georg.ringer@gmail.com>
Sun, 23 Sep 2012 09:39:45 +0000 (11:39 +0200)
committerHelmut Hummel <helmut.hummel@typo3.org>
Mon, 24 Sep 2012 07:13:19 +0000 (09:13 +0200)
It seems there was a mistake in the automatic
script to move files. Views/LogoView.php should be
View/LogoView.php as all others

Change-Id: I4532133493a1be17752c5363806a29464f406479
Resolves: #41283
Releases: 6.0
Reviewed-on: http://review.typo3.org/14959
Reviewed-by: Philipp Gampe
Tested-by: Philipp Gampe
Reviewed-by: Wouter Wolters
Reviewed-by: Helmut Hummel
Tested-by: Helmut Hummel
typo3/sysext/backend/Classes/Controller/BackendController.php
typo3/sysext/backend/Classes/View/LogoView.php [new file with mode: 0644]
typo3/sysext/backend/Classes/Views/LogoView.php [deleted file]
typo3/sysext/core/Migrations/Code/ClassAliasMap201208221700.php
typo3/sysext/core/Migrations/Code/LegacyClassesForIde.php

index eb91c7f..c404119 100644 (file)
@@ -144,7 +144,7 @@ class BackendController {
        public function render() {
                $this->executeHook('renderPreProcess');
                // Prepare the scaffolding, at this point extension may still add javascript and css
-               $logo = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Views\\LogoView');
+               $logo = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\View\\LogoView');
                $logo->setLogo('gfx/typo3logo_mini.png');
                // Create backend scaffolding
                $backendScaffolding = '
diff --git a/typo3/sysext/backend/Classes/View/LogoView.php b/typo3/sysext/backend/Classes/View/LogoView.php
new file mode 100644 (file)
index 0000000..02e7cf4
--- /dev/null
@@ -0,0 +1,85 @@
+<?php
+namespace TYPO3\CMS\Backend\View;
+
+/***************************************************************
+ *  Copyright notice
+ *
+ *  (c) 2007-2011 Ingo Renner <ingo@typo3.org>
+ *  All rights reserved
+ *
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *  A copy is found in the textfile GPL.txt and important notices to the license
+ *  from the author is found in LICENSE.txt distributed with these scripts.
+ *
+ *
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
+/**
+ * class to render the TYPO3 logo in the backend
+ *
+ * @author Ingo Renner <ingo@typo3.org>
+ * @package TYPO3
+ * @subpackage core
+ */
+class LogoView {
+
+       protected $logo;
+
+       /**
+        * constructor
+        */
+       public function __construct() {
+               $this->logo = NULL;
+       }
+
+       /**
+        * renders the actual logo code
+        *
+        * @return string Logo html code snippet to use in the backend
+        */
+       public function render() {
+               // Default
+               $logoFile = 'gfx/alt_backend_logo.gif';
+               if (is_string($this->logo)) {
+                       // Overwrite
+                       $logoFile = $this->logo;
+               }
+               $imgInfo = getimagesize(PATH_site . TYPO3_mainDir . $logoFile);
+               $logo = '<a href="' . TYPO3_URL_GENERAL . '" target="_blank">' . '<img' . \TYPO3\CMS\Backend\Utility\IconUtility::skinImg('', $logoFile, $imgInfo[3]) . ' title="TYPO3 Content Management System" alt="" />' . '</a>';
+               // Overwrite with custom logo
+               if ($GLOBALS['TBE_STYLES']['logo']) {
+                       $imgInfo = @getimagesize(\TYPO3\CMS\Core\Utility\GeneralUtility::resolveBackPath((PATH_typo3 . $GLOBALS['TBE_STYLES']['logo']), 3));
+                       $logo = '<a href="' . TYPO3_URL_GENERAL . '" target="_blank">' . '<img src="' . $GLOBALS['TBE_STYLES']['logo'] . '" ' . $imgInfo[3] . ' title="TYPO3 Content Management System" alt="" />' . '</a>';
+               }
+               return $logo;
+       }
+
+       /**
+        * Sets the logo
+        *
+        * @param string $logo Path to logo file as seen from typo3/
+        * @throws \InvalidArgumentException
+        */
+       public function setLogo($logo) {
+               if (!is_string($logo)) {
+                       throw new \InvalidArgumentException('parameter $logo must be of type string', 1194041104);
+               }
+               $this->logo = $logo;
+       }
+
+}
+
+
+?>
\ No newline at end of file
diff --git a/typo3/sysext/backend/Classes/Views/LogoView.php b/typo3/sysext/backend/Classes/Views/LogoView.php
deleted file mode 100644 (file)
index 7b49a01..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-namespace TYPO3\CMS\Backend\Views;
-
-/***************************************************************
- *  Copyright notice
- *
- *  (c) 2007-2011 Ingo Renner <ingo@typo3.org>
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *  A copy is found in the textfile GPL.txt and important notices to the license
- *  from the author is found in LICENSE.txt distributed with these scripts.
- *
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-/**
- * class to render the TYPO3 logo in the backend
- *
- * @author Ingo Renner <ingo@typo3.org>
- * @package TYPO3
- * @subpackage core
- */
-class LogoView {
-
-       protected $logo;
-
-       /**
-        * constructor
-        */
-       public function __construct() {
-               $this->logo = NULL;
-       }
-
-       /**
-        * renders the actual logo code
-        *
-        * @return string Logo html code snippet to use in the backend
-        */
-       public function render() {
-               // Default
-               $logoFile = 'gfx/alt_backend_logo.gif';
-               if (is_string($this->logo)) {
-                       // Overwrite
-                       $logoFile = $this->logo;
-               }
-               $imgInfo = getimagesize(PATH_site . TYPO3_mainDir . $logoFile);
-               $logo = '<a href="' . TYPO3_URL_GENERAL . '" target="_blank">' . '<img' . \TYPO3\CMS\Backend\Utility\IconUtility::skinImg('', $logoFile, $imgInfo[3]) . ' title="TYPO3 Content Management System" alt="" />' . '</a>';
-               // Overwrite with custom logo
-               if ($GLOBALS['TBE_STYLES']['logo']) {
-                       $imgInfo = @getimagesize(\TYPO3\CMS\Core\Utility\GeneralUtility::resolveBackPath((PATH_typo3 . $GLOBALS['TBE_STYLES']['logo']), 3));
-                       $logo = '<a href="' . TYPO3_URL_GENERAL . '" target="_blank">' . '<img src="' . $GLOBALS['TBE_STYLES']['logo'] . '" ' . $imgInfo[3] . ' title="TYPO3 Content Management System" alt="" />' . '</a>';
-               }
-               return $logo;
-       }
-
-       /**
-        * Sets the logo
-        *
-        * @param string $logo Path to logo file as seen from typo3/
-        * @throws \InvalidArgumentException
-        */
-       public function setLogo($logo) {
-               if (!is_string($logo)) {
-                       throw new \InvalidArgumentException('parameter $logo must be of type string', 1194041104);
-               }
-               $this->logo = $logo;
-       }
-
-}
-
-
-?>
\ No newline at end of file
index 55d9cb1..d07935e 100644 (file)
@@ -136,7 +136,7 @@ return array(
        'tx_cms_layout_tt_content_drawItemHook' => 'TYPO3\\CMS\\Backend\\View\\PageLayoutViewDrawItemHookInterface',
        'webPageTree' => 'TYPO3\\CMS\\Backend\\View\\PageTreeView',
        'SC_t3lib_thumbs' => 'TYPO3\\CMS\\Backend\\View\\ThumbnailView',
-       'TYPO3Logo' => 'TYPO3\\CMS\\Backend\\Views\\LogoView',
+       'TYPO3Logo' => 'TYPO3\\CMS\\Backend\\View\\LogoView',
        'cms_newContentElementWizardsHook' => 'TYPO3\\CMS\\Backend\\Wizard\\NewContentElementWizardHookInterface',
        'SC_wizard_tsconfig' => 'TYPO3\\CMS\\Backend\\Wizard\\TsconfigWizard',
        'Tx_Beuser_Controller_BackendUserController' => 'TYPO3\\CMS\\Beuser\\Controller\\BackendUserController',
index 1e9bee6..5f6277d 100644 (file)
@@ -684,7 +684,7 @@ class SC_t3lib_thumbs extends \TYPO3\CMS\Backend\View\ThumbnailView {}
 /**
  * @deprecated since 6.0 will be removed in 7.0
  */
-class TYPO3Logo extends \TYPO3\CMS\Backend\Views\LogoView {}
+class TYPO3Logo extends \TYPO3\CMS\Backend\View\LogoView {}
 
 /**
  * @deprecated since 6.0 will be removed in 7.0