[TASK] Optimize topbar logo link 95/50395/5
authorAndreas Steiger <typo3@andreassteiger.de>
Wed, 26 Oct 2016 19:47:58 +0000 (21:47 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Thu, 27 Oct 2016 10:28:08 +0000 (12:28 +0200)
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>
Build/Resources/Public/Less/Scaffold/_topbar.less
typo3/sysext/backend/Classes/Controller/BackendController.php
typo3/sysext/backend/Resources/Private/Templates/Backend/Main.html
typo3/sysext/backend/Resources/Public/Css/backend.css

index 6ea0164..4f8cfb3 100644 (file)
 .topbar-header-site {
        overflow: hidden;
        position: relative;
-       display: block;
        max-width: 100%;
        height: @topbar-height;
        line-height: @topbar-height;
index b1a3bfa..9844a7c 100644 (file)
@@ -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());
index d60fde8..4e9132b 100644 (file)
                                <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>
index a1da708..758a167 100644 (file)
@@ -7357,7 +7357,6 @@ body {
 .topbar-header-site {
   overflow: hidden;
   position: relative;
-  display: block;
   max-width: 100%;
   height: 45px;
   line-height: 45px;