From 84ac4966c2b1468cbfde780bdad71a978e8d9e5e Mon Sep 17 00:00:00 2001
From: Benjamin Mack <benni@typo3.org>
Date: Mon, 29 Jun 2015 23:30:58 +0200
Subject: [PATCH] [TASK] Move typo3 logo icons into EXT:backend
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>
---
typo3/gfx/typo3.png | Bin 248 -> 0 bytes
typo3/gfx/typo3logo.gif | Bin 1815 -> 0 bytes
.../about/Resources/Private/Partials/Logo.html | 6 ++++--
.../Classes/Controller/BackendController.php | 2 +-
.../Classes/Template/DocumentTemplate.php | 2 +-
typo3/sysext/backend/Classes/View/LogoView.php | 2 +-
.../backend/Resources/Public/Icons}/favicon.ico | Bin
.../Resources/Public/Images}/typo3-topbar@2x.png | Bin
.../Public/Images}/typo3-transparent@2x.png | Bin
.../Utility/ExtensionManagementUtility.php | 2 +-
10 files changed, 8 insertions(+), 6 deletions(-)
delete mode 100644 typo3/gfx/typo3.png
delete mode 100644 typo3/gfx/typo3logo.gif
rename typo3/{gfx => sysext/backend/Resources/Public/Icons}/favicon.ico (100%)
rename typo3/{gfx => sysext/backend/Resources/Public/Images}/typo3-topbar@2x.png (100%)
rename typo3/{gfx => sysext/backend/Resources/Public/Images}/typo3-transparent@2x.png (100%)
diff --git a/typo3/gfx/typo3.png b/typo3/gfx/typo3.png
deleted file mode 100644
index f57755cc81a629e8a0aa951c8e82da0e767885da..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 248
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!aez;VE0BKIB100|Q*dJf$gGke
zzhH)f{pZ&UG$`CpaOi(;FhAh1aOZEJT#BcQV~B>R?ZI}&!wL)s3^s3m{eQhKV^rrm
zzMm~?;(j*N25Y;pZ(1+Bh?$Rb6|-OOGwnwqinmx79cF8<5^cK7w>&JvFS=3S#iHQU
ypF7^@oP3(a)9#&cl8@hB_2$w;_ve1m<cTla!Rc}%Lv01nJ_b)$KbLh*2~7Yb`(Ho+
diff --git a/typo3/gfx/typo3logo.gif b/typo3/gfx/typo3logo.gif
deleted file mode 100644
index 67147e12b401a985f093c0f2d17897712ba8626c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1815
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
F06SebV3+^^
diff --git a/typo3/sysext/about/Resources/Private/Partials/Logo.html b/typo3/sysext/about/Resources/Private/Partials/Logo.html
index 47ca5479baa6..7dd671ef5e2c 100644
--- a/typo3/sysext/about/Resources/Private/Partials/Logo.html
+++ b/typo3/sysext/about/Resources/Private/Partials/Logo.html
@@ -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>
diff --git a/typo3/sysext/backend/Classes/Controller/BackendController.php b/typo3/sysext/backend/Classes/Controller/BackendController.php
index 130fa7232178..a66ebeb60008 100644
--- a/typo3/sysext/backend/Classes/Controller/BackendController.php
+++ b/typo3/sysext/backend/Classes/Controller/BackendController.php
@@ -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);
diff --git a/typo3/sysext/backend/Classes/Template/DocumentTemplate.php b/typo3/sysext/backend/Classes/Template/DocumentTemplate.php
index 1fa46b82cb7a..8b1efe138895 100644
--- a/typo3/sysext/backend/Classes/Template/DocumentTemplate.php
+++ b/typo3/sysext/backend/Classes/Template/DocumentTemplate.php
@@ -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);
}
}
diff --git a/typo3/sysext/backend/Classes/View/LogoView.php b/typo3/sysext/backend/Classes/View/LogoView.php
index f54608b5c467..7416bb515317 100644
--- a/typo3/sysext/backend/Classes/View/LogoView.php
+++ b/typo3/sysext/backend/Classes/View/LogoView.php
@@ -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/gfx/favicon.ico b/typo3/sysext/backend/Resources/Public/Icons/favicon.ico
similarity index 100%
rename from typo3/gfx/favicon.ico
rename to typo3/sysext/backend/Resources/Public/Icons/favicon.ico
diff --git a/typo3/gfx/typo3-topbar@2x.png b/typo3/sysext/backend/Resources/Public/Images/typo3-topbar@2x.png
similarity index 100%
rename from typo3/gfx/typo3-topbar@2x.png
rename to typo3/sysext/backend/Resources/Public/Images/typo3-topbar@2x.png
diff --git a/typo3/gfx/typo3-transparent@2x.png b/typo3/sysext/backend/Resources/Public/Images/typo3-transparent@2x.png
similarity index 100%
rename from typo3/gfx/typo3-transparent@2x.png
rename to typo3/sysext/backend/Resources/Public/Images/typo3-transparent@2x.png
diff --git a/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php b/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
index 28475a0476ce..41d069b4953e 100644
--- a/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
+++ b/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
@@ -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/'
);
--
GitLab