From c2e47c15849274eff5f3183bea68b8223368322d Mon Sep 17 00:00:00 2001
From: Andreas Steiger <typo3@andreassteiger.de>
Date: Wed, 26 Oct 2016 21:47:58 +0200
Subject: [PATCH] [TASK] Optimize topbar logo link
This patch fixes the clickable area of the topbar logo link.
Furthermore, the logo link of topbar header leads to the user's startup
module instead of typo3.org.
Resolves: #78393
Releases: master
Change-Id: I5bfaf72f497a0b7b09a69114bde115e90f243de1
Reviewed-on: https://review.typo3.org/50395
Reviewed-by: Bjoern Jacob <bjoern.jacob@tritum.de>
Tested-by: Bjoern Jacob <bjoern.jacob@tritum.de>
Tested-by: TYPO3com <no-reply@typo3.com>
Tested-by: Daniel Lorenz <info@extco.de>
Reviewed-by: Daniel Lorenz <info@extco.de>
Reviewed-by: Marc Willmann <mw@f7.de>
Tested-by: Marc Willmann <mw@f7.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
---
.../Public/Less/Scaffold/_topbar.less | 1 -
.../Classes/Controller/BackendController.php | 1 -
.../Private/Templates/Backend/Main.html | 20 ++++++++++---------
.../backend/Resources/Public/Css/backend.css | 1 -
4 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/Build/Resources/Public/Less/Scaffold/_topbar.less b/Build/Resources/Public/Less/Scaffold/_topbar.less
index 6ea016435eaa..4f8cfb312642 100644
--- a/Build/Resources/Public/Less/Scaffold/_topbar.less
+++ b/Build/Resources/Public/Less/Scaffold/_topbar.less
@@ -130,7 +130,6 @@
.topbar-header-site {
overflow: hidden;
position: relative;
- display: block;
max-width: 100%;
height: @topbar-height;
line-height: @topbar-height;
diff --git a/typo3/sysext/backend/Classes/Controller/BackendController.php b/typo3/sysext/backend/Classes/Controller/BackendController.php
index b1a3bfad7dfc..9844a7c9b3ca 100644
--- a/typo3/sysext/backend/Classes/Controller/BackendController.php
+++ b/typo3/sysext/backend/Classes/Controller/BackendController.php
@@ -293,7 +293,6 @@ class BackendController
$view->assign('logoUrl', PathUtility::getAbsoluteWebPath($logoPath));
$view->assign('logoWidth', $logoWidth);
$view->assign('logoHeight', $logoHeight);
- $view->assign('logoLink', TYPO3_URL_GENERAL);
$view->assign('applicationVersion', TYPO3_version);
$view->assign('siteName', $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename']);
$view->assign('moduleMenu', $this->generateModuleMenu());
diff --git a/typo3/sysext/backend/Resources/Private/Templates/Backend/Main.html b/typo3/sysext/backend/Resources/Private/Templates/Backend/Main.html
index d60fde8e7f32..4e9132bdd84c 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/Backend/Main.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/Backend/Main.html
@@ -10,15 +10,17 @@
<button class="topbar-button topbar-button-navigationcomponent t3js-topbar-button-navigationcomponent">
<core:icon identifier="apps-pagetree-category-collapse-all" alternativeMarkupIdentifier="inline" />
</button>
- <a href="{logoLink}" class="topbar-header-site" target="_blank" title="{siteName} - {applicationVersion}">
- <span class="topbar-header-site-logo">
- <img src="{logoUrl}" width="{logoWidth}" height="{logoHeight}" title="TYPO3 Content Management System" alt="" />
- </span>
- <span class="topbar-header-site-title">
- <span class="topbar-header-site-name">{siteName}</span>
- <span class="topbar-header-site-version">{applicationVersion}</span>
- </span>
- </a>
+ <div class="topbar-header-site">
+ <a href="./" target="_top" title="{siteName} - {applicationVersion}">
+ <span class="topbar-header-site-logo">
+ <img src="{logoUrl}" width="{logoWidth}" height="{logoHeight}" title="TYPO3 Content Management System" alt="" />
+ </span>
+ <span class="topbar-header-site-title">
+ <span class="topbar-header-site-name">{siteName}</span>
+ <span class="topbar-header-site-version">{applicationVersion}</span>
+ </span>
+ </a>
+ </div>
<button class="topbar-button topbar-button-toolbar t3js-topbar-button-toolbar">
<core:icon identifier="actions-system-extension-configure" alternativeMarkupIdentifier="inline" />
</button>
diff --git a/typo3/sysext/backend/Resources/Public/Css/backend.css b/typo3/sysext/backend/Resources/Public/Css/backend.css
index a1da708d8454..758a167b07bb 100644
--- a/typo3/sysext/backend/Resources/Public/Css/backend.css
+++ b/typo3/sysext/backend/Resources/Public/Css/backend.css
@@ -7357,7 +7357,6 @@ body {
.topbar-header-site {
overflow: hidden;
position: relative;
- display: block;
max-width: 100%;
height: 45px;
line-height: 45px;
--
GitLab