[TASK] Move typo3 logo icons into EXT:backend 35/40735/3
authorBenjamin Mack <benni@typo3.org>
Mon, 29 Jun 2015 21:30:58 +0000 (23:30 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Mon, 29 Jun 2015 21:33:55 +0000 (23:33 +0200)
The typo3 logos used in various places of the backend
including the default favicon are now moved
to EXT:backend.

Resolves: #67826
Releases: master
Change-Id: Id3c01679aab1410a6e48020df57c451dd601c24c
Reviewed-on: http://review.typo3.org/40735
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
13 files changed:
typo3/gfx/favicon.ico [deleted file]
typo3/gfx/typo3-topbar@2x.png [deleted file]
typo3/gfx/typo3-transparent@2x.png [deleted file]
typo3/gfx/typo3.png [deleted file]
typo3/gfx/typo3logo.gif [deleted file]
typo3/sysext/about/Resources/Private/Partials/Logo.html
typo3/sysext/backend/Classes/Controller/BackendController.php
typo3/sysext/backend/Classes/Template/DocumentTemplate.php
typo3/sysext/backend/Classes/View/LogoView.php
typo3/sysext/backend/Resources/Public/Icons/favicon.ico [new file with mode: 0644]
typo3/sysext/backend/Resources/Public/Images/typo3-topbar@2x.png [new file with mode: 0644]
typo3/sysext/backend/Resources/Public/Images/typo3-transparent@2x.png [new file with mode: 0644]
typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php

diff --git a/typo3/gfx/favicon.ico b/typo3/gfx/favicon.ico
deleted file mode 100644 (file)
index 46d4c14..0000000
Binary files a/typo3/gfx/favicon.ico and /dev/null differ
diff --git a/typo3/gfx/typo3-topbar@2x.png b/typo3/gfx/typo3-topbar@2x.png
deleted file mode 100644 (file)
index 05f7a77..0000000
Binary files a/typo3/gfx/typo3-topbar@2x.png and /dev/null differ
diff --git a/typo3/gfx/typo3-transparent@2x.png b/typo3/gfx/typo3-transparent@2x.png
deleted file mode 100644 (file)
index 3752c3c..0000000
Binary files a/typo3/gfx/typo3-transparent@2x.png and /dev/null differ
diff --git a/typo3/gfx/typo3.png b/typo3/gfx/typo3.png
deleted file mode 100644 (file)
index f57755c..0000000
Binary files a/typo3/gfx/typo3.png and /dev/null differ
diff --git a/typo3/gfx/typo3logo.gif b/typo3/gfx/typo3logo.gif
deleted file mode 100644 (file)
index 67147e1..0000000
Binary files a/typo3/gfx/typo3logo.gif and /dev/null differ
index 47ca547..7dd671e 100644 (file)
@@ -1,6 +1,8 @@
 {namespace about=TYPO3\CMS\About\ViewHelpers}
 
 <about:SkinImage
-       src="gfx/typo3logo.gif"
+       src="sysext/backend/Resources/Public/Images/typo3-transparent@2x.png"
+       width="150"
        alt="{f:translate(key:'LLL:EXT:lang/locallang_mod_help_about.xlf:typo3_logo')}"
-/>
\ No newline at end of file
+/>
+<br><br>
index 130fa72..a66ebeb 100644 (file)
@@ -240,7 +240,7 @@ class BackendController {
                $view = $this->getFluidTemplateObject($this->templatePath . 'Backend/Main.html');
 
                // Render the TYPO3 logo in the left corner
-               $logoUrl = $GLOBALS['TBE_STYLES']['logo'] ?: 'gfx/typo3-topbar@2x.png';
+               $logoUrl = $GLOBALS['TBE_STYLES']['logo'] ?: 'sysext/backend/Resources/Public/Images/typo3-topbar@2x.png';
                $logoPath = GeneralUtility::resolveBackPath(PATH_typo3 . $logoUrl);
                list($logoWidth, $logoHeight) = @getimagesize($logoPath);
 
index 1fa46b8..8b1efe1 100644 (file)
@@ -1941,7 +1941,7 @@ function jumpToUrl(URL) {
        * @return string
        */
        protected function getBackendFavicon() {
-               return IconUtility::skinImg($this->backPath, 'gfx/favicon.ico', '', 1);
+               return IconUtility::skinImg($this->backPath, 'sysext/backend/Resources/Public/Icons/favicon.ico', '', 1);
        }
 
 }
index f54608b..7416bb5 100644 (file)
@@ -33,7 +33,7 @@ class LogoView {
         */
        public function __construct() {
                \TYPO3\CMS\Core\Utility\GeneralUtility::logDeprecatedFunction();
-               $this->logo = 'gfx/typo3-topbar@2x.png';
+               $this->logo = 'sysext/backend/Resources/Public/Images/typo3-topbar@2x.png';
        }
 
        /**
diff --git a/typo3/sysext/backend/Resources/Public/Icons/favicon.ico b/typo3/sysext/backend/Resources/Public/Icons/favicon.ico
new file mode 100644 (file)
index 0000000..46d4c14
Binary files /dev/null and b/typo3/sysext/backend/Resources/Public/Icons/favicon.ico differ
diff --git a/typo3/sysext/backend/Resources/Public/Images/typo3-topbar@2x.png b/typo3/sysext/backend/Resources/Public/Images/typo3-topbar@2x.png
new file mode 100644 (file)
index 0000000..05f7a77
Binary files /dev/null and b/typo3/sysext/backend/Resources/Public/Images/typo3-topbar@2x.png differ
diff --git a/typo3/sysext/backend/Resources/Public/Images/typo3-transparent@2x.png b/typo3/sysext/backend/Resources/Public/Images/typo3-transparent@2x.png
new file mode 100644 (file)
index 0000000..3752c3c
Binary files /dev/null and b/typo3/sysext/backend/Resources/Public/Images/typo3-transparent@2x.png differ
index 28475a0..41d069b 100644 (file)
@@ -815,7 +815,7 @@ class ExtensionManagementUtility {
                $extensionName = str_replace(' ', '', ucwords(str_replace('_', ' ', $extensionName)));
                $defaultModuleConfiguration = array(
                        'access' => 'admin',
-                       'icon' => 'gfx/typo3.png',
+                       'icon' => 'sysext/backend/Resources/Public/Images/Logo.png',
                        'labels' => '',
                        'extRelPath' => self::extRelPath($extensionKey) . 'Classes/'
                );