[TASK] Follow-Up: favicon for backend window
authorStefan Galinski <stefan.galinski@gmail.com>
Fri, 15 Jun 2012 17:03:48 +0000 (19:03 +0200)
committerBenjamin Mack <benni@typo3.org>
Fri, 22 Jun 2012 13:59:41 +0000 (15:59 +0200)
The favicon is still missing for the initial login,
some popup windows and the install tool.

Change-Id: I37b4c68e9b77a5652fba3b37d9b3eda75660b524
Resolves: #37868
Releases: 6.0
Reviewed-on: http://review.typo3.org/12004
Reviewed-by: Oliver Klee
Reviewed-by: Philipp Gampe
Tested-by: Philipp Gampe
Reviewed-by: Wouter Wolters
Tested-by: Wouter Wolters
Reviewed-by: Felix Kopp
Tested-by: Felix Kopp
Reviewed-by: Benjamin Mack
Tested-by: Benjamin Mack
typo3/backend.php
typo3/sysext/install/Resources/Private/Templates/Install.html
typo3/sysext/install/Resources/Private/Templates/Install_123.html
typo3/sysext/install/Resources/Private/Templates/Install_login.html
typo3/template.php
typo3/templates/install.html

index 317ea92..00a78e2 100644 (file)
@@ -213,8 +213,6 @@ class TYPO3backend {
                        $this->pageRenderer->addJsFile($jsFile);
                }
 
-               $this->pageRenderer->setFavIcon('gfx/favicon.ico');
-
                $this->generateJavascript();
                $this->pageRenderer->addJsInlineCode('BackendInlineJavascript', $this->js, FALSE);
 
index 22283e1..0e983fe 100644 (file)
@@ -6,6 +6,7 @@
 
        <head>
                <meta http-equiv="###METACHARSET###" />
+               <link rel="shortcut icon" href="../gfx/favicon.ico" />
                <title>###HEADTITLE###</title>
                ###JAVASCRIPT###
                ###STYLESHEETS###
index 944c01b..51e7b5d 100644 (file)
@@ -6,6 +6,7 @@
 
        <head>
                <meta http-equiv="###METACHARSET###" />
+               <link rel="shortcut icon" href="../gfx/favicon.ico" />
                <title>###HEADTITLE###</title>
                ###JAVASCRIPT###
                ###STYLESHEETS###
index c6a330c..89e212a 100644 (file)
@@ -6,6 +6,7 @@
 
        <head>
                <meta http-equiv="###METACHARSET###" />
+               <link rel="shortcut icon" href="../gfx/favicon.ico" />
                <title>###HEADTITLE###</title>
                ###JAVASCRIPT###
                ###STYLESHEETS###
index da3ea8b..2bdcfba 100644 (file)
@@ -715,6 +715,7 @@ class template {
                $this->pageRenderer->setCharSet($this->charset);
                $this->pageRenderer->addMetaTag($this->generator());
                $this->pageRenderer->addMetaTag('<meta name="robots" content="noindex,follow" />');
+               $this->pageRenderer->setFavIcon('gfx/favicon.ico');
                if ($this->useCompatibilityTag) {
                        $this->pageRenderer->addMetaTag($this->xUaCompatible($this->xUaCompatibilityVersion));
                }
@@ -2103,4 +2104,4 @@ class frontendDoc extends template {
        }
 }
 
-?>
\ No newline at end of file
+?>
index 683008b..1f08cdf 100644 (file)
@@ -7,6 +7,7 @@
        <head>
                <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
                <title>###TITLE###</title>
+               <link rel="shortcut icon" href="../gfx/favicon.ico" />
                ###STYLESHEET###
                ###JAVASCRIPT###
        </head>